From d66755acd14d9403d0d3b56330acbd267979aba5 Mon Sep 17 00:00:00 2001 From: Rui Lopes Date: Sun, 28 Aug 2022 12:03:17 +0100 Subject: [PATCH 1/2] to help troubleshooting make the helm chart container names unique closes #5355 Signed-off-by: Rui Lopes --- deploy/charts/cert-manager/templates/cainjector-deployment.yaml | 2 +- deploy/charts/cert-manager/templates/deployment.yaml | 2 +- deploy/charts/cert-manager/templates/startupapicheck-job.yaml | 2 +- deploy/charts/cert-manager/templates/webhook-deployment.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/charts/cert-manager/templates/cainjector-deployment.yaml b/deploy/charts/cert-manager/templates/cainjector-deployment.yaml index d7f6fcaa5..fbfed0fce 100644 --- a/deploy/charts/cert-manager/templates/cainjector-deployment.yaml +++ b/deploy/charts/cert-manager/templates/cainjector-deployment.yaml @@ -53,7 +53,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: {{ .Chart.Name }}-cainjector {{- with .Values.cainjector.image }} image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}" {{- end }} diff --git a/deploy/charts/cert-manager/templates/deployment.yaml b/deploy/charts/cert-manager/templates/deployment.yaml index 432dde9ff..7f99a9796 100644 --- a/deploy/charts/cert-manager/templates/deployment.yaml +++ b/deploy/charts/cert-manager/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: {{ .Chart.Name }}-controller {{- with .Values.image }} image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}" {{- end }} diff --git a/deploy/charts/cert-manager/templates/startupapicheck-job.yaml b/deploy/charts/cert-manager/templates/startupapicheck-job.yaml index 468cbb615..f55b5fe15 100644 --- a/deploy/charts/cert-manager/templates/startupapicheck-job.yaml +++ b/deploy/charts/cert-manager/templates/startupapicheck-job.yaml @@ -42,7 +42,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: {{ .Chart.Name }}-startupapicheck {{- with .Values.startupapicheck.image }} image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}" {{- end }} diff --git a/deploy/charts/cert-manager/templates/webhook-deployment.yaml b/deploy/charts/cert-manager/templates/webhook-deployment.yaml index 8ab668971..9e27afd61 100644 --- a/deploy/charts/cert-manager/templates/webhook-deployment.yaml +++ b/deploy/charts/cert-manager/templates/webhook-deployment.yaml @@ -55,7 +55,7 @@ spec: hostNetwork: true {{- end }} containers: - - name: {{ .Chart.Name }} + - name: {{ .Chart.Name }}-webhook {{- with .Values.webhook.image }} image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}" {{- end }} From 6debee4a54dcc9a8e46ec783a96eeca77cf52062 Mon Sep 17 00:00:00 2001 From: Tim Ramlot <42113979+inteon@users.noreply.github.com> Date: Sun, 28 Aug 2022 21:40:35 +0200 Subject: [PATCH 2/2] update container names in ytt overlays Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- test/fixtures/upgrade/overlay/cainjector-ops.yaml | 2 +- test/fixtures/upgrade/overlay/controller-ops.yaml | 2 +- test/fixtures/upgrade/overlay/webhook-ops.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/fixtures/upgrade/overlay/cainjector-ops.yaml b/test/fixtures/upgrade/overlay/cainjector-ops.yaml index 890800eff..23877819a 100644 --- a/test/fixtures/upgrade/overlay/cainjector-ops.yaml +++ b/test/fixtures/upgrade/overlay/cainjector-ops.yaml @@ -21,5 +21,5 @@ spec: template: spec: containers: - #@overlay/match by=overlay.subset({"name": "cert-manager"}) + #@overlay/match by=overlay.subset({"name": "cert-manager-cainjector"}) - image: #@ "docker.io/library/cert-manager-cainjector-amd64:{}".format(data.values.app_version) diff --git a/test/fixtures/upgrade/overlay/controller-ops.yaml b/test/fixtures/upgrade/overlay/controller-ops.yaml index 6a86debae..3533b6589 100644 --- a/test/fixtures/upgrade/overlay/controller-ops.yaml +++ b/test/fixtures/upgrade/overlay/controller-ops.yaml @@ -21,6 +21,6 @@ spec: template: spec: containers: - #@overlay/match by=overlay.subset({"name": "cert-manager"}) + #@overlay/match by=overlay.subset({"name": "cert-manager-controller"}) - image: #@ "docker.io/library/cert-manager-controller-amd64:{}".format(data.values.app_version) diff --git a/test/fixtures/upgrade/overlay/webhook-ops.yaml b/test/fixtures/upgrade/overlay/webhook-ops.yaml index dea974404..ba9cc2b8d 100644 --- a/test/fixtures/upgrade/overlay/webhook-ops.yaml +++ b/test/fixtures/upgrade/overlay/webhook-ops.yaml @@ -21,5 +21,5 @@ spec: template: spec: containers: - #@overlay/match by=overlay.subset({"name": "cert-manager"}) + #@overlay/match by=overlay.subset({"name": "cert-manager-webhook"}) - image: #@ "docker.io/library/cert-manager-webhook-amd64:{}".format(data.values.app_version)