Merge branch 'main' into patch-1
This commit is contained in:
Marco Maurer (-Kilchhofer)
GitHub
commit
bd23015d1a
7 changed files with 69 additions and 7 deletions
2
.github/workflows/renovate.yaml
vendored
2
.github/workflows/renovate.yaml
vendored
|
|
@ -26,7 +26,7 @@ jobs:
|
|||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
|
||||
- name: Self-hosted Renovate
|
||||
uses: renovatebot/github-action@042670e39b8d7335e992c3fa526ecbfbd52ef57b # v40.2.2
|
||||
uses: renovatebot/github-action@8ce0fe8066eb6b16e1bf499b21bc96e5ccd962a4 # v40.2.3
|
||||
with:
|
||||
configurationFile: .github/configs/renovate-config.js
|
||||
# renovate: datasource=docker depName=ghcr.io/renovatebot/renovate
|
||||
|
|
|
|||
2
.github/workflows/scorecard.yml
vendored
2
.github/workflows/scorecard.yml
vendored
|
|
@ -68,6 +68,6 @@ jobs:
|
|||
|
||||
# Upload the results to GitHub's code scanning dashboard.
|
||||
- name: "Upload to code-scanning"
|
||||
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
|
||||
uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
|
||||
with:
|
||||
sarif_file: results.sarif
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
apiVersion: v2
|
||||
appVersion: v2.11.5
|
||||
appVersion: v2.11.6
|
||||
kubeVersion: ">=1.23.0-0"
|
||||
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||
name: argo-cd
|
||||
version: 7.3.7
|
||||
version: 7.3.10
|
||||
home: https://github.com/argoproj/argo-helm
|
||||
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
||||
sources:
|
||||
|
|
@ -27,4 +27,4 @@ annotations:
|
|||
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
||||
artifacthub.io/changes: |
|
||||
- kind: changed
|
||||
description: Bump argo-cd to v2.11.5
|
||||
description: Bump argo-cd to v2.11.6
|
||||
|
|
|
|||
|
|
@ -278,6 +278,31 @@ For full list of changes please check ArtifactHub [changelog].
|
|||
|
||||
Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
|
||||
|
||||
### 7.0.0
|
||||
|
||||
We changed the type of `.Values.configs.clusterCredentials` from `list` to `object`.
|
||||
If you used the value, please migrate like below.
|
||||
|
||||
```yaml
|
||||
# before
|
||||
configs:
|
||||
clusterCredentials:
|
||||
- mycluster:
|
||||
server: https://mycluster.example.com
|
||||
labels: {}
|
||||
annotations: {}
|
||||
# ...
|
||||
|
||||
# after
|
||||
configs:
|
||||
clusterCredentials:
|
||||
mycluster:
|
||||
server: https://mycluster.example.com
|
||||
labels: {}
|
||||
annotations: {}
|
||||
# ...
|
||||
```
|
||||
|
||||
### 6.10.0
|
||||
|
||||
This version introduces authentication for Redis to mitigate GHSA-9766-5277-j5hr.
|
||||
|
|
|
|||
|
|
@ -278,6 +278,31 @@ For full list of changes please check ArtifactHub [changelog].
|
|||
|
||||
Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
|
||||
|
||||
### 7.0.0
|
||||
|
||||
We changed the type of `.Values.configs.clusterCredentials` from `list` to `object`.
|
||||
If you used the value, please migrate like below.
|
||||
|
||||
```yaml
|
||||
# before
|
||||
configs:
|
||||
clusterCredentials:
|
||||
- mycluster:
|
||||
server: https://mycluster.example.com
|
||||
labels: {}
|
||||
annotations: {}
|
||||
# ...
|
||||
|
||||
# after
|
||||
configs:
|
||||
clusterCredentials:
|
||||
mycluster:
|
||||
server: https://mycluster.example.com
|
||||
labels: {}
|
||||
annotations: {}
|
||||
# ...
|
||||
```
|
||||
|
||||
### 6.10.0
|
||||
|
||||
This version introduces authentication for Redis to mitigate GHSA-9766-5277-j5hr.
|
||||
|
|
|
|||
|
|
@ -208,10 +208,22 @@ spec:
|
|||
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||
{{- if .Values.externalRedis.host }}
|
||||
key: redis-password
|
||||
optional: true
|
||||
{{- else }}
|
||||
key: auth
|
||||
{{- end }}
|
||||
optional: true
|
||||
- name: REDIS_SENTINEL_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
||||
key: redis-sentinel-username
|
||||
optional: true
|
||||
- name: REDIS_SENTINEL_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
||||
key: redis-sentinel-password
|
||||
optional: true
|
||||
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
|
|
|
|||
|
|
@ -205,12 +205,12 @@ spec:
|
|||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||
optional: true
|
||||
{{- if .Values.externalRedis.host }}
|
||||
key: redis-password
|
||||
{{- else }}
|
||||
key: auth
|
||||
{{- end }}
|
||||
optional: true
|
||||
- name: REDIS_SENTINEL_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
|
|
|
|||
Loading…
Reference in a new issue