Merge pull request #78 from codefresh-io/CR-23749-argo-cd-event-reporter-ca-cert
feat: event-reporter codefresh cert support
This commit is contained in:
commit
856d6efcdc
2 changed files with 21 additions and 6 deletions
|
@ -1,9 +1,9 @@
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
appVersion: v2.10-2024.5.14-9315e75e1
|
appVersion: v2.10-2024.6.17-77e06d0f6
|
||||||
kubeVersion: ">=1.23.0-0"
|
kubeVersion: ">=1.23.0-0"
|
||||||
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||||
name: argo-cd
|
name: argo-cd
|
||||||
version: 6.7.18-3-cap-2.10-2024.5.14-9315e75e1
|
version: 6.7.18-4-cap-2.10-2024.6.17-77e06d0f6
|
||||||
home: https://github.com/argoproj/argo-helm
|
home: https://github.com/argoproj/argo-helm
|
||||||
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -27,6 +27,4 @@ annotations:
|
||||||
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
||||||
artifacthub.io/changes: |
|
artifacthub.io/changes: |
|
||||||
- kind: changed
|
- kind: changed
|
||||||
description: Upgrade argo-cd to v2.10-2024.5.14-9315e75e1
|
description: Upgrade argo-cd to v2.10-2024.6.17-77e06d0f6
|
||||||
- kind: changed
|
|
||||||
description: Fix for security vulnerability GHSA-9766-5277-j5hr - Redis authentication
|
|
||||||
|
|
|
@ -101,6 +101,11 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
key: token
|
key: token
|
||||||
name: codefresh-token
|
name: codefresh-token
|
||||||
|
{{- if or .Values.global.codefresh.tls.caCerts.secret.create .Values.global.codefresh.tls.caCerts.secretKeyRef }}
|
||||||
|
{{- $key := .Values.global.codefresh.tls.caCerts.secret.create | ternary (default "ca-bundle.crt" .Values.global.codefresh.tls.caCerts.secret.key) .Values.global.codefresh.tls.caCerts.secretKeyRef.key }}
|
||||||
|
- name: CODEFRESH_SSL_CERT_PATH
|
||||||
|
value: /app/config/codefresh-tls-certs/{{ $key }}
|
||||||
|
{{- end }}
|
||||||
# todo: clean up
|
# todo: clean up
|
||||||
- name: EVENT_REPORTER_INSECURE
|
- name: EVENT_REPORTER_INSECURE
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
@ -218,7 +223,7 @@ spec:
|
||||||
successThreshold: {{ .Values.eventReporter.readinessProbe.successThreshold }}
|
successThreshold: {{ .Values.eventReporter.readinessProbe.successThreshold }}
|
||||||
failureThreshold: {{ .Values.eventReporter.readinessProbe.failureThreshold }}
|
failureThreshold: {{ .Values.eventReporter.readinessProbe.failureThreshold }}
|
||||||
resources:
|
resources:
|
||||||
{{- toYaml .Values.eventReporter.resources | nindent 10 }}
|
{{- toYaml .Values.eventReporter.resources | nindent 12 }}
|
||||||
{{- with .Values.eventReporter.containerSecurityContext }}
|
{{- with .Values.eventReporter.containerSecurityContext }}
|
||||||
securityContext:
|
securityContext:
|
||||||
{{- toYaml . | nindent 10 }}
|
{{- toYaml . | nindent 10 }}
|
||||||
|
@ -227,6 +232,11 @@ spec:
|
||||||
{{- with .Values.eventReporter.volumeMounts }}
|
{{- with .Values.eventReporter.volumeMounts }}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if or .Values.global.codefresh.tls.caCerts.secret.create .Values.global.codefresh.tls.caCerts.secretKeyRef}}
|
||||||
|
- name: codefresh-tls-certs
|
||||||
|
mountPath: /app/config/codefresh-tls-certs
|
||||||
|
readOnly: true
|
||||||
|
{{- end }}
|
||||||
- name: argocd-repo-server-tls
|
- name: argocd-repo-server-tls
|
||||||
mountPath: /app/config/server/tls
|
mountPath: /app/config/server/tls
|
||||||
- mountPath: /tmp
|
- mountPath: /tmp
|
||||||
|
@ -265,6 +275,13 @@ spec:
|
||||||
{{- with .Values.eventReporter.volumes }}
|
{{- with .Values.eventReporter.volumes }}
|
||||||
{{- toYaml . | nindent 6 }}
|
{{- toYaml . | nindent 6 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if or .Values.global.codefresh.tls.caCerts.secret.create .Values.global.codefresh.tls.caCerts.secretKeyRef }}
|
||||||
|
- name: codefresh-tls-certs
|
||||||
|
secret:
|
||||||
|
secretName: {{ .Values.global.codefresh.tls.caCerts.secret.create | ternary "codefresh-tls-certs" .Values.global.codefresh.tls.caCerts.secretKeyRef.name }}
|
||||||
|
defaultMode: 420
|
||||||
|
optional: true
|
||||||
|
{{- end }}
|
||||||
- emptyDir: { }
|
- emptyDir: { }
|
||||||
name: plugins-home
|
name: plugins-home
|
||||||
- emptyDir: { }
|
- emptyDir: { }
|
||||||
|
|
Loading…
Reference in a new issue