Merge branch 'master' into andyfeller-patch-1-1

This commit is contained in:
Andy Feller 2020-06-12 15:40:46 -04:00 committed by GitHub
commit a43dcc3067
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

View file

@ -5,6 +5,8 @@ metadata:
labels: labels:
{{- include "argocd-notifications.labels" . | nindent 4 }} {{- include "argocd-notifications.labels" . | nindent 4 }}
spec: spec:
strategy:
{{- .Values.updateStrategy | toYaml | nindent 4 }}
selector: selector:
matchLabels: matchLabels:
{{- include "argocd-notifications.selectorLabels" . | nindent 6 }} {{- include "argocd-notifications.selectorLabels" . | nindent 6 }}
@ -13,8 +15,6 @@ spec:
labels: labels:
{{- include "argocd-notifications.selectorLabels" . | nindent 8 }} {{- include "argocd-notifications.selectorLabels" . | nindent 8 }}
spec: spec:
strategy:
type: Recreate
{{- with .Values.imagePullSecrets }} {{- with .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

View file

@ -16,6 +16,9 @@ nameOverride: "argocd-notifications"
nodeSelector: {} nodeSelector: {}
updateStrategy:
type: Recreate
secret: secret:
# Whether helm chart creates controller secret # Whether helm chart creates controller secret
create: true create: true