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

Merge branch 'main' into main

Browse source
This commit is contained in:
Tim Collins 2024-03-28 08:41:20 +00:00 committed by Pierre BLAIS
commit aafa7af45a
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/renovate.yaml vendored
View file

@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
- name: Self-hosted Renovate - name: Self-hosted Renovate
uses: renovatebot/github-action@23b01dbf6f38965076a36aff87f802263164f204 # v40.1.6 uses: renovatebot/github-action@7d358366277001f3316d7fa54ff49a81c0158948 # v40.1.7
with: with:
configurationFile: .github/configs/renovate-config.js configurationFile: .github/configs/renovate-config.js
# renovate: datasource=docker depName=ghcr.io/renovatebot/renovate # renovate: datasource=docker depName=ghcr.io/renovatebot/renovate

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

@ -3,7 +3,7 @@ appVersion: v2.10.4
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.4 version: 6.7.6
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:

2
charts/argo-cd/templates/argocd-application-controller/deployment.yaml
View file

@ -360,4 +360,4 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
dnsPolicy: {{ .Values.controller.dnsPolicy }} dnsPolicy: {{ .Values.controller.dnsPolicy }}
{{- end }} {{- end }}

32
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -394,46 +394,46 @@ spec:
{{- if .Values.repoServer.existingVolumes.helmWorkingDir -}} {{- if .Values.repoServer.existingVolumes.helmWorkingDir -}}
{{ toYaml .Values.repoServer.existingVolumes.helmWorkingDir | nindent 8 }} {{ toYaml .Values.repoServer.existingVolumes.helmWorkingDir | nindent 8 }}
{{- else }} {{- else }}
{{- if .Values.repoServer.emptyDir.sizeLimit }} {{- if .Values.repoServer.emptyDir.sizeLimit }}
emptyDir: emptyDir:
sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }} sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }}
{{- else }} {{- else }}
emptyDir: "" emptyDir: {}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
- name: plugins - name: plugins
{{- if .Values.repoServer.existingVolumes.plugins -}} {{- if .Values.repoServer.existingVolumes.plugins -}}
{{ toYaml .Values.repoServer.existingVolumes.plugins | nindent 8 }} {{ toYaml .Values.repoServer.existingVolumes.plugins | nindent 8 }}
{{- else }} {{- else }}
{{- if .Values.repoServer.emptyDir.sizeLimit }} {{- if .Values.repoServer.emptyDir.sizeLimit }}
emptyDir: emptyDir:
sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }} sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }}
{{- else }} {{- else }}
emptyDir: {} emptyDir: {}
{{- end }} {{- end }}
{{- end }} {{- end }}
- name: var-files - name: var-files
{{- if .Values.repoServer.existingVolumes.varFiles -}} {{- if .Values.repoServer.existingVolumes.varFiles -}}
{{ toYaml .Values.repoServer.existingVolumes.varFiles | nindent 8 }} {{ toYaml .Values.repoServer.existingVolumes.varFiles | nindent 8 }}
{{- else }} {{- else }}
{{- if .Values.repoServer.emptyDir.sizeLimit }} {{- if .Values.repoServer.emptyDir.sizeLimit }}
emptyDir: emptyDir:
sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }} sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }}
{{- else }} {{- else }}
emptyDir: {} emptyDir: {}
{{- end }} {{- end }}
{{- end }} {{- end }}
- name: tmp - name: tmp
{{- if .Values.repoServer.existingVolumes.tmp -}} {{- if .Values.repoServer.existingVolumes.tmp -}}
{{ toYaml .Values.repoServer.existingVolumes.tmp | nindent 8 }} {{ toYaml .Values.repoServer.existingVolumes.tmp | nindent 8 }}
{{- else }} {{- else }}
{{- if .Values.repoServer.emptyDir.sizeLimit }} {{- if .Values.repoServer.emptyDir.sizeLimit }}
emptyDir: emptyDir:
sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }} sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }}
{{- else }} {{- else }}
emptyDir: {} emptyDir: {}
{{- end }} {{- end }}
{{- end }} {{- end }}
- name: ssh-known-hosts - name: ssh-known-hosts
configMap: configMap:
@ -448,12 +448,12 @@ spec:
{{- if .Values.repoServer.existingVolumes.gpgKeyring -}} {{- if .Values.repoServer.existingVolumes.gpgKeyring -}}
{{ toYaml .Values.repoServer.existingVolumes.gpgKeyring | nindent 8 }} {{ toYaml .Values.repoServer.existingVolumes.gpgKeyring | nindent 8 }}
{{- else }} {{- else }}
{{- if .Values.repoServer.emptyDir.sizeLimit }} {{- if .Values.repoServer.emptyDir.sizeLimit }}
emptyDir: emptyDir:
sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }} sizeLimit: {{ .Values.repoServer.emptyDir.sizeLimit }}
{{- else }} {{- else }}
emptyDir: {} emptyDir: {}
{{- end }} {{- end }}
{{- end }} {{- end }}
- name: argocd-repo-server-tls - name: argocd-repo-server-tls
secret: secret: