From 0b36d0c4021bbf52f29d5a990157466761ec180c Mon Sep 17 00:00:00 2001 From: Marc Villacorta Date: Wed, 26 Oct 2022 18:14:36 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20(kustomize/v2-alpha):=20Fix=20ty?= =?UTF-8?q?po=20issue=20in=20the=20labels=20added=20to=20the=20manifests?= =?UTF-8?q?=20(#3047)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix typo in kubernets (missing 'e') * make generate --- .../scaffolds/internal/templates/config/prometheus/monitor.go | 2 +- .../internal/templates/config/rbac/leader_election_role.go | 2 +- testdata/project-v3-addon-and-grafana/Makefile | 2 +- testdata/project-v3-config/Makefile | 2 +- testdata/project-v3-multigroup/Makefile | 2 +- testdata/project-v3-with-deploy-image/Makefile | 2 +- testdata/project-v3/Makefile | 2 +- testdata/project-v4-addon-and-grafana/Makefile | 2 +- .../project-v4-addon-and-grafana/config/prometheus/monitor.yaml | 2 +- .../config/rbac/leader_election_role.yaml | 2 +- testdata/project-v4-config/Makefile | 2 +- testdata/project-v4-config/config/prometheus/monitor.yaml | 2 +- .../project-v4-config/config/rbac/leader_election_role.yaml | 2 +- testdata/project-v4-multigroup/Makefile | 2 +- testdata/project-v4-multigroup/config/prometheus/monitor.yaml | 2 +- .../project-v4-multigroup/config/rbac/leader_election_role.yaml | 2 +- testdata/project-v4-with-deploy-image/Makefile | 2 +- .../project-v4-with-deploy-image/config/prometheus/monitor.yaml | 2 +- .../config/rbac/leader_election_role.yaml | 2 +- testdata/project-v4/Makefile | 2 +- testdata/project-v4/config/prometheus/monitor.yaml | 2 +- testdata/project-v4/config/rbac/leader_election_role.yaml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/prometheus/monitor.go b/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/prometheus/monitor.go index c1e6342911..2a541cd5e6 100644 --- a/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/prometheus/monitor.go +++ b/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/prometheus/monitor.go @@ -48,7 +48,7 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - app.kubernets.io/name: servicemonitor + app.kubernetes.io/name: servicemonitor app.kubernetes.io/instance: controller-manager-metrics-monitor app.kubernetes.io/component: metrics app.kubernetes.io/created-by: {{ .ProjectName }} diff --git a/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/leader_election_role.go b/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/leader_election_role.go index 898c7984ba..79143b86cd 100644 --- a/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/leader_election_role.go +++ b/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/leader_election_role.go @@ -51,7 +51,7 @@ metadata: app.kubernetes.io/component: rbac app.kubernetes.io/created-by: {{ .ProjectName }} app.kubernetes.io/part-of: {{ .ProjectName }} - app.kubernets.io/managed-by: kustomize + app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: - apiGroups: diff --git a/testdata/project-v3-addon-and-grafana/Makefile b/testdata/project-v3-addon-and-grafana/Makefile index e0d3b489f7..b114264c2e 100644 --- a/testdata/project-v3-addon-and-grafana/Makefile +++ b/testdata/project-v3-addon-and-grafana/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v3-config/Makefile b/testdata/project-v3-config/Makefile index e0d3b489f7..b114264c2e 100644 --- a/testdata/project-v3-config/Makefile +++ b/testdata/project-v3-config/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v3-multigroup/Makefile b/testdata/project-v3-multigroup/Makefile index e0d3b489f7..b114264c2e 100644 --- a/testdata/project-v3-multigroup/Makefile +++ b/testdata/project-v3-multigroup/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v3-with-deploy-image/Makefile b/testdata/project-v3-with-deploy-image/Makefile index e0d3b489f7..b114264c2e 100644 --- a/testdata/project-v3-with-deploy-image/Makefile +++ b/testdata/project-v3-with-deploy-image/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v3/Makefile b/testdata/project-v3/Makefile index e0d3b489f7..b114264c2e 100644 --- a/testdata/project-v3/Makefile +++ b/testdata/project-v3/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v4-addon-and-grafana/Makefile b/testdata/project-v4-addon-and-grafana/Makefile index 40ea2594bc..59fbc79832 100644 --- a/testdata/project-v4-addon-and-grafana/Makefile +++ b/testdata/project-v4-addon-and-grafana/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v4-addon-and-grafana/config/prometheus/monitor.yaml b/testdata/project-v4-addon-and-grafana/config/prometheus/monitor.yaml index 409c03a0ae..2fe2137fd3 100644 --- a/testdata/project-v4-addon-and-grafana/config/prometheus/monitor.yaml +++ b/testdata/project-v4-addon-and-grafana/config/prometheus/monitor.yaml @@ -5,7 +5,7 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - app.kubernets.io/name: servicemonitor + app.kubernetes.io/name: servicemonitor app.kubernetes.io/instance: controller-manager-metrics-monitor app.kubernetes.io/component: metrics app.kubernetes.io/created-by: project-v4-addon-and-grafana diff --git a/testdata/project-v4-addon-and-grafana/config/rbac/leader_election_role.yaml b/testdata/project-v4-addon-and-grafana/config/rbac/leader_election_role.yaml index f5a38e619b..71377c9fe7 100644 --- a/testdata/project-v4-addon-and-grafana/config/rbac/leader_election_role.yaml +++ b/testdata/project-v4-addon-and-grafana/config/rbac/leader_election_role.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: rbac app.kubernetes.io/created-by: project-v4-addon-and-grafana app.kubernetes.io/part-of: project-v4-addon-and-grafana - app.kubernets.io/managed-by: kustomize + app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: - apiGroups: diff --git a/testdata/project-v4-config/Makefile b/testdata/project-v4-config/Makefile index 40ea2594bc..59fbc79832 100644 --- a/testdata/project-v4-config/Makefile +++ b/testdata/project-v4-config/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v4-config/config/prometheus/monitor.yaml b/testdata/project-v4-config/config/prometheus/monitor.yaml index c8c4a380ac..f6e7a3de4c 100644 --- a/testdata/project-v4-config/config/prometheus/monitor.yaml +++ b/testdata/project-v4-config/config/prometheus/monitor.yaml @@ -5,7 +5,7 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - app.kubernets.io/name: servicemonitor + app.kubernetes.io/name: servicemonitor app.kubernetes.io/instance: controller-manager-metrics-monitor app.kubernetes.io/component: metrics app.kubernetes.io/created-by: project-v4-config diff --git a/testdata/project-v4-config/config/rbac/leader_election_role.yaml b/testdata/project-v4-config/config/rbac/leader_election_role.yaml index d905f15954..8cac2ff5cd 100644 --- a/testdata/project-v4-config/config/rbac/leader_election_role.yaml +++ b/testdata/project-v4-config/config/rbac/leader_election_role.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: rbac app.kubernetes.io/created-by: project-v4-config app.kubernetes.io/part-of: project-v4-config - app.kubernets.io/managed-by: kustomize + app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: - apiGroups: diff --git a/testdata/project-v4-multigroup/Makefile b/testdata/project-v4-multigroup/Makefile index 40ea2594bc..59fbc79832 100644 --- a/testdata/project-v4-multigroup/Makefile +++ b/testdata/project-v4-multigroup/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v4-multigroup/config/prometheus/monitor.yaml b/testdata/project-v4-multigroup/config/prometheus/monitor.yaml index 33f3c68d31..d3ce1edfba 100644 --- a/testdata/project-v4-multigroup/config/prometheus/monitor.yaml +++ b/testdata/project-v4-multigroup/config/prometheus/monitor.yaml @@ -5,7 +5,7 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - app.kubernets.io/name: servicemonitor + app.kubernetes.io/name: servicemonitor app.kubernetes.io/instance: controller-manager-metrics-monitor app.kubernetes.io/component: metrics app.kubernetes.io/created-by: project-v4-multigroup diff --git a/testdata/project-v4-multigroup/config/rbac/leader_election_role.yaml b/testdata/project-v4-multigroup/config/rbac/leader_election_role.yaml index be63d6180c..c1d90a4079 100644 --- a/testdata/project-v4-multigroup/config/rbac/leader_election_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/leader_election_role.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: rbac app.kubernetes.io/created-by: project-v4-multigroup app.kubernetes.io/part-of: project-v4-multigroup - app.kubernets.io/managed-by: kustomize + app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: - apiGroups: diff --git a/testdata/project-v4-with-deploy-image/Makefile b/testdata/project-v4-with-deploy-image/Makefile index 40ea2594bc..59fbc79832 100644 --- a/testdata/project-v4-with-deploy-image/Makefile +++ b/testdata/project-v4-with-deploy-image/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v4-with-deploy-image/config/prometheus/monitor.yaml b/testdata/project-v4-with-deploy-image/config/prometheus/monitor.yaml index 3b8eda59cc..ff90e88a9d 100644 --- a/testdata/project-v4-with-deploy-image/config/prometheus/monitor.yaml +++ b/testdata/project-v4-with-deploy-image/config/prometheus/monitor.yaml @@ -5,7 +5,7 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - app.kubernets.io/name: servicemonitor + app.kubernetes.io/name: servicemonitor app.kubernetes.io/instance: controller-manager-metrics-monitor app.kubernetes.io/component: metrics app.kubernetes.io/created-by: project-v4-with-deploy-image diff --git a/testdata/project-v4-with-deploy-image/config/rbac/leader_election_role.yaml b/testdata/project-v4-with-deploy-image/config/rbac/leader_election_role.yaml index 4517ceede7..8865042f19 100644 --- a/testdata/project-v4-with-deploy-image/config/rbac/leader_election_role.yaml +++ b/testdata/project-v4-with-deploy-image/config/rbac/leader_election_role.yaml @@ -8,7 +8,7 @@ metadata: 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.kubernets.io/managed-by: kustomize + app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: - apiGroups: diff --git a/testdata/project-v4/Makefile b/testdata/project-v4/Makefile index 40ea2594bc..59fbc79832 100644 --- a/testdata/project-v4/Makefile +++ b/testdata/project-v4/Makefile @@ -92,7 +92,7 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder docker buildx use project-v3-builder - - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - docker buildx rm project-v3-builder rm Dockerfile.cross diff --git a/testdata/project-v4/config/prometheus/monitor.yaml b/testdata/project-v4/config/prometheus/monitor.yaml index 656b0620d1..854bbfb785 100644 --- a/testdata/project-v4/config/prometheus/monitor.yaml +++ b/testdata/project-v4/config/prometheus/monitor.yaml @@ -5,7 +5,7 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - app.kubernets.io/name: servicemonitor + app.kubernetes.io/name: servicemonitor app.kubernetes.io/instance: controller-manager-metrics-monitor app.kubernetes.io/component: metrics app.kubernetes.io/created-by: project-v4 diff --git a/testdata/project-v4/config/rbac/leader_election_role.yaml b/testdata/project-v4/config/rbac/leader_election_role.yaml index c748f1c718..d52704102f 100644 --- a/testdata/project-v4/config/rbac/leader_election_role.yaml +++ b/testdata/project-v4/config/rbac/leader_election_role.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: rbac app.kubernetes.io/created-by: project-v4 app.kubernetes.io/part-of: project-v4 - app.kubernets.io/managed-by: kustomize + app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: - apiGroups: