From 975403607168eb17f2a2c7b171b55c0d10b94787 Mon Sep 17 00:00:00 2001 From: sarthaksarthak9 Date: Mon, 26 Feb 2024 11:46:57 +0530 Subject: [PATCH] updates the labels to project naming conventions as suggested --- .../project/config/rbac/service_account.yaml | 6 +----- .../config/samples/config_v2_projectconfig.yaml | 5 +---- .../project/config/rbac/service_account.yaml | 6 +----- .../project/config/samples/batch_v1_cronjob.yaml | 5 +---- .../testdata/project/config/webhook/service.yaml | 6 +----- .../project/config/rbac/service_account.yaml | 6 +----- .../internal/controller/memcached_controller.go | 6 ++---- .../templates/config/rbac/service_account.go | 6 +----- .../internal/templates/config/samples/crd_sample.go | 5 +---- .../internal/templates/config/webhook/service.go | 6 +----- .../internal/templates/controllers/controller.go | 6 ++---- .../config/rbac/service_account.yaml | 6 +----- .../config/samples/_v1_lakers.yaml | 5 +---- .../config/samples/crew_v1_captain.yaml | 5 +---- .../config/samples/fiz_v1_bar.yaml | 5 +---- .../samples/foo.policy_v1_healthcheckpolicy.yaml | 5 +---- .../config/samples/foo_v1_bar.yaml | 5 +---- .../config/samples/sea-creatures_v1beta1_kraken.yaml | 5 +---- .../samples/sea-creatures_v1beta2_leviathan.yaml | 5 +---- .../config/samples/ship_v1_destroyer.yaml | 5 +---- .../config/samples/ship_v1beta1_frigate.yaml | 5 +---- .../config/samples/ship_v2alpha1_cruiser.yaml | 5 +---- .../config/webhook/service.yaml | 6 +----- .../config/rbac/service_account.yaml | 6 +----- .../config/samples/_v1_lakers.yaml | 5 +---- .../config/samples/crew_v1_captain.yaml | 5 +---- .../config/samples/fiz_v1_bar.yaml | 5 +---- .../samples/foo.policy_v1_healthcheckpolicy.yaml | 5 +---- .../config/samples/foo_v1_bar.yaml | 5 +---- .../config/samples/sea-creatures_v1beta1_kraken.yaml | 5 +---- .../samples/sea-creatures_v1beta2_leviathan.yaml | 5 +---- .../config/samples/ship_v1_destroyer.yaml | 5 +---- .../config/samples/ship_v1beta1_frigate.yaml | 5 +---- .../config/samples/ship_v2alpha1_cruiser.yaml | 5 +---- .../config/webhook/service.yaml | 6 +----- .../config/rbac/service_account.yaml | 6 +----- .../config/webhook/service.yaml | 6 +----- .../project-v4-with-deploy-image/dist/install.yaml | 12 ++---------- .../internal/controller/busybox_controller.go | 6 ++---- .../internal/controller/memcached_controller.go | 6 ++---- .../config/rbac/service_account.yaml | 6 +----- testdata/project-v4-with-grafana/dist/install.yaml | 6 +----- testdata/project-v4/config/rbac/service_account.yaml | 6 +----- .../project-v4/config/samples/crew_v1_admiral.yaml | 5 +---- .../project-v4/config/samples/crew_v1_captain.yaml | 5 +---- .../project-v4/config/samples/crew_v1_firstmate.yaml | 5 +---- testdata/project-v4/config/webhook/service.yaml | 6 +----- testdata/project-v4/dist/install.yaml | 12 ++---------- 48 files changed, 54 insertions(+), 220 deletions(-) diff --git a/docs/book/src/component-config-tutorial/testdata/project/config/rbac/service_account.yaml b/docs/book/src/component-config-tutorial/testdata/project/config/rbac/service_account.yaml index c38941e4f9e..7733e7fc663 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/config/rbac/service_account.yaml +++ b/docs/book/src/component-config-tutorial/testdata/project/config/rbac/service_account.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project - app.kubernetes.io/part-of: project + app.kubernetes.io/name: project app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/docs/book/src/component-config-tutorial/testdata/project/config/samples/config_v2_projectconfig.yaml b/docs/book/src/component-config-tutorial/testdata/project/config/samples/config_v2_projectconfig.yaml index 145f0f503c7..4f38be2fc64 100644 --- a/docs/book/src/component-config-tutorial/testdata/project/config/samples/config_v2_projectconfig.yaml +++ b/docs/book/src/component-config-tutorial/testdata/project/config/samples/config_v2_projectconfig.yaml @@ -2,11 +2,8 @@ apiVersion: config.tutorial.kubebuilder.io/v2 kind: ProjectConfig metadata: labels: - app.kubernetes.io/name: projectconfig - app.kubernetes.io/instance: projectconfig-sample - app.kubernetes.io/part-of: project + app.kubernetes.io/name: project app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project name: projectconfig-sample spec: # TODO(user): Add fields here diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/rbac/service_account.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/rbac/service_account.yaml index c38941e4f9e..7733e7fc663 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/config/rbac/service_account.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/config/rbac/service_account.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project - app.kubernetes.io/part-of: project + app.kubernetes.io/name: project app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/samples/batch_v1_cronjob.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/samples/batch_v1_cronjob.yaml index 52a2a3b8711..0fe52c3b1ae 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/config/samples/batch_v1_cronjob.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/config/samples/batch_v1_cronjob.yaml @@ -2,11 +2,8 @@ apiVersion: batch.tutorial.kubebuilder.io/v1 kind: CronJob metadata: labels: - app.kubernetes.io/name: cronjob - app.kubernetes.io/instance: cronjob-sample - app.kubernetes.io/part-of: project + app.kubernetes.io/name: project app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project name: cronjob-sample spec: schedule: "*/1 * * * *" diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/service.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/service.yaml index 440ffc233ec..1c94b010702 100644 --- a/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/service.yaml +++ b/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/service.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/name: service - app.kubernetes.io/instance: webhook-service - app.kubernetes.io/component: webhook - app.kubernetes.io/created-by: project - app.kubernetes.io/part-of: project + app.kubernetes.io/name: project app.kubernetes.io/managed-by: kustomize name: webhook-service namespace: system diff --git a/docs/book/src/getting-started/testdata/project/config/rbac/service_account.yaml b/docs/book/src/getting-started/testdata/project/config/rbac/service_account.yaml index c38941e4f9e..7733e7fc663 100644 --- a/docs/book/src/getting-started/testdata/project/config/rbac/service_account.yaml +++ b/docs/book/src/getting-started/testdata/project/config/rbac/service_account.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project - app.kubernetes.io/part-of: project + app.kubernetes.io/name: project app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/docs/book/src/getting-started/testdata/project/internal/controller/memcached_controller.go b/docs/book/src/getting-started/testdata/project/internal/controller/memcached_controller.go index df2297cd599..fd15d21a17d 100644 --- a/docs/book/src/getting-started/testdata/project/internal/controller/memcached_controller.go +++ b/docs/book/src/getting-started/testdata/project/internal/controller/memcached_controller.go @@ -409,11 +409,9 @@ func labelsForMemcached(name string) map[string]string { if err == nil { imageTag = strings.Split(image, ":")[1] } - return map[string]string{"app.kubernetes.io/name": "Memcached", - "app.kubernetes.io/instance": name, + return map[string]string{"app.kubernetes.io/name": "project", "app.kubernetes.io/version": imageTag, - "app.kubernetes.io/part-of": "project", - "app.kubernetes.io/created-by": "controller-manager", + "app.kubernetes.io/managed-by": "MemcachedController", } } diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/service_account.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/service_account.go index 31c17354808..19373ba97c5 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/service_account.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/service_account.go @@ -45,11 +45,7 @@ const serviceAccountTemplate = `apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: {{ .ProjectName }} - app.kubernetes.io/part-of: {{ .ProjectName }} + app.kubernetes.io/name: {{ .ProjectName }} app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go index 06b2376d9f2..f583eeb0eb0 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go @@ -55,11 +55,8 @@ const crdSampleTemplate = `apiVersion: {{ .Resource.QualifiedGroup }}/{{ .Resour kind: {{ .Resource.Kind }} metadata: labels: - app.kubernetes.io/name: {{ lower .Resource.Kind }} - app.kubernetes.io/instance: {{ lower .Resource.Kind }}-sample - app.kubernetes.io/part-of: {{ .ProjectName }} + app.kubernetes.io/name: {{ .ProjectName }} app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: {{ .ProjectName }} name: {{ lower .Resource.Kind }}-sample spec: # TODO(user): Add fields here diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/service.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/service.go index 2c989778cd2..1b96404a00c 100644 --- a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/service.go +++ b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/service.go @@ -48,11 +48,7 @@ const serviceTemplate = `apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/name: service - app.kubernetes.io/instance: webhook-service - app.kubernetes.io/component: webhook - app.kubernetes.io/created-by: {{ .ProjectName }} - app.kubernetes.io/part-of: {{ .ProjectName }} + app.kubernetes.io/name: {{ .ProjectName }} app.kubernetes.io/managed-by: kustomize name: webhook-service namespace: system diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go index 9ae18ab927b..83137e45af9 100644 --- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go +++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller.go @@ -456,11 +456,9 @@ func labelsFor{{ .Resource.Kind }}(name string) map[string]string { if err == nil { imageTag = strings.Split(image, ":")[1] } - return map[string]string{"app.kubernetes.io/name": "{{ .Resource.Kind }}", - "app.kubernetes.io/instance": name, + return map[string]string{"app.kubernetes.io/name": "{{ .ProjectName }}", "app.kubernetes.io/version": imageTag, - "app.kubernetes.io/part-of": "{{ .ProjectName }}", - "app.kubernetes.io/created-by": "controller-manager", + "app.kubernetes.io/managed-by": "{{ .Resource.Kind }}Controller", } } diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/service_account.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/service_account.yaml index e14982021a9..929b9eb1584 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/rbac/service_account.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/rbac/service_account.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/_v1_lakers.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/_v1_lakers.yaml index 212abd9cb63..134b5aafa57 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/_v1_lakers.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/_v1_lakers.yaml @@ -2,11 +2,8 @@ apiVersion: testproject.org/v1 kind: Lakers metadata: labels: - app.kubernetes.io/name: lakers - app.kubernetes.io/instance: lakers-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: lakers-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/crew_v1_captain.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/crew_v1_captain.yaml index f673b14f595..5ee2dcbccdf 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/crew_v1_captain.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/crew_v1_captain.yaml @@ -2,11 +2,8 @@ apiVersion: crew.testproject.org/v1 kind: Captain metadata: labels: - app.kubernetes.io/name: captain - app.kubernetes.io/instance: captain-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: captain-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/fiz_v1_bar.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/fiz_v1_bar.yaml index 8e8bbe548a7..98d30c85204 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/fiz_v1_bar.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/fiz_v1_bar.yaml @@ -2,11 +2,8 @@ apiVersion: fiz.testproject.org/v1 kind: Bar metadata: labels: - app.kubernetes.io/name: bar - app.kubernetes.io/instance: bar-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: bar-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/foo.policy_v1_healthcheckpolicy.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/foo.policy_v1_healthcheckpolicy.yaml index 2e186a61163..5fc59688452 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/foo.policy_v1_healthcheckpolicy.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/foo.policy_v1_healthcheckpolicy.yaml @@ -2,11 +2,8 @@ apiVersion: foo.policy.testproject.org/v1 kind: HealthCheckPolicy metadata: labels: - app.kubernetes.io/name: healthcheckpolicy - app.kubernetes.io/instance: healthcheckpolicy-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: healthcheckpolicy-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/foo_v1_bar.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/foo_v1_bar.yaml index b53b7541890..c9fc87fdb34 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/foo_v1_bar.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/foo_v1_bar.yaml @@ -2,11 +2,8 @@ apiVersion: foo.testproject.org/v1 kind: Bar metadata: labels: - app.kubernetes.io/name: bar - app.kubernetes.io/instance: bar-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: bar-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/sea-creatures_v1beta1_kraken.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/sea-creatures_v1beta1_kraken.yaml index 0df2e7f9614..962a8694f99 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/sea-creatures_v1beta1_kraken.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/sea-creatures_v1beta1_kraken.yaml @@ -2,11 +2,8 @@ apiVersion: sea-creatures.testproject.org/v1beta1 kind: Kraken metadata: labels: - app.kubernetes.io/name: kraken - app.kubernetes.io/instance: kraken-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: kraken-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/sea-creatures_v1beta2_leviathan.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/sea-creatures_v1beta2_leviathan.yaml index 0e5fff34936..9f81f626ca4 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/sea-creatures_v1beta2_leviathan.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/sea-creatures_v1beta2_leviathan.yaml @@ -2,11 +2,8 @@ apiVersion: sea-creatures.testproject.org/v1beta2 kind: Leviathan metadata: labels: - app.kubernetes.io/name: leviathan - app.kubernetes.io/instance: leviathan-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: leviathan-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v1_destroyer.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v1_destroyer.yaml index 1a22738bd1d..d3e31a73a65 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v1_destroyer.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v1_destroyer.yaml @@ -2,11 +2,8 @@ apiVersion: ship.testproject.org/v1 kind: Destroyer metadata: labels: - app.kubernetes.io/name: destroyer - app.kubernetes.io/instance: destroyer-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: destroyer-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v1beta1_frigate.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v1beta1_frigate.yaml index b7361d362d0..71166a0cf15 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v1beta1_frigate.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v1beta1_frigate.yaml @@ -2,11 +2,8 @@ apiVersion: ship.testproject.org/v1beta1 kind: Frigate metadata: labels: - app.kubernetes.io/name: frigate - app.kubernetes.io/instance: frigate-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: frigate-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v2alpha1_cruiser.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v2alpha1_cruiser.yaml index c55fc456ae7..e6872d9f31a 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v2alpha1_cruiser.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/samples/ship_v2alpha1_cruiser.yaml @@ -2,11 +2,8 @@ apiVersion: ship.testproject.org/v2alpha1 kind: Cruiser metadata: labels: - app.kubernetes.io/name: cruiser - app.kubernetes.io/instance: cruiser-sample - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image name: cruiser-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup-with-deploy-image/config/webhook/service.yaml b/testdata/project-v4-multigroup-with-deploy-image/config/webhook/service.yaml index a4d91d99775..55a8a9cbcb7 100644 --- a/testdata/project-v4-multigroup-with-deploy-image/config/webhook/service.yaml +++ b/testdata/project-v4-multigroup-with-deploy-image/config/webhook/service.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/name: service - app.kubernetes.io/instance: webhook-service - app.kubernetes.io/component: webhook - app.kubernetes.io/created-by: project-v4-multigroup-with-deploy-image - app.kubernetes.io/part-of: project-v4-multigroup-with-deploy-image + app.kubernetes.io/name: project-v4-multigroup-with-deploy-image app.kubernetes.io/managed-by: kustomize name: webhook-service namespace: system diff --git a/testdata/project-v4-multigroup/config/rbac/service_account.yaml b/testdata/project-v4-multigroup/config/rbac/service_account.yaml index 053e7010d11..25d4288f404 100644 --- a/testdata/project-v4-multigroup/config/rbac/service_account.yaml +++ b/testdata/project-v4-multigroup/config/rbac/service_account.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project-v4-multigroup - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/testdata/project-v4-multigroup/config/samples/_v1_lakers.yaml b/testdata/project-v4-multigroup/config/samples/_v1_lakers.yaml index b13042b5e4f..50825eb1a12 100644 --- a/testdata/project-v4-multigroup/config/samples/_v1_lakers.yaml +++ b/testdata/project-v4-multigroup/config/samples/_v1_lakers.yaml @@ -2,11 +2,8 @@ apiVersion: testproject.org/v1 kind: Lakers metadata: labels: - app.kubernetes.io/name: lakers - app.kubernetes.io/instance: lakers-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: lakers-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/samples/crew_v1_captain.yaml b/testdata/project-v4-multigroup/config/samples/crew_v1_captain.yaml index 7f84feadca7..0eed664c7cb 100644 --- a/testdata/project-v4-multigroup/config/samples/crew_v1_captain.yaml +++ b/testdata/project-v4-multigroup/config/samples/crew_v1_captain.yaml @@ -2,11 +2,8 @@ apiVersion: crew.testproject.org/v1 kind: Captain metadata: labels: - app.kubernetes.io/name: captain - app.kubernetes.io/instance: captain-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: captain-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/samples/fiz_v1_bar.yaml b/testdata/project-v4-multigroup/config/samples/fiz_v1_bar.yaml index 56d30403a6b..ded18d76876 100644 --- a/testdata/project-v4-multigroup/config/samples/fiz_v1_bar.yaml +++ b/testdata/project-v4-multigroup/config/samples/fiz_v1_bar.yaml @@ -2,11 +2,8 @@ apiVersion: fiz.testproject.org/v1 kind: Bar metadata: labels: - app.kubernetes.io/name: bar - app.kubernetes.io/instance: bar-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: bar-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/samples/foo.policy_v1_healthcheckpolicy.yaml b/testdata/project-v4-multigroup/config/samples/foo.policy_v1_healthcheckpolicy.yaml index 867ab13d4d5..945fe8b48ad 100644 --- a/testdata/project-v4-multigroup/config/samples/foo.policy_v1_healthcheckpolicy.yaml +++ b/testdata/project-v4-multigroup/config/samples/foo.policy_v1_healthcheckpolicy.yaml @@ -2,11 +2,8 @@ apiVersion: foo.policy.testproject.org/v1 kind: HealthCheckPolicy metadata: labels: - app.kubernetes.io/name: healthcheckpolicy - app.kubernetes.io/instance: healthcheckpolicy-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: healthcheckpolicy-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/samples/foo_v1_bar.yaml b/testdata/project-v4-multigroup/config/samples/foo_v1_bar.yaml index dc17789d06d..6de418e33d7 100644 --- a/testdata/project-v4-multigroup/config/samples/foo_v1_bar.yaml +++ b/testdata/project-v4-multigroup/config/samples/foo_v1_bar.yaml @@ -2,11 +2,8 @@ apiVersion: foo.testproject.org/v1 kind: Bar metadata: labels: - app.kubernetes.io/name: bar - app.kubernetes.io/instance: bar-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: bar-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta1_kraken.yaml b/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta1_kraken.yaml index dffed920120..0e0453d7c80 100644 --- a/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta1_kraken.yaml +++ b/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta1_kraken.yaml @@ -2,11 +2,8 @@ apiVersion: sea-creatures.testproject.org/v1beta1 kind: Kraken metadata: labels: - app.kubernetes.io/name: kraken - app.kubernetes.io/instance: kraken-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: kraken-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta2_leviathan.yaml b/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta2_leviathan.yaml index 043f37ea7cd..5d2125ed9b7 100644 --- a/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta2_leviathan.yaml +++ b/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta2_leviathan.yaml @@ -2,11 +2,8 @@ apiVersion: sea-creatures.testproject.org/v1beta2 kind: Leviathan metadata: labels: - app.kubernetes.io/name: leviathan - app.kubernetes.io/instance: leviathan-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: leviathan-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/samples/ship_v1_destroyer.yaml b/testdata/project-v4-multigroup/config/samples/ship_v1_destroyer.yaml index 2d228b9dd9f..946dee59890 100644 --- a/testdata/project-v4-multigroup/config/samples/ship_v1_destroyer.yaml +++ b/testdata/project-v4-multigroup/config/samples/ship_v1_destroyer.yaml @@ -2,11 +2,8 @@ apiVersion: ship.testproject.org/v1 kind: Destroyer metadata: labels: - app.kubernetes.io/name: destroyer - app.kubernetes.io/instance: destroyer-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: destroyer-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/samples/ship_v1beta1_frigate.yaml b/testdata/project-v4-multigroup/config/samples/ship_v1beta1_frigate.yaml index 8399b81ca10..b758b075bcf 100644 --- a/testdata/project-v4-multigroup/config/samples/ship_v1beta1_frigate.yaml +++ b/testdata/project-v4-multigroup/config/samples/ship_v1beta1_frigate.yaml @@ -2,11 +2,8 @@ apiVersion: ship.testproject.org/v1beta1 kind: Frigate metadata: labels: - app.kubernetes.io/name: frigate - app.kubernetes.io/instance: frigate-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: frigate-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/samples/ship_v2alpha1_cruiser.yaml b/testdata/project-v4-multigroup/config/samples/ship_v2alpha1_cruiser.yaml index 72366768d38..58d0c89226b 100644 --- a/testdata/project-v4-multigroup/config/samples/ship_v2alpha1_cruiser.yaml +++ b/testdata/project-v4-multigroup/config/samples/ship_v2alpha1_cruiser.yaml @@ -2,11 +2,8 @@ apiVersion: ship.testproject.org/v2alpha1 kind: Cruiser metadata: labels: - app.kubernetes.io/name: cruiser - app.kubernetes.io/instance: cruiser-sample - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4-multigroup name: cruiser-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4-multigroup/config/webhook/service.yaml b/testdata/project-v4-multigroup/config/webhook/service.yaml index d7e1bcd5364..0ba1f669758 100644 --- a/testdata/project-v4-multigroup/config/webhook/service.yaml +++ b/testdata/project-v4-multigroup/config/webhook/service.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/name: service - app.kubernetes.io/instance: webhook-service - app.kubernetes.io/component: webhook - app.kubernetes.io/created-by: project-v4-multigroup - app.kubernetes.io/part-of: project-v4-multigroup + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: webhook-service namespace: system diff --git a/testdata/project-v4-with-deploy-image/config/rbac/service_account.yaml b/testdata/project-v4-with-deploy-image/config/rbac/service_account.yaml index 0fd9fe02436..34cd64fa535 100644 --- a/testdata/project-v4-with-deploy-image/config/rbac/service_account.yaml +++ b/testdata/project-v4-with-deploy-image/config/rbac/service_account.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project-v4-with-deploy-image - app.kubernetes.io/part-of: project-v4-with-deploy-image + app.kubernetes.io/name: project-v4-with-deploy-image app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/testdata/project-v4-with-deploy-image/config/webhook/service.yaml b/testdata/project-v4-with-deploy-image/config/webhook/service.yaml index c1b1fa6be04..8501804b4d3 100644 --- a/testdata/project-v4-with-deploy-image/config/webhook/service.yaml +++ b/testdata/project-v4-with-deploy-image/config/webhook/service.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/name: service - app.kubernetes.io/instance: webhook-service - app.kubernetes.io/component: webhook - app.kubernetes.io/created-by: project-v4-with-deploy-image - app.kubernetes.io/part-of: project-v4-with-deploy-image + app.kubernetes.io/name: project-v4-with-deploy-image app.kubernetes.io/managed-by: kustomize name: webhook-service namespace: system diff --git a/testdata/project-v4-with-deploy-image/dist/install.yaml b/testdata/project-v4-with-deploy-image/dist/install.yaml index b0be01a0443..750c54fb65f 100644 --- a/testdata/project-v4-with-deploy-image/dist/install.yaml +++ b/testdata/project-v4-with-deploy-image/dist/install.yaml @@ -561,12 +561,8 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project-v4-with-deploy-image - app.kubernetes.io/instance: controller-manager-sa app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/part-of: project-v4-with-deploy-image + app.kubernetes.io/name: project-v4-with-deploy-image name: project-v4-with-deploy-image-controller-manager namespace: project-v4-with-deploy-image-system --- @@ -829,12 +825,8 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: webhook - app.kubernetes.io/created-by: project-v4-with-deploy-image - app.kubernetes.io/instance: webhook-service app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: service - app.kubernetes.io/part-of: project-v4-with-deploy-image + app.kubernetes.io/name: project-v4-with-deploy-image name: project-v4-with-deploy-image-webhook-service namespace: project-v4-with-deploy-image-system spec: 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 index 95a3a1807b0..2e37f4990e8 100644 --- a/testdata/project-v4-with-deploy-image/internal/controller/busybox_controller.go +++ b/testdata/project-v4-with-deploy-image/internal/controller/busybox_controller.go @@ -403,11 +403,9 @@ func labelsForBusybox(name string) map[string]string { if err == nil { imageTag = strings.Split(image, ":")[1] } - return map[string]string{"app.kubernetes.io/name": "Busybox", - "app.kubernetes.io/instance": name, + return map[string]string{"app.kubernetes.io/name": "project-v4-with-deploy-image", "app.kubernetes.io/version": imageTag, - "app.kubernetes.io/part-of": "project-v4-with-deploy-image", - "app.kubernetes.io/created-by": "controller-manager", + "app.kubernetes.io/managed-by": "BusyboxController", } } diff --git a/testdata/project-v4-with-deploy-image/internal/controller/memcached_controller.go b/testdata/project-v4-with-deploy-image/internal/controller/memcached_controller.go index 593332c308f..d5ffdcd5ff6 100644 --- a/testdata/project-v4-with-deploy-image/internal/controller/memcached_controller.go +++ b/testdata/project-v4-with-deploy-image/internal/controller/memcached_controller.go @@ -409,11 +409,9 @@ func labelsForMemcached(name string) map[string]string { if err == nil { imageTag = strings.Split(image, ":")[1] } - return map[string]string{"app.kubernetes.io/name": "Memcached", - "app.kubernetes.io/instance": name, + return map[string]string{"app.kubernetes.io/name": "project-v4-with-deploy-image", "app.kubernetes.io/version": imageTag, - "app.kubernetes.io/part-of": "project-v4-with-deploy-image", - "app.kubernetes.io/created-by": "controller-manager", + "app.kubernetes.io/managed-by": "MemcachedController", } } diff --git a/testdata/project-v4-with-grafana/config/rbac/service_account.yaml b/testdata/project-v4-with-grafana/config/rbac/service_account.yaml index 04f10b75d76..24c0d3eb365 100644 --- a/testdata/project-v4-with-grafana/config/rbac/service_account.yaml +++ b/testdata/project-v4-with-grafana/config/rbac/service_account.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project-v4-with-grafana - app.kubernetes.io/part-of: project-v4-with-grafana + app.kubernetes.io/name: project-v4-with-grafana app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/testdata/project-v4-with-grafana/dist/install.yaml b/testdata/project-v4-with-grafana/dist/install.yaml index db1a1e0b011..f675c19d81f 100644 --- a/testdata/project-v4-with-grafana/dist/install.yaml +++ b/testdata/project-v4-with-grafana/dist/install.yaml @@ -16,12 +16,8 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project-v4-with-grafana - app.kubernetes.io/instance: controller-manager-sa app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/part-of: project-v4-with-grafana + app.kubernetes.io/name: project-v4-with-grafana name: project-v4-with-grafana-controller-manager namespace: project-v4-with-grafana-system --- diff --git a/testdata/project-v4/config/rbac/service_account.yaml b/testdata/project-v4/config/rbac/service_account.yaml index b8a53562792..af2cba9e305 100644 --- a/testdata/project-v4/config/rbac/service_account.yaml +++ b/testdata/project-v4/config/rbac/service_account.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project-v4 - app.kubernetes.io/part-of: project-v4 + app.kubernetes.io/name: project-v4 app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/testdata/project-v4/config/samples/crew_v1_admiral.yaml b/testdata/project-v4/config/samples/crew_v1_admiral.yaml index 87cd26169f9..509a62be362 100644 --- a/testdata/project-v4/config/samples/crew_v1_admiral.yaml +++ b/testdata/project-v4/config/samples/crew_v1_admiral.yaml @@ -2,11 +2,8 @@ apiVersion: crew.testproject.org/v1 kind: Admiral metadata: labels: - app.kubernetes.io/name: admiral - app.kubernetes.io/instance: admiral-sample - app.kubernetes.io/part-of: project-v4 + app.kubernetes.io/name: project-v4 app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4 name: admiral-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4/config/samples/crew_v1_captain.yaml b/testdata/project-v4/config/samples/crew_v1_captain.yaml index 35896bc25e4..2df6b6a1787 100644 --- a/testdata/project-v4/config/samples/crew_v1_captain.yaml +++ b/testdata/project-v4/config/samples/crew_v1_captain.yaml @@ -2,11 +2,8 @@ apiVersion: crew.testproject.org/v1 kind: Captain metadata: labels: - app.kubernetes.io/name: captain - app.kubernetes.io/instance: captain-sample - app.kubernetes.io/part-of: project-v4 + app.kubernetes.io/name: project-v4 app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4 name: captain-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4/config/samples/crew_v1_firstmate.yaml b/testdata/project-v4/config/samples/crew_v1_firstmate.yaml index ca463f933a3..6aca7b03b33 100644 --- a/testdata/project-v4/config/samples/crew_v1_firstmate.yaml +++ b/testdata/project-v4/config/samples/crew_v1_firstmate.yaml @@ -2,11 +2,8 @@ apiVersion: crew.testproject.org/v1 kind: FirstMate metadata: labels: - app.kubernetes.io/name: firstmate - app.kubernetes.io/instance: firstmate-sample - app.kubernetes.io/part-of: project-v4 + app.kubernetes.io/name: project-v4 app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: project-v4 name: firstmate-sample spec: # TODO(user): Add fields here diff --git a/testdata/project-v4/config/webhook/service.yaml b/testdata/project-v4/config/webhook/service.yaml index 143e9b35ec3..6a4df7b8018 100644 --- a/testdata/project-v4/config/webhook/service.yaml +++ b/testdata/project-v4/config/webhook/service.yaml @@ -2,11 +2,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/name: service - app.kubernetes.io/instance: webhook-service - app.kubernetes.io/component: webhook - app.kubernetes.io/created-by: project-v4 - app.kubernetes.io/part-of: project-v4 + app.kubernetes.io/name: project-v4 app.kubernetes.io/managed-by: kustomize name: webhook-service namespace: system diff --git a/testdata/project-v4/dist/install.yaml b/testdata/project-v4/dist/install.yaml index cedf2b137b6..6c21fbb6ffd 100644 --- a/testdata/project-v4/dist/install.yaml +++ b/testdata/project-v4/dist/install.yaml @@ -399,12 +399,8 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: project-v4 - app.kubernetes.io/instance: controller-manager-sa app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/part-of: project-v4 + app.kubernetes.io/name: project-v4 name: project-v4-controller-manager namespace: project-v4-system --- @@ -692,12 +688,8 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/component: webhook - app.kubernetes.io/created-by: project-v4 - app.kubernetes.io/instance: webhook-service app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: service - app.kubernetes.io/part-of: project-v4 + app.kubernetes.io/name: project-v4 name: project-v4-webhook-service namespace: project-v4-system spec: