linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

multicluster: normalize nginx configmap naming (#4508) 

For the Edge-20.5.6 release notes: Mention under the Helm section that the user might wanna manually remove the `nginx-configuration` configmap that is left over after this upgrade.

Signed-off-by: Mayank Shah <mayankshah1614@gmail.com>
This commit is contained in:
Mayank Shah 2020-06-02 01:25:53 +05:30 committed by GitHub
parent 16d2d4bf81
commit 2f710f48c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/linkerd2-multicluster/templates/gateway.yaml
View File

@ -3,7 +3,7 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: nginx-configuration name: linkerd-gateway
annotations: annotations:
{{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.linkerdVersion) .Values.cliVersion}} {{.Values.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.linkerdVersion) .Values.cliVersion}}
namespace: {{.Values.namespace}} namespace: {{.Values.namespace}}
@ -63,7 +63,7 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: nginx-configuration name: linkerd-gateway
containers: containers:
- name: nginx - name: nginx
readinessProbe: readinessProbe: