Skip to content

Commit 615a23c

Browse files
authored
chore(chart-deps): update argocd-image-updater to version 1.1.4 (#3080)
1 parent 21cc0f5 commit 615a23c

File tree

9 files changed

+82
-33
lines changed

9 files changed

+82
-33
lines changed

chart/chart-index/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
version: 9.4.17
1010
repository: https://argoproj.github.io/argo-helm
1111
- name: argocd-image-updater
12-
version: 1.0.1
12+
version: 1.1.4
1313
repository: oci://ghcr.io/argoproj/argo-helm/argocd-image-updater
1414
- name: cert-manager
1515
version: v1.19.4

charts/argocd-image-updater/Chart.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
annotations:
22
artifacthub.io/changes: |
3-
- kind: changed
4-
description: Bump argocd-image-updater to v1.0.1
3+
- kind: added
4+
description: Add service.enabled value to allow Service creation independently of ingress.enabled
55
artifacthub.io/signKey: |
66
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
77
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
88
apiVersion: v2
9-
appVersion: v1.0.1
9+
appVersion: v1.1.1
1010
description: A Helm chart for Argo CD Image Updater, a tool to automatically update
1111
the container images of Kubernetes workloads which are managed by Argo CD
1212
home: https://github.com/argoproj-labs/argocd-image-updater
@@ -20,4 +20,4 @@ maintainers:
2020
url: https://argoproj.github.io/
2121
name: argocd-image-updater
2222
type: application
23-
version: 1.0.1
23+
version: 1.1.4

charts/argocd-image-updater/README.md

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,34 @@ docker run --rm --volume "$(pwd):/helm-docs" -u $(id -u) jnorwood/helm-docs:late
1010
## Installation
1111

1212
```console
13-
helm install oci://ghcr.io/argoproj/argo-helm/argocd-image-updater --namespace argocd-image-updater-system
13+
helm install oci://ghcr.io/argoproj/argo-helm/argocd-image-updater --namespace <desired installation namespace>
1414
```
1515

1616
If you still use the classic approach of installing Helm charts (non-OCI), you can do so by adding the Argo Helm repository and installing the chart with the following commands:
1717

1818
```console
1919
helm repo add argo https://argoproj.github.io/argo-helm
20-
helm install argocd-image-updater argo/argocd-image-updater --namespace argocd-image-updater-system
20+
helm install argocd-image-updater argo/argocd-image-updater --namespace <desired installation namespace>
2121
```
2222

2323
The Argo CD Image Updater controller **must** be run in the same Kubernetes cluster where your Argo CD `Application` resources are managed. The current controller architecture (v1.0+) does not support connecting to a remote Kubernetes cluster to manage applications.
2424

25+
### Choosing the installation namespace
26+
27+
> You have two options for where to install the Argo CD Image Updater:
28+
>
29+
> #### Option 1: Install into the Argo CD namespace (Recommended)
30+
>
31+
> The simplest approach is to install the image updater into the same namespace as your Argo CD installation. This
32+
> requires minimal configuration. (..)
33+
>
34+
> #### Option 2: Install into a separate namespace
35+
>
36+
> For better workload isolation, you can install the image updater into its own namespace. This use case requires
37+
> several manual configuration steps. (..)
38+
39+
For the full details, please read [Installation methods] in the upstream docs.
40+
2541
## Prerequisites
2642

2743
* Helm v3.0.0+
@@ -32,6 +48,13 @@ For full list of changes please check ArtifactHub [changelog].
3248

3349
Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
3450

51+
### 1.0.3 (app version 1.0.2)
52+
53+
The upstream project changed the recommended installation namespace from `argocd-image-updater-system` to the same
54+
namespace as Argo CD is installed in.
55+
56+
Please read [Installation methods] and/or [PR #1356] for more information.
57+
3558
### 1.0.0
3659

3760
This chart release includes the upstream breaking changes introduced in Argo CD Image Updater 1.0.0.
@@ -124,6 +147,7 @@ The `config.registries` value can be used exactly as it looks in the documentati
124147
| resources | object | `{}` | Pod memory and cpu resource settings for the deployment |
125148
| securityContext | object | See [values.yaml] | Security context settings for the deployment |
126149
| service.annotations | object | `{}` | Service annotations |
150+
| service.enabled | bool | `false` | Enable a Service for the webhook endpoint. A Service is created when this is set to true or when `ingress.enabled` is true |
127151
| service.externalIPs | list | `[]` | Service external IPs |
128152
| service.externalTrafficPolicy | string | `"Cluster"` | Denotes if this Service desires to route external traffic to node-local or cluster-wide endpoints |
129153
| service.labels | object | `{}` | Service labels |
@@ -150,3 +174,5 @@ Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/
150174

151175
[Configuration of Container Registries]: https://argocd-image-updater.readthedocs.io/en/stable/configuration/registries/
152176
[Support ECR authentication]: https://github.com/argoproj-labs/argocd-image-updater/issues/112
177+
[Installation methods]: https://github.com/argoproj-labs/argocd-image-updater/blob/v1.0.2/docs/install/installation.md#installation-methods
178+
[PR #1356]: https://github.com/argoproj-labs/argocd-image-updater/pull/1356

charts/argocd-image-updater/crds/crd-imageupdaters.yaml

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
applicationRefs:
4848
description: |-
4949
ApplicationRefs indicates the set of applications to be managed.
50-
ApplicationRefs is a list of rules to select Argo CD Applications within the `spec.namespace`.
50+
ApplicationRefs is a list of rules to select Argo CD Applications within the ImageUpdater CR's namespace.
5151
Each reference can also provide specific overrides for the global settings defined above.
5252
items:
5353
description: ApplicationRef contains various criteria by which to
@@ -57,6 +57,7 @@ spec:
5757
description: |-
5858
CommonUpdateSettings overrides the global CommonUpdateSettings for applications
5959
matched by this selector.
60+
This field is ignored when UseAnnotations is true.
6061
properties:
6162
allowTags:
6263
description: |-
@@ -103,6 +104,7 @@ spec:
103104
Images contains a list of configurations that how images should be updated.
104105
These rules apply to applications selected by namePattern in ApplicationRefs, and each
105106
image can override global/ApplicationRef settings.
107+
This field is ignored when UseAnnotations is true.
106108
items:
107109
description: |-
108110
ImageConfig defines how a specific container image should be discovered, updated,
@@ -182,25 +184,23 @@ spec:
182184
description: |-
183185
Name is the dot-separated path to the Helm key for the image repository/name part.
184186
Example: "image.repository", "frontend.deployment.image.name".
185-
This field is required if the Helm target is used.
187+
If neither spec nor name/tag are set, defaults to "image.name".
188+
If spec is set, this field is ignored.
186189
type: string
187190
spec:
188191
description: |-
189-
Spec is an optional dot-separated path to a Helm key where the full image string
192+
Spec is the dot-separated path to a Helm key where the full image string
190193
(e.g., "image/name:1.0") should be written.
191194
Use this if your Helm chart expects the entire image reference in a single field,
192-
rather than separate name/tag fields. If this is set, other Helm parameter-related
193-
options will be ignored.
195+
rather than separate name/tag fields. If this is set, name and tag will be ignored.
194196
type: string
195197
tag:
196198
description: |-
197199
Tag is the dot-separated path to the Helm key for the image tag part.
198200
Example: "image.tag", "frontend.deployment.image.version".
199-
This field is required if the Helm target is used.
201+
If neither spec nor name/tag are set, defaults to "image.tag".
202+
If spec is set, this field is ignored.
200203
type: string
201-
required:
202-
- name
203-
- tag
204204
type: object
205205
kustomize:
206206
description: |-
@@ -227,7 +227,6 @@ spec:
227227
- alias
228228
- imageName
229229
type: object
230-
minItems: 1
231230
type: array
232231
x-kubernetes-list-map-keys:
233232
- alias
@@ -283,10 +282,21 @@ spec:
283282
description: NamePattern indicates the glob pattern for application
284283
name
285284
type: string
285+
useAnnotations:
286+
default: false
287+
description: |-
288+
UseAnnotations When true, read image configuration from Application's
289+
argocd-image-updater.argoproj.io/* annotations instead of
290+
requiring explicit Images[] configuration in this CR.
291+
When this field is set to true, only namePattern and labelSelectors are used for
292+
application selection. All other fields (CommonUpdateSettings, WriteBackConfig, Images)
293+
are ignored.
294+
type: boolean
286295
writeBackConfig:
287296
description: |-
288297
WriteBackConfig overrides the global WriteBackConfig settings for applications
289298
matched by this selector.
299+
This field is ignored when UseAnnotations is true.
290300
properties:
291301
gitConfig:
292302
description: |-
@@ -324,9 +334,13 @@ spec:
324334
- method
325335
type: object
326336
required:
327-
- images
328337
- namePattern
329338
type: object
339+
x-kubernetes-validations:
340+
- message: Either useAnnotations must be true, or images must be
341+
provided with at least one item
342+
rule: '!(has(self.useAnnotations) && self.useAnnotations == true)
343+
? (has(self.images) && size(self.images) > 0) : true'
330344
minItems: 1
331345
type: array
332346
x-kubernetes-list-map-keys:
@@ -381,8 +395,10 @@ spec:
381395
namespace:
382396
description: |-
383397
Namespace indicates the target namespace of the applications.
384-
This is the namespace where the controller will look for Argo CD Applications
385-
matching the criteria in ApplicationRefs.
398+
399+
Deprecated: This field is deprecated and will be removed in a future release.
400+
The controller now uses the ImageUpdater CR's namespace (metadata.namespace)
401+
to determine which namespace to search for applications. This field is ignored.
386402
type: string
387403
writeBackConfig:
388404
description: |-
@@ -426,7 +442,6 @@ spec:
426442
type: object
427443
required:
428444
- applicationRefs
429-
- namespace
430445
type: object
431446
status:
432447
description: ImageUpdaterStatus defines the observed state of ImageUpdater

charts/argocd-image-updater/templates/deployment.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,24 @@ spec:
3434
{{- toYaml .Values.podSecurityContext | nindent 8 }}
3535
containers:
3636
- name: {{ include "argocd-image-updater.fullname" . }}-controller
37-
command:
38-
- /manager
3937
args:
4038
- --metrics-bind-address=:{{ .Values.containerPorts.metrics }}
4139
- run
4240
{{- with .Values.extraArgs }}
4341
{{- toYaml . | nindent 12 }}
4442
{{- end }}
4543
env:
44+
- name: ARGOCD_NAMESPACE
45+
valueFrom:
46+
configMapKeyRef:
47+
key: argocd.namespace
48+
name: {{ .Values.config.name }}
49+
optional: true
4650
- name: IMAGE_UPDATER_INTERVAL
4751
valueFrom:
4852
configMapKeyRef:
4953
key: interval
50-
name: argocd-image-updater-config
54+
name: {{ .Values.config.name }}
5155
optional: true
5256
- name: IMAGE_UPDATER_LOGLEVEL
5357
valueFrom:
@@ -71,7 +75,7 @@ spec:
7175
valueFrom:
7276
configMapKeyRef:
7377
key: max_concurrent_reconciles
74-
name: a{{ .Values.config.name }}
78+
name: {{ .Values.config.name }}
7579
optional: true
7680
- name: GIT_COMMIT_USER
7781
valueFrom:
@@ -112,13 +116,13 @@ spec:
112116
- name: ENABLE_WEBHOOK
113117
valueFrom:
114118
configMapKeyRef:
115-
name: argocd-image-updater-config
119+
name: {{ .Values.config.name }}
116120
key: webhook.enable
117121
optional: true
118122
- name: WEBHOOK_PORT
119123
valueFrom:
120124
configMapKeyRef:
121-
name: argocd-image-updater-config
125+
name: {{ .Values.config.name }}
122126
key: webhook.port
123127
optional: true
124128
- name: QUAY_WEBHOOK_SECRET
@@ -148,7 +152,7 @@ spec:
148152
- name: WEBHOOK_RATELIMIT_ALLOWED
149153
valueFrom:
150154
configMapKeyRef:
151-
name: argocd-image-updater-config
155+
name: {{ .Values.config.name }}
152156
key: webhook.ratelimit-allowed
153157
optional: true
154158
{{- with .Values.extraEnv }}

charts/argocd-image-updater/templates/metrics-service.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ metadata:
1717
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
1818
spec:
1919
ports:
20-
- name: https
20+
- name: metrics
2121
protocol: TCP
2222
port: {{ .Values.metrics.service.servicePort }}
2323
targetPort: metrics
@@ -38,6 +38,10 @@ spec:
3838
- ports:
3939
- port: metrics
4040
protocol: TCP
41+
{{- if .Values.ingress.enabled }}
42+
- port: webhook
43+
protocol: TCP
44+
{{- end }}
4145
podSelector:
4246
matchLabels:
4347
{{- include "argocd-image-updater.selectorLabels" . | nindent 6 }}

charts/argocd-image-updater/templates/rbac.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ metadata:
5959
labels:
6060
{{- include "argocd-image-updater.labels" . | nindent 4 }}
6161
name: {{ include "argocd-image-updater.fullname" . }}
62-
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
6362
rules:
6463
- apiGroups:
6564
- ""
@@ -110,7 +109,6 @@ metadata:
110109
labels:
111110
{{- include "argocd-image-updater.labels" . | nindent 4 }}
112111
name: {{ include "argocd-image-updater.fullname" . }}
113-
namespace: {{ include "argocd-image-updater.namespace" . | quote }}
114112
roleRef:
115113
apiGroup: rbac.authorization.k8s.io
116114
kind: ClusterRole

charts/argocd-image-updater/templates/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.ingress.enabled }}
1+
{{- if or .Values.ingress.enabled .Values.service.enabled }}
22
apiVersion: v1
33
kind: Service
44
metadata:

charts/argocd-image-updater/values.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ authScripts:
216216
# #!/bin/sh
217217
# echo "auth script 2 here"
218218
# azure-workload-identity.sh: |
219-
# #!/bin:sh
219+
# #!/bin/sh
220220
# # Example script for Azure Workload Identity.
221221
# # This script would typically use environment variables set by the workload identity
222222
# # to acquire an Azure AD token and authenticate with Azure Container Registry (ACR).
@@ -316,6 +316,8 @@ containerPorts:
316316

317317
## Service configuration
318318
service:
319+
# -- Enable a Service for the webhook endpoint. A Service is created when this is set to true or when `ingress.enabled` is true
320+
enabled: false
319321
# -- Service annotations
320322
annotations: {}
321323
# -- Service labels

0 commit comments

Comments
 (0)