Skip to content

Commit 2397d1e

Browse files
authored
Merge pull request #489 from carlory/bump-image-versions
bump image versions
2 parents c28be19 + fff2f4e commit 2397d1e

File tree

8 files changed

+29
-19
lines changed

8 files changed

+29
-19
lines changed

deploy/kubernetes-1.26-test/hostpath/csi-hostpath-attacher.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-attacher
3838
containers:
3939
- name: csi-attacher
40-
image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
40+
image: registry.k8s.io/sig-storage/csi-attacher:v4.4.3
4141
args:
4242
- --v=5
4343
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.26-test/hostpath/csi-hostpath-plugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
serviceAccountName: csi-external-health-monitor-controller
3232
containers:
3333
- name: hostpath
34-
image: registry.k8s.io/sig-storage/hostpathplugin:v1.9.0
34+
image: registry.k8s.io/sig-storage/hostpathplugin:v1.12.1
3535
args:
3636
- "--drivername=hostpath.csi.k8s.io"
3737
- "--v=5"
@@ -97,7 +97,7 @@ spec:
9797
mountPath: /csi
9898

9999
- name: node-driver-registrar
100-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.0
100+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.3
101101
args:
102102
- --v=5
103103
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.26-test/hostpath/csi-hostpath-provisioner.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-provisioner
3838
containers:
3939
- name: csi-provisioner
40-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
40+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.3
4141
args:
4242
- -v=5
4343
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.26-test/hostpath/csi-hostpath-resizer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-resizer
3838
containers:
3939
- name: csi-resizer
40-
image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
40+
image: registry.k8s.io/sig-storage/csi-resizer:v1.9.3
4141
args:
4242
- -v=5
4343
- -csi-address=/csi/csi.sock

deploy/kubernetes-1.26-test/hostpath/csi-hostpath-snapshotter.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
serviceAccountName: csi-snapshotter
3838
containers:
3939
- name: csi-snapshotter
40-
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.0
40+
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.3
4141
args:
4242
- -v=5
4343
- --csi-address=/csi/csi.sock

deploy/kubernetes-1.26/hostpath/csi-hostpath-plugin.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ spec:
219219
serviceAccountName: csi-hostpathplugin-sa
220220
containers:
221221
- name: hostpath
222-
image: registry.k8s.io/sig-storage/hostpathplugin:v1.9.0
222+
image: registry.k8s.io/sig-storage/hostpathplugin:v1.12.1
223223
args:
224224
- "--drivername=hostpath.csi.k8s.io"
225225
- "--v=5"
@@ -276,7 +276,7 @@ spec:
276276
mountPath: /csi
277277

278278
- name: node-driver-registrar
279-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.0
279+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.3
280280
args:
281281
- --v=5
282282
- --csi-address=/csi/csi.sock
@@ -310,7 +310,7 @@ spec:
310310
- --health-port=9898
311311

312312
- name: csi-attacher
313-
image: registry.k8s.io/sig-storage/csi-attacher:v4.4.0
313+
image: registry.k8s.io/sig-storage/csi-attacher:v4.4.3
314314
args:
315315
- --v=5
316316
- --csi-address=/csi/csi.sock
@@ -324,7 +324,7 @@ spec:
324324
name: socket-dir
325325

326326
- name: csi-provisioner
327-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.0
327+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.3
328328
args:
329329
- -v=5
330330
- --csi-address=/csi/csi.sock
@@ -340,7 +340,7 @@ spec:
340340
name: socket-dir
341341

342342
- name: csi-resizer
343-
image: registry.k8s.io/sig-storage/csi-resizer:v1.9.0
343+
image: registry.k8s.io/sig-storage/csi-resizer:v1.9.3
344344
args:
345345
- -v=5
346346
- -csi-address=/csi/csi.sock
@@ -354,7 +354,7 @@ spec:
354354
name: socket-dir
355355

356356
- name: csi-snapshotter
357-
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.0
357+
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.3
358358
args:
359359
- -v=5
360360
- --csi-address=/csi/csi.sock

deploy/kubernetes-distributed/hostpath/csi-hostpath-plugin.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
serviceAccountName: csi-provisioner
2626
containers:
2727
- name: csi-provisioner
28-
image: registry.k8s.io/sig-storage/csi-provisioner:v3.3.0
28+
image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.3
2929
args:
3030
- -v=5
3131
- --csi-address=/csi/csi.sock
@@ -60,7 +60,7 @@ spec:
6060
name: socket-dir
6161

6262
- name: node-driver-registrar
63-
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.0
63+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.3
6464
args:
6565
- --v=5
6666
- --csi-address=/csi/csi.sock
@@ -132,7 +132,7 @@ spec:
132132
volumeMounts:
133133
- mountPath: /csi
134134
name: socket-dir
135-
image: registry.k8s.io/sig-storage/livenessprobe:v2.8.0
135+
image: registry.k8s.io/sig-storage/livenessprobe:v2.11.0
136136
args:
137137
- --csi-address=/csi/csi.sock
138138
- --health-port=9898

hack/bump-image-versions.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
# for older Kubernetes releases.
2121

2222
set -e
23+
set -x
2324

24-
# List of images under https://console.cloud.google.com/gcr/images/k8s-staging-sig-storage/GLOBAL
25+
# List of images under registry.k8s.io/sig-storage
2526
images="
2627
csi-attacher
2728
csi-node-driver-registrar
@@ -33,8 +34,17 @@ csi-external-health-monitor-controller
3334
livenessprobe
3435
"
3536

36-
for image in $images; do
37-
latest=$(gcloud container images list-tags k8s.gcr.io/sig-storage/$image --format='get(tags)' --filter='tags~^v AND NOT tags~v2020 AND NOT tags~-rc' --sort-by=tags | tail -n 1)
37+
if ! command -v skopeo > /dev/null 2>&1; then
38+
echo "skopeo not found. For installation instructions, see https://github.com/containers/skopeo/blob/main/install.md"
39+
exit 1
40+
fi
41+
42+
if ! command -v jq > /dev/null 2>&1; then
43+
echo "jq not found."
44+
exit 1
45+
fi
3846

39-
sed -i -e "s;\(image: registry.k8s.io/sig-storage/$image:\).*;\1$latest;" $(find deploy -type f)
47+
for image in $images; do
48+
latest=$(skopeo list-tags --retry-times 3 docker://registry.k8s.io/sig-storage/"$image" | jq -r '.Tags[]' | grep -e '^v.*$' | sort -V | tail -n 1)
49+
find deploy -type f -exec sed -i '' "s;\(image: registry.k8s.io/sig-storage/$image:\).*;\1$latest;" {} \;
4050
done

0 commit comments

Comments
 (0)