DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix-duplicate-sercret

Browse source
This commit is contained in:
Atze de Vries 2021-05-26 12:25:59 +02:00 committed by GitHub
commit 809c724997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-rollouts/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "0.10.2" appVersion: "0.10.2"
description: A Helm chart for Argo Rollouts description: A Helm chart for Argo Rollouts
name: argo-rollouts name: argo-rollouts
version: 0.5.4 version: 0.5.5
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
maintainers: maintainers:

2
charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
View file

@ -37,8 +37,6 @@ spec:
{{- end }} {{- end }}
imagePullPolicy: {{ .Values.controller.image.pullPolicy }} imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
name: {{ .Values.controller.name }} name: {{ .Values.controller.name }}
resources:
{{- toYaml .Values.controller.resources | nindent 10 }}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext | nindent 12 }}
resources: resources:

2
charts/argo-workflows/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
name: argo-workflows name: argo-workflows
description: A Helm chart for Argo Workflows description: A Helm chart for Argo Workflows
type: application type: application
version: 0.1.3 version: 0.1.4
appVersion: "v3.0.2" appVersion: "v3.0.2"
icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo-workflows/master/docs/assets/argo.png
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm

2
charts/argo-workflows/templates/server/server-deployment.yaml
View file

@ -21,7 +21,7 @@ spec:
{{- end }} {{- end }}
{{- with .Values.server.podAnnotations }} {{- with .Values.server.podAnnotations }}
annotations: annotations:
{{- toYaml .Values.server.podAnnotations | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
spec: spec:
serviceAccountName: {{ template "argo-workflows.serverServiceAccountName" . }} serviceAccountName: {{ template "argo-workflows.serverServiceAccountName" . }}