🌱 Change testdata suffix and regenerate samples

test/testdata/generate.sh

@@ -113,7 +113,7 @@ function scaffold_test_project {
       $kb create api --group example.com --version v1alpha1 --kind Busybox --image=busybox:1.28 --plugins="deploy-image/v1-alpha" --make=false
       header_text 'Creating Memcached webhook ...'
       $kb create webhook --group example.com --version v1alpha1 --kind Memcached --programmatic-validation
-  elif [[ $project =~ "with-metrics" ]]; then
+  elif [[ $project =~ "with-grafana" ]]; then
      header_text 'Editing project with Grafana plugin ...'
       $kb edit --plugins=grafana.kubebuilder.io/v1-alpha
   fi
@@ -132,16 +132,15 @@ scaffold_test_project project-v2 --project-version=2
 # [Currently, default CLI plugin] - Project version 3 (default) uses plugin go/v3 (default).
 scaffold_test_project project-v3
 scaffold_test_project project-v3-multigroup
-scaffold_test_project project-v3-declarative-v1 --plugins="go/v3,declarative,grafana/v1-alpha"
+scaffold_test_project project-v3-declarative-v1 --plugins="go/v3,declarative"
 scaffold_test_project project-v3-config --component-config
 scaffold_test_project project-v3-with-deploy-image
-scaffold_test_project project-v3-with-metrics
+scaffold_test_project project-v3-with-grafana
 
 # [Next version, alpha] Project version v4-alpha
 scaffold_test_project project-v4 --plugins="go/v4-alpha"
 scaffold_test_project project-v4-multigroup --plugins="go/v4-alpha"
-scaffold_test_project project-v4-declarative-v1 --plugins="go/v4-alpha,declarative,grafana/v1-alpha"
+scaffold_test_project project-v4-declarative-v1 --plugins="go/v4-alpha,declarative"
 scaffold_test_project project-v4-config --component-config --plugins="go/v4-alpha"
 scaffold_test_project project-v4-with-deploy-image --plugins="go/v4-alpha"
-scaffold_test_project project-v4-with-metrics
-
+scaffold_test_project project-v4-with-grafana

test/testdata/test.sh

@@ -36,12 +36,12 @@ test_project project-v3-multigroup
 test_project project-v3-declarative-v1
 test_project project-v3-config
 test_project project-v3-with-deploy-image
-test_project project-v3-with-metrics
+test_project project-v3-with-grafana
 
 # Project version v4-alpha
 test_project project-v4
 test_project project-v4-multigroup
 test_project project-v4-declarative-v1
 test_project project-v4-config
 test_project project-v4-with-deploy-image
-test_project project-v4-with-metrics
+test_project project-v4-with-grafana

testdata/project-v3-declarative-v1/PROJECT

@@ -2,7 +2,6 @@ domain: testproject.org
 layout:
 - go.kubebuilder.io/v3
 - declarative.go.kubebuilder.io/v1
-- grafana.kubebuilder.io/v1-alpha
 plugins:
   declarative.go.kubebuilder.io/v1:
     resources:
@@ -18,7 +17,6 @@ plugins:
       group: crew
       kind: Admiral
       version: v1
-  grafana.kubebuilder.io/v1-alpha: {}
 projectName: project-v3-declarative-v1
 repo: sigs.k8s.io/kubebuilder/testdata/project-v3-declarative-v1
 resources:

testdata/project-v3-with-metrics/PROJECT → testdata/project-v3-with-grafana/PROJECT

@@ -3,6 +3,6 @@ layout:
 - go.kubebuilder.io/v3
 plugins:
   grafana.kubebuilder.io/v1-alpha: {}
-projectName: project-v3-with-metrics
-repo: sigs.k8s.io/kubebuilder/testdata/project-v3-with-metrics
+projectName: project-v3-with-grafana
+repo: sigs.k8s.io/kubebuilder/testdata/project-v3-with-grafana
 version: "3"

testdata/project-v3-with-metrics/README.md → testdata/project-v3-with-grafana/README.md

@@ -1,4 +1,4 @@
-# project-v3-with-metrics
+# project-v3-with-grafana
 // TODO(user): Add simple overview of use/purpose
 
 ## Description
@@ -18,13 +18,13 @@ kubectl apply -f config/samples/
 2. Build and push your image to the location specified by `IMG`:
 
 ```sh
-make docker-build docker-push IMG=<some-registry>/project-v3-with-metrics:tag
+make docker-build docker-push IMG=<some-registry>/project-v3-with-grafana:tag
 ```
 
 3. Deploy the controller to the cluster with the image specified by `IMG`:
 
 ```sh
-make deploy IMG=<some-registry>/project-v3-with-metrics:tag
+make deploy IMG=<some-registry>/project-v3-with-grafana:tag
 ```
 
 ### Uninstall CRDs

testdata/project-v3-with-metrics/config/default/kustomization.yaml → testdata/project-v3-with-grafana/config/default/kustomization.yaml

@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: project-v3-with-metrics-system
+namespace: project-v3-with-grafana-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: project-v3-with-metrics-
+namePrefix: project-v3-with-grafana-
 
 # Labels to add to all resources and selectors.
 #commonLabels:

testdata/project-v4-with-metrics/config/manager/manager.yaml → testdata/project-v3-with-grafana/config/manager/manager.yaml

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: namespace
     app.kubernetes.io/instance: system
     app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: project-v4-with-metrics
-    app.kubernetes.io/part-of: project-v4-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: system
 ---
@@ -21,8 +21,8 @@ metadata:
     app.kubernetes.io/name: deployment
     app.kubernetes.io/instance: controller-manager
     app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: project-v4-with-metrics
-    app.kubernetes.io/part-of: project-v4-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
 spec:
   selector:

testdata/project-v3-with-metrics/config/prometheus/monitor.yaml → testdata/project-v3-with-grafana/config/prometheus/monitor.yaml

@@ -8,8 +8,8 @@ metadata:
     app.kubernetes.io/name: servicemonitor
     app.kubernetes.io/instance: controller-manager-metrics-monitor
     app.kubernetes.io/component: metrics
-    app.kubernetes.io/created-by: project-v3-with-metrics
-    app.kubernetes.io/part-of: project-v3-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-monitor
   namespace: system

testdata/project-v4-with-metrics/config/rbac/auth_proxy_client_clusterrole.yaml → testdata/project-v3-with-grafana/config/rbac/auth_proxy_client_clusterrole.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: metrics-reader
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: project-v4-with-metrics
-    app.kubernetes.io/part-of: project-v4-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: metrics-reader
 rules:

testdata/project-v3-with-metrics/config/rbac/auth_proxy_role.yaml → testdata/project-v3-with-grafana/config/rbac/auth_proxy_role.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrole
     app.kubernetes.io/instance: proxy-role
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: project-v3-with-metrics
-    app.kubernetes.io/part-of: project-v3-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: proxy-role
 rules:

testdata/project-v4-with-metrics/config/rbac/auth_proxy_role_binding.yaml → testdata/project-v3-with-grafana/config/rbac/auth_proxy_role_binding.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrolebinding
     app.kubernetes.io/instance: proxy-rolebinding
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: project-v4-with-metrics
-    app.kubernetes.io/part-of: project-v4-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: proxy-rolebinding
 roleRef:

testdata/project-v3-with-metrics/config/rbac/auth_proxy_service.yaml → testdata/project-v3-with-grafana/config/rbac/auth_proxy_service.yaml

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: service
     app.kubernetes.io/instance: controller-manager-metrics-service
     app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: project-v3-with-metrics
-    app.kubernetes.io/part-of: project-v3-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-service
   namespace: system

testdata/project-v3-with-metrics/config/rbac/leader_election_role.yaml → testdata/project-v3-with-grafana/config/rbac/leader_election_role.yaml

@@ -6,8 +6,8 @@ metadata:
     app.kubernetes.io/name: role
     app.kubernetes.io/instance: leader-election-role
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: project-v3-with-metrics
-    app.kubernetes.io/part-of: project-v3-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: leader-election-role
 rules:

testdata/project-v4-with-metrics/config/rbac/leader_election_role_binding.yaml → testdata/project-v3-with-grafana/config/rbac/leader_election_role_binding.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: rolebinding
     app.kubernetes.io/instance: leader-election-rolebinding
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: project-v4-with-metrics
-    app.kubernetes.io/part-of: project-v4-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: leader-election-rolebinding
 roleRef:

testdata/project-v3-with-metrics/config/rbac/role_binding.yaml → testdata/project-v3-with-grafana/config/rbac/role_binding.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: clusterrolebinding
     app.kubernetes.io/instance: manager-rolebinding
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: project-v3-with-metrics
-    app.kubernetes.io/part-of: project-v3-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: manager-rolebinding
 roleRef:

testdata/project-v4-with-metrics/config/rbac/service_account.yaml → testdata/project-v3-with-grafana/config/rbac/service_account.yaml

@@ -5,8 +5,8 @@ metadata:
     app.kubernetes.io/name: serviceaccount
     app.kubernetes.io/instance: controller-manager
     app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: project-v4-with-metrics
-    app.kubernetes.io/part-of: project-v4-with-metrics
+    app.kubernetes.io/created-by: project-v3-with-grafana
+    app.kubernetes.io/part-of: project-v3-with-grafana
     app.kubernetes.io/managed-by: kustomize
   name: controller-manager
   namespace: system

testdata/project-v3-with-metrics/go.mod → testdata/project-v3-with-grafana/go.mod

@@ -1,4 +1,4 @@
-module sigs.k8s.io/kubebuilder/testdata/project-v3-with-metrics
+module sigs.k8s.io/kubebuilder/testdata/project-v3-with-grafana
 
 go 1.19
 

testdata/project-v4-with-metrics/main.go → testdata/project-v3-with-grafana/main.go

@@ -67,7 +67,7 @@ func main() {
 		Port:                   9443,
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
-		LeaderElectionID:       "d2513bbd.testproject.org",
+		LeaderElectionID:       "502fdbd3.testproject.org",
 		// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
 		// when the Manager ends. This requires the binary to immediately end when the
 		// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly

testdata/project-v4-declarative-v1/PROJECT

@@ -2,7 +2,6 @@ domain: testproject.org
 layout:
 - go.kubebuilder.io/v4-alpha
 - declarative.go.kubebuilder.io/v1
-- grafana.kubebuilder.io/v1-alpha
 plugins:
   declarative.go.kubebuilder.io/v1:
     resources:
@@ -18,7 +17,6 @@ plugins:
       group: crew
       kind: Admiral
       version: v1
-  grafana.kubebuilder.io/v1-alpha: {}
 projectName: project-v4-declarative-v1
 repo: sigs.k8s.io/kubebuilder/testdata/project-v4-declarative-v1
 resources: