Merge pull request #5410 from rgl/rgl-unique-container-names

to help troubleshooting make the helm chart container names unique

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 }}

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 }}

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 }}

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 }}

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)

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)
 

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)