weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
to help troubleshooting make the helm chart container names unique
This commit is contained in:
jetstack-bot 2022-08-30 11:50:31 +01:00 committed by GitHub
commit 5c82440729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/charts/cert-manager/templates/cainjector-deployment.yaml
View File

@ -53,7 +53,7 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}-cainjector
{{- with .Values.cainjector.image }} {{- with .Values.cainjector.image }}
image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}" image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}"
{{- end }} {{- end }}

2
deploy/charts/cert-manager/templates/deployment.yaml
View File

@ -64,7 +64,7 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}-controller
{{- with .Values.image }} {{- with .Values.image }}
image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}" image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}"
{{- end }} {{- end }}

2
deploy/charts/cert-manager/templates/startupapicheck-job.yaml
View File

@ -42,7 +42,7 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}-startupapicheck
{{- with .Values.startupapicheck.image }} {{- with .Values.startupapicheck.image }}
image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}" image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}"
{{- end }} {{- end }}

2
deploy/charts/cert-manager/templates/webhook-deployment.yaml
View File

@ -55,7 +55,7 @@ spec:
hostNetwork: true hostNetwork: true
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}-webhook
{{- with .Values.webhook.image }} {{- with .Values.webhook.image }}
image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}" image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}"
{{- end }} {{- end }}

2
test/fixtures/upgrade/overlay/cainjector-ops.yaml vendored
View File

@ -21,5 +21,5 @@ spec:
template: template:
spec: spec:
containers: 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) - image: #@ "docker.io/library/cert-manager-cainjector-amd64:{}".format(data.values.app_version)

2
test/fixtures/upgrade/overlay/controller-ops.yaml vendored
View File

@ -21,6 +21,6 @@ spec:
template: template:
spec: spec:
containers: 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) - image: #@ "docker.io/library/cert-manager-controller-amd64:{}".format(data.values.app_version)

2
test/fixtures/upgrade/overlay/webhook-ops.yaml vendored
View File

@ -21,5 +21,5 @@ spec:
template: template:
spec: spec:
containers: 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) - image: #@ "docker.io/library/cert-manager-webhook-amd64:{}".format(data.values.app_version)