run make generate

kubernetes-sigs · May 28, 2023 · dcfd7f0 · dcfd7f0
1 parent 00ba93b
commit dcfd7f0
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 92 deletions.
diff --git a/go.sum b/go.sum
@@ -64,8 +64,6 @@ github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
-github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA=
-github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -162,16 +160,11 @@ github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRM
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/testdata/project-v4-multigroup/api/v1/lakers_types.go b/testdata/project-v4-multigroup/api/v1/lakers_types.go
@@ -41,7 +41,7 @@ type LakersStatus struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
-// Lakers is the Schema for the lakers API
+// Lakers is the Schema for the lakerses API
 type Lakers struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/testdata/project-v4-multigroup/api/v1/lakers_webhook.go b/testdata/project-v4-multigroup/api/v1/lakers_webhook.go
@@ -34,7 +34,7 @@ func (r *Lakers) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 // TODO(user): EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 
-//+kubebuilder:webhook:path=/mutate-testproject-org-v1-lakers,mutating=true,failurePolicy=fail,sideEffects=None,groups=testproject.org,resources=lakers,verbs=create;update,versions=v1,name=mlakers.kb.io,admissionReviewVersions=v1
+//+kubebuilder:webhook:path=/mutate-testproject-org-v1-lakers,mutating=true,failurePolicy=fail,sideEffects=None,groups=testproject.org,resources=lakerses,verbs=create;update,versions=v1,name=mlakers.kb.io,admissionReviewVersions=v1
 
 var _ webhook.Defaulter = &Lakers{}
 
@@ -46,7 +46,7 @@ func (r *Lakers) Default() {
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
-//+kubebuilder:webhook:path=/validate-testproject-org-v1-lakers,mutating=false,failurePolicy=fail,sideEffects=None,groups=testproject.org,resources=lakers,verbs=create;update,versions=v1,name=vlakers.kb.io,admissionReviewVersions=v1
+//+kubebuilder:webhook:path=/validate-testproject-org-v1-lakers,mutating=false,failurePolicy=fail,sideEffects=None,groups=testproject.org,resources=lakerses,verbs=create;update,versions=v1,name=vlakers.kb.io,admissionReviewVersions=v1
 
 var _ webhook.Validator = &Lakers{}
 

diff --git a/testdata/project-v4-multigroup/config/crd/bases/testproject.org_lakers.yaml b/testdata/project-v4-multigroup/config/crd/bases/testproject.org_lakers.yaml
@@ -17,7 +17,7 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: Lakers is the Schema for the lakers API
+        description: Lakers is the Schema for the lakerses API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation

diff --git a/testdata/project-v4-multigroup/config/crd/kustomization.yaml b/testdata/project-v4-multigroup/config/crd/kustomization.yaml
@@ -11,7 +11,7 @@ resources:
 - bases/foo.policy.testproject.org_healthcheckpolicies.yaml
 - bases/foo.testproject.org_bars.yaml
 - bases/fiz.testproject.org_bars.yaml
-- bases/testproject.org_lakers.yaml
+- bases/testproject.org_lakerses.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patches:
@@ -25,7 +25,7 @@ patches:
 #- patches/webhook_in_leviathans.yaml
 #- patches/webhook_in_healthcheckpolicies.yaml
 #- patches/webhook_in_bars.yaml
-#- patches/webhook_in_lakers.yaml
+#- patches/webhook_in_lakerses.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
@@ -38,7 +38,7 @@ patches:
 #- patches/cainjection_in_leviathans.yaml
 #- patches/cainjection_in_healthcheckpolicies.yaml
 #- patches/cainjection_in_bars.yaml
-#- patches/cainjection_in_lakers.yaml
+#- patches/cainjection_in_lakerses.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

diff --git a/testdata/project-v4-multigroup/config/crd/patches/cainjection_in__lakers.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in__lakers.yaml
diff --git a/testdata/project-v4-multigroup/config/crd/patches/webhook_in__lakers.yaml b/testdata/project-v4-multigroup/config/crd/patches/webhook_in__lakers.yaml
diff --git a/testdata/project-v4-multigroup/config/rbac/_lakers_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/_lakers_editor_role.yaml
@@ -1,4 +1,4 @@
-# permissions for end users to edit lakers.
+# permissions for end users to edit lakerses.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -14,7 +14,7 @@ rules:
 - apiGroups:
   - testproject.org
   resources:
-  - lakers
+  - lakerses
   verbs:
   - create
   - delete
@@ -26,6 +26,6 @@ rules:
 - apiGroups:
   - testproject.org
   resources:
-  - lakers/status
+  - lakerses/status
   verbs:
   - get
diff --git a/testdata/project-v4-multigroup/config/rbac/_lakers_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/_lakers_viewer_role.yaml
@@ -1,4 +1,4 @@
-# permissions for end users to view lakers.
+# permissions for end users to view lakerses.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -14,14 +14,14 @@ rules:
 - apiGroups:
   - testproject.org
   resources:
-  - lakers
+  - lakerses
   verbs:
   - get
   - list
   - watch
 - apiGroups:
   - testproject.org
   resources:
-  - lakers/status
+  - lakerses/status
   verbs:
   - get
diff --git a/testdata/project-v4-multigroup/config/rbac/role.yaml b/testdata/project-v4-multigroup/config/rbac/role.yaml
@@ -267,7 +267,7 @@ rules:
 - apiGroups:
   - testproject.org
   resources:
-  - lakers
+  - lakerses
   verbs:
   - create
   - delete
@@ -279,13 +279,13 @@ rules:
 - apiGroups:
   - testproject.org
   resources:
-  - lakers/finalizers
+  - lakerses/finalizers
   verbs:
   - update
 - apiGroups:
   - testproject.org
   resources:
-  - lakers/status
+  - lakerses/status
   verbs:
   - get
   - patch

diff --git a/testdata/project-v4-multigroup/config/webhook/manifests.yaml b/testdata/project-v4-multigroup/config/webhook/manifests.yaml
@@ -62,7 +62,7 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - lakers
+    - lakerses
   sideEffects: None
 ---
 apiVersion: admissionregistration.k8s.io/v1
@@ -128,5 +128,5 @@ webhooks:
     - CREATE
     - UPDATE
     resources:
-    - lakers
+    - lakerses
   sideEffects: None
diff --git a/testdata/project-v4-multigroup/internal/controller/lakers_controller.go b/testdata/project-v4-multigroup/internal/controller/lakers_controller.go
@@ -33,9 +33,9 @@ type LakersReconciler struct {
 	Scheme *runtime.Scheme
 }
 
-//+kubebuilder:rbac:groups=testproject.org,resources=lakers,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=testproject.org,resources=lakers/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=testproject.org,resources=lakers/finalizers,verbs=update
+//+kubebuilder:rbac:groups=testproject.org,resources=lakerses,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=testproject.org,resources=lakerses/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=testproject.org,resources=lakerses/finalizers,verbs=update
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.

diff --git a/testdata/project-v4-with-deploy-image/api/v1alpha1/busybox_types.go b/testdata/project-v4-with-deploy-image/api/v1alpha1/busybox_types.go
@@ -54,7 +54,7 @@ type BusyboxStatus struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
-// Busybox is the Schema for the busyboxes API
+// Busybox is the Schema for the busyboxs API
 type Busybox struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/.../project-v4-with-deploy-image/config/crd/bases/example.com.testproject.org_busyboxes.yaml b/.../project-v4-with-deploy-image/config/crd/bases/example.com.testproject.org_busyboxes.yaml
@@ -17,7 +17,7 @@ spec:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Busybox is the Schema for the busyboxes API
+        description: Busybox is the Schema for the busyboxs API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation

diff --git a/testdata/project-v4-with-deploy-image/config/crd/kustomization.yaml b/testdata/project-v4-with-deploy-image/config/crd/kustomization.yaml
@@ -3,20 +3,20 @@
 # It should be run by config/default
 resources:
 - bases/example.com.testproject.org_memcacheds.yaml
-- bases/example.com.testproject.org_busyboxes.yaml
+- bases/example.com.testproject.org_busyboxs.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patches:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 #- patches/webhook_in_memcacheds.yaml
-#- patches/webhook_in_busyboxes.yaml
+#- patches/webhook_in_busyboxs.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
 #- patches/cainjection_in_memcacheds.yaml
-#- patches/cainjection_in_busyboxes.yaml
+#- patches/cainjection_in_busyboxs.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

diff --git a/testdata/project-v4-with-deploy-image/config/crd/patches/cainjection_in_busyboxes.yaml b/testdata/project-v4-with-deploy-image/config/crd/patches/cainjection_in_busyboxes.yaml
diff --git a/testdata/project-v4-with-deploy-image/config/crd/patches/webhook_in_busyboxes.yaml b/testdata/project-v4-with-deploy-image/config/crd/patches/webhook_in_busyboxes.yaml
diff --git a/testdata/project-v4-with-deploy-image/config/rbac/busybox_editor_role.yaml b/testdata/project-v4-with-deploy-image/config/rbac/busybox_editor_role.yaml
@@ -1,4 +1,4 @@
-# permissions for end users to edit busyboxes.
+# permissions for end users to edit busyboxs.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -14,7 +14,7 @@ rules:
 - apiGroups:
   - example.com.testproject.org
   resources:
-  - busyboxes
+  - busyboxs
   verbs:
   - create
   - delete
@@ -26,6 +26,6 @@ rules:
 - apiGroups:
   - example.com.testproject.org
   resources:
-  - busyboxes/status
+  - busyboxs/status
   verbs:
   - get
diff --git a/testdata/project-v4-with-deploy-image/config/rbac/busybox_viewer_role.yaml b/testdata/project-v4-with-deploy-image/config/rbac/busybox_viewer_role.yaml
@@ -1,4 +1,4 @@
-# permissions for end users to view busyboxes.
+# permissions for end users to view busyboxs.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -14,14 +14,14 @@ rules:
 - apiGroups:
   - example.com.testproject.org
   resources:
-  - busyboxes
+  - busyboxs
   verbs:
   - get
   - list
   - watch
 - apiGroups:
   - example.com.testproject.org
   resources:
-  - busyboxes/status
+  - busyboxs/status
   verbs:
   - get
diff --git a/testdata/project-v4-with-deploy-image/config/rbac/role.yaml b/testdata/project-v4-with-deploy-image/config/rbac/role.yaml
@@ -34,7 +34,7 @@ rules:
 - apiGroups:
   - example.com.testproject.org
   resources:
-  - busyboxes
+  - busyboxs
   verbs:
   - create
   - delete
@@ -46,13 +46,13 @@ rules:
 - apiGroups:
   - example.com.testproject.org
   resources:
-  - busyboxes/finalizers
+  - busyboxs/finalizers
   verbs:
   - update
 - apiGroups:
   - example.com.testproject.org
   resources:
-  - busyboxes/status
+  - busyboxs/status
   verbs:
   - get
   - patch

diff --git a/testdata/project-v4-with-deploy-image/internal/controller/busybox_controller.go b/testdata/project-v4-with-deploy-image/internal/controller/busybox_controller.go
@@ -60,9 +60,9 @@ type BusyboxReconciler struct {
 // when the command <make manifests> is executed.
 // To know more about markers see: https://book.kubebuilder.io/reference/markers.html
 
-//+kubebuilder:rbac:groups=example.com.testproject.org,resources=busyboxes,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=example.com.testproject.org,resources=busyboxes/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=example.com.testproject.org,resources=busyboxes/finalizers,verbs=update
+//+kubebuilder:rbac:groups=example.com.testproject.org,resources=busyboxs,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=example.com.testproject.org,resources=busyboxs/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=example.com.testproject.org,resources=busyboxs/finalizers,verbs=update
 //+kubebuilder:rbac:groups=core,resources=events,verbs=create;patch
 //+kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch