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

Merge branch 'master' into feat-argo-events-serviceaccount-annotations

Browse source
This commit is contained in:
Marco Kilchhofer 2021-05-26 23:19:38 +02:00 committed by GitHub
commit cd1db05239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 2.0.1 appVersion: 2.0.1
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 3.6.1 version: 3.6.2
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

2
charts/argo-cd/templates/argocd-server/certificate.yaml
View file

@ -23,5 +23,5 @@ spec:
issuerRef: issuerRef:
kind: {{ .Values.server.certificate.issuer.kind | quote }} kind: {{ .Values.server.certificate.issuer.kind | quote }}
name: {{ .Values.server.certificate.issuer.name | quote }} name: {{ .Values.server.certificate.issuer.name | quote }}
secretName: argocd-secret secretName: argocd-tls-certificate
{{- end }} {{- end }}

4
charts/argo-cd/values.yaml
View file

@ -561,7 +561,7 @@ server:
# servicePort: use-annotation # servicePort: use-annotation
tls: tls:
[] []
# - secretName: argocd-example-tls # - secretName: argocd-tls-certificate
# hosts: # hosts:
# - argocd.example.com # - argocd.example.com
https: false https: false
@ -590,7 +590,7 @@ server:
# servicePort: use-annotation # servicePort: use-annotation
tls: tls:
[] []
# - secretName: argocd-example-tls # - secretName: argocd-tls-certificate
# hosts: # hosts:
# - argocd.example.com # - argocd.example.com
https: false https: false

1
charts/argo-events/templates/eventbus-controller-deployment.yaml
View file

@ -55,6 +55,7 @@ spec:
port: 8081 port: 8081
initialDelaySeconds: 3 initialDelaySeconds: 3
periodSeconds: 3 periodSeconds: 3
resources: {{- toYaml .Values.eventbusController.resources | nindent 12 }}
{{- with .Values.eventbusController.priorityClassName }} {{- with .Values.eventbusController.priorityClassName }}
priorityClassName: {{ . | quote }} priorityClassName: {{ . | quote }}
{{- end }} {{- end }}

1
charts/argo-events/templates/eventsource-controller-deployment.yaml
View file

@ -53,6 +53,7 @@ spec:
port: 8081 port: 8081
initialDelaySeconds: 3 initialDelaySeconds: 3
periodSeconds: 3 periodSeconds: 3
resources: {{- toYaml .Values.eventsourceController.resources | nindent 12 }}
{{- with .Values.eventsourceController.priorityClassName }} {{- with .Values.eventsourceController.priorityClassName }}
priorityClassName: {{ . | quote }} priorityClassName: {{ . | quote }}
{{- end }} {{- end }}

1
charts/argo-events/templates/sensor-controller-deployment.yaml
View file

@ -53,6 +53,7 @@ spec:
port: 8081 port: 8081
initialDelaySeconds: 3 initialDelaySeconds: 3
periodSeconds: 3 periodSeconds: 3
resources: {{- toYaml .Values.sensorController.resources | nindent 12 }}
{{- with .Values.sensorController.priorityClassName }} {{- with .Values.sensorController.priorityClassName }}
priorityClassName: {{ . | quote }} priorityClassName: {{ . | quote }}
{{- end }} {{- end }}

3
charts/argo-events/values.yaml
View file

@ -57,6 +57,7 @@ sensorController:
priorityClassName: "" priorityClassName: ""
tolerations: [] tolerations: []
affinity: {} affinity: {}
resources: {}
eventsourceController: eventsourceController:
name: eventsource-controller name: eventsource-controller
@ -70,6 +71,7 @@ eventsourceController:
priorityClassName: "" priorityClassName: ""
tolerations: [] tolerations: []
affinity: {} affinity: {}
resources: {}
eventbusController: eventbusController:
name: eventbus-controller name: eventbus-controller
@ -82,6 +84,7 @@ eventbusController:
priorityClassName: "" priorityClassName: ""
tolerations: [] tolerations: []
affinity: {} affinity: {}
resources: {}
natsStreamingImage: nats-streaming:0.17.0 natsStreamingImage: nats-streaming:0.17.0
natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2 natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2

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