diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index d67ddee2..d2f2bf75 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.3.3 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 4.5.9 +version: 4.5.10 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,4 +21,6 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Fix]: Remove version dependencies in README for CRD paths" + - "[Fixed]: Use global imagePullPolicy for Dex by default" + - "[Fixed]: ApplicationSet imagePullPolicy variable in values.yaml" + - "[Fixed]: Use global imagePullPolicy for ApplicationSet by default" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index bfc7327f..e60f1789 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -548,7 +548,7 @@ NAME: my-release | dex.extraContainers | list | `[]` | Additional containers to be added to the dex pod | | dex.extraVolumeMounts | list | `[]` | Extra volumeMounts to the dex pod | | dex.extraVolumes | list | `[]` | Extra volumes to the dex pod | -| dex.image.imagePullPolicy | string | `"IfNotPresent"` | Dex imagePullPolicy | +| dex.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Dex imagePullPolicy | | dex.image.repository | string | `"ghcr.io/dexidp/dex"` | Dex image repository | | dex.image.tag | string | `"v2.30.2"` | Dex image tag | | dex.initContainers | list | `[]` | Init containers to add to the dex pod | @@ -688,7 +688,7 @@ NAME: my-release | applicationSet.extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the controller | | applicationSet.extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) | | applicationSet.extraVolumes | list | `[]` | List of extra volumes to add | -| applicationSet.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for the application set controller | +| applicationSet.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the application set controller | | applicationSet.image.repository | string | `"quay.io/argoproj/argocd-applicationset"` | Repository to use for the application set controller | | applicationSet.image.tag | string | `"v0.4.1"` | Tag to use for the application set controller | | applicationSet.imagePullSecrets | list | `[]` | If defined, uses a Secret to pull an image from a private Docker registry or repository. | diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml index 1707f6fe..b23aeb63 100755 --- a/charts/argo-cd/templates/dex/deployment.yaml +++ b/charts/argo-cd/templates/dex/deployment.yaml @@ -52,7 +52,7 @@ spec: containers: - name: {{ .Values.dex.name }} image: {{ .Values.dex.image.repository }}:{{ .Values.dex.image.tag }} - imagePullPolicy: {{ .Values.dex.image.imagePullPolicy }} + imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.dex.image.imagePullPolicy }} command: - /shared/argocd-dex - rundex diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 3b33c376..e2db1edc 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -397,7 +397,8 @@ dex: # -- Dex image tag tag: v2.30.2 # -- Dex imagePullPolicy - imagePullPolicy: IfNotPresent + # @default -- `""` (defaults to global.image.imagePullPolicy) + imagePullPolicy: "" initImage: # -- Argo CD init image repository # @default -- `""` (defaults to global.image.repository) @@ -1890,10 +1891,11 @@ applicationSet: image: # -- Repository to use for the application set controller repository: quay.io/argoproj/argocd-applicationset - # -- Image pull policy for the application set controller - pullPolicy: IfNotPresent # -- Tag to use for the application set controller tag: "v0.4.1" + # -- Image pull policy for the application set controller + # @default -- `""` (defaults to global.image.imagePullPolicy) + imagePullPolicy: "" args: # -- The default metric address