Sitelet https://github.com/kubernetes/kops/commit/f6a7522adc38fe7fbbcbbc9f5d4cb6bfdd498547
Skip to content

Commit f6a7522

Browse files
Merge pull request #18528 from hakman/automated-cherry-pick-of-#18527-upstream-release-1.36
Automated cherry pick of #18527: azure: Bump azuredisk-csi-driver to v1.34.4
2 parents 2879859 + 6c03c13 commit f6a7522

6 files changed

Lines changed: 171 additions & 123 deletions

‎tests/integration/update_cluster/gossip-azure/data/azurerm_storage_blob_gossip.k8s.local-addons-azuredisk-csi-driver.addons.k8s.io-k8s-1.31_source‎

Lines changed: 56 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ metadata:
66
app.kubernetes.io/instance: azuredisk-csi-driver
77
app.kubernetes.io/managed-by: kops
88
app.kubernetes.io/name: azuredisk-csi-driver
9-
app.kubernetes.io/version: 1.34.0
10-
helm.sh/chart: azuredisk-csi-driver-1.34.0
9+
app.kubernetes.io/version: 1.34.4
10+
helm.sh/chart: azuredisk-csi-driver-1.34.4
1111
k8s-addon: azuredisk-csi-driver.addons.k8s.io
1212
name: csi-azuredisk-controller-sa
1313
namespace: kube-system
@@ -22,8 +22,8 @@ metadata:
2222
app.kubernetes.io/instance: azuredisk-csi-driver
2323
app.kubernetes.io/managed-by: kops
2424
app.kubernetes.io/name: azuredisk-csi-driver
25-
app.kubernetes.io/version: 1.34.0
26-
helm.sh/chart: azuredisk-csi-driver-1.34.0
25+
app.kubernetes.io/version: 1.34.4
26+
helm.sh/chart: azuredisk-csi-driver-1.34.4
2727
k8s-addon: azuredisk-csi-driver.addons.k8s.io
2828
name: csi-azuredisk-node-sa
2929
namespace: kube-system
@@ -38,8 +38,8 @@ metadata:
3838
app.kubernetes.io/instance: azuredisk-csi-driver
3939
app.kubernetes.io/managed-by: kops
4040
app.kubernetes.io/name: azuredisk-csi-driver
41-
app.kubernetes.io/version: 1.34.0
42-
helm.sh/chart: azuredisk-csi-driver-1.34.0
41+
app.kubernetes.io/version: 1.34.4
42+
helm.sh/chart: azuredisk-csi-driver-1.34.4
4343
k8s-addon: azuredisk-csi-driver.addons.k8s.io
4444
name: azuredisk-external-attacher-role
4545
rules:
@@ -117,8 +117,8 @@ metadata:
117117
app.kubernetes.io/instance: azuredisk-csi-driver
118118
app.kubernetes.io/managed-by: kops
119119
app.kubernetes.io/name: azuredisk-csi-driver
120-
app.kubernetes.io/version: 1.34.0
121-
helm.sh/chart: azuredisk-csi-driver-1.34.0
120+
app.kubernetes.io/version: 1.34.4
121+
helm.sh/chart: azuredisk-csi-driver-1.34.4
122122
k8s-addon: azuredisk-csi-driver.addons.k8s.io
123123
name: azuredisk-external-provisioner-role
124124
rules:
@@ -214,8 +214,8 @@ metadata:
214214
app.kubernetes.io/instance: azuredisk-csi-driver
215215
app.kubernetes.io/managed-by: kops
216216
app.kubernetes.io/name: azuredisk-csi-driver
217-
app.kubernetes.io/version: 1.34.0
218-
helm.sh/chart: azuredisk-csi-driver-1.34.0
217+
app.kubernetes.io/version: 1.34.4
218+
helm.sh/chart: azuredisk-csi-driver-1.34.4
219219
k8s-addon: azuredisk-csi-driver.addons.k8s.io
220220
name: azuredisk-external-resizer-role
221221
rules:
@@ -293,8 +293,8 @@ metadata:
293293
app.kubernetes.io/instance: azuredisk-csi-driver
294294
app.kubernetes.io/managed-by: kops
295295
app.kubernetes.io/name: azuredisk-csi-driver
296-
app.kubernetes.io/version: 1.34.0
297-
helm.sh/chart: azuredisk-csi-driver-1.34.0
296+
app.kubernetes.io/version: 1.34.4
297+
helm.sh/chart: azuredisk-csi-driver-1.34.4
298298
k8s-addon: azuredisk-csi-driver.addons.k8s.io
299299
name: azuredisk-external-snapshotter-role
300300
rules:
@@ -422,8 +422,8 @@ metadata:
422422
app.kubernetes.io/instance: azuredisk-csi-driver
423423
app.kubernetes.io/managed-by: kops
424424
app.kubernetes.io/name: azuredisk-csi-driver
425-
app.kubernetes.io/version: 1.34.0
426-
helm.sh/chart: azuredisk-csi-driver-1.34.0
425+
app.kubernetes.io/version: 1.34.4
426+
helm.sh/chart: azuredisk-csi-driver-1.34.4
427427
k8s-addon: azuredisk-csi-driver.addons.k8s.io
428428
name: azuredisk-csi-attacher-binding
429429
roleRef:
@@ -445,8 +445,8 @@ metadata:
445445
app.kubernetes.io/instance: azuredisk-csi-driver
446446
app.kubernetes.io/managed-by: kops
447447
app.kubernetes.io/name: azuredisk-csi-driver
448-
app.kubernetes.io/version: 1.34.0
449-
helm.sh/chart: azuredisk-csi-driver-1.34.0
448+
app.kubernetes.io/version: 1.34.4
449+
helm.sh/chart: azuredisk-csi-driver-1.34.4
450450
k8s-addon: azuredisk-csi-driver.addons.k8s.io
451451
name: azuredisk-csi-provisioner-binding
452452
roleRef:
@@ -468,8 +468,8 @@ metadata:
468468
app.kubernetes.io/instance: azuredisk-csi-driver
469469
app.kubernetes.io/managed-by: kops
470470
app.kubernetes.io/name: azuredisk-csi-driver
471-
app.kubernetes.io/version: 1.34.0
472-
helm.sh/chart: azuredisk-csi-driver-1.34.0
471+
app.kubernetes.io/version: 1.34.4
472+
helm.sh/chart: azuredisk-csi-driver-1.34.4
473473
k8s-addon: azuredisk-csi-driver.addons.k8s.io
474474
name: azuredisk-csi-resizer-role
475475
roleRef:
@@ -491,8 +491,8 @@ metadata:
491491
app.kubernetes.io/instance: azuredisk-csi-driver
492492
app.kubernetes.io/managed-by: kops
493493
app.kubernetes.io/name: azuredisk-csi-driver
494-
app.kubernetes.io/version: 1.34.0
495-
helm.sh/chart: azuredisk-csi-driver-1.34.0
494+
app.kubernetes.io/version: 1.34.4
495+
helm.sh/chart: azuredisk-csi-driver-1.34.4
496496
k8s-addon: azuredisk-csi-driver.addons.k8s.io
497497
name: azuredisk-csi-snapshotter-binding
498498
roleRef:
@@ -552,8 +552,8 @@ metadata:
552552
app.kubernetes.io/instance: azuredisk-csi-driver
553553
app.kubernetes.io/managed-by: kops
554554
app.kubernetes.io/name: azuredisk-csi-driver
555-
app.kubernetes.io/version: 1.34.0
556-
helm.sh/chart: azuredisk-csi-driver-1.34.0
555+
app.kubernetes.io/version: 1.34.4
556+
helm.sh/chart: azuredisk-csi-driver-1.34.4
557557
k8s-addon: azuredisk-csi-driver.addons.k8s.io
558558
name: csi-azuredisk-controller
559559
namespace: kube-system
@@ -569,8 +569,8 @@ spec:
569569
app.kubernetes.io/instance: azuredisk-csi-driver
570570
app.kubernetes.io/managed-by: Helm
571571
app.kubernetes.io/name: azuredisk-csi-driver
572-
app.kubernetes.io/version: 1.34.0
573-
helm.sh/chart: azuredisk-csi-driver-1.34.0
572+
app.kubernetes.io/version: 1.34.4
573+
helm.sh/chart: azuredisk-csi-driver-1.34.4
574574
kops.k8s.io/managed-by: kops
575575
spec:
576576
affinity:
@@ -582,7 +582,7 @@ spec:
582582
operator: Exists
583583
containers:
584584
- args:
585-
- --feature-gates=Topology=true,HonorPVReclaimPolicy=true,VolumeAttributesClass=true
585+
- --feature-gates=Topology=true,VolumeAttributesClass=true
586586
- --csi-address=$(ADDRESS)
587587
- --v=2
588588
- --timeout=30s
@@ -597,7 +597,7 @@ spec:
597597
env:
598598
- name: ADDRESS
599599
value: /csi/csi.sock
600-
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-provisioner:v6.1.0
600+
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-provisioner:v6.2.0
601601
name: csi-provisioner
602602
resources:
603603
limits:
@@ -624,7 +624,7 @@ spec:
624624
env:
625625
- name: ADDRESS
626626
value: /csi/csi.sock
627-
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-attacher:v4.10.0
627+
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-attacher:v4.11.0
628628
name: csi-attacher
629629
resources:
630630
limits:
@@ -651,7 +651,7 @@ spec:
651651
env:
652652
- name: ADDRESS
653653
value: /csi/csi.sock
654-
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-snapshotter:v8.4.0
654+
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-snapshotter:v8.5.0
655655
name: csi-snapshotter
656656
resources:
657657
limits:
@@ -678,7 +678,7 @@ spec:
678678
env:
679679
- name: ADDRESS
680680
value: /csi/csi.sock
681-
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-resizer:v2.0.0
681+
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-resizer:v2.1.0
682682
name: csi-resizer
683683
resources:
684684
limits:
@@ -698,7 +698,7 @@ spec:
698698
- --probe-timeout=3s
699699
- --http-endpoint=localhost:29602
700700
- --v=2
701-
image: mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
701+
image: mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
702702
name: liveness-probe
703703
resources:
704704
limits:
@@ -726,6 +726,8 @@ spec:
726726
- --user-agent-suffix=kops
727727
- --allow-empty-cloud-config=false
728728
- --vmss-cache-ttl-seconds=60
729+
- --kube-api-qps=0
730+
- --kube-api-burst=0
729731
- --enable-traffic-manager=false
730732
- --traffic-manager-port=7788
731733
- --enable-otel-tracing=false
@@ -742,7 +744,7 @@ spec:
742744
value: unix:///csi/csi.sock
743745
- name: AZURE_GO_SDK_LOG_LEVEL
744746
value: null
745-
image: mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.0
747+
image: mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.4
746748
imagePullPolicy: IfNotPresent
747749
livenessProbe:
748750
failureThreshold: 5
@@ -812,8 +814,8 @@ metadata:
812814
app.kubernetes.io/instance: azuredisk-csi-driver
813815
app.kubernetes.io/managed-by: kops
814816
app.kubernetes.io/name: azuredisk-csi-driver
815-
app.kubernetes.io/version: 1.34.0
816-
helm.sh/chart: azuredisk-csi-driver-1.34.0
817+
app.kubernetes.io/version: 1.34.4
818+
helm.sh/chart: azuredisk-csi-driver-1.34.4
817819
k8s-addon: azuredisk-csi-driver.addons.k8s.io
818820
name: csi-azuredisk-node
819821
namespace: kube-system
@@ -828,8 +830,8 @@ spec:
828830
app.kubernetes.io/instance: azuredisk-csi-driver
829831
app.kubernetes.io/managed-by: Helm
830832
app.kubernetes.io/name: azuredisk-csi-driver
831-
app.kubernetes.io/version: 1.34.0
832-
helm.sh/chart: azuredisk-csi-driver-1.34.0
833+
app.kubernetes.io/version: 1.34.4
834+
helm.sh/chart: azuredisk-csi-driver-1.34.4
833835
kops.k8s.io/managed-by: kops
834836
spec:
835837
affinity:
@@ -847,7 +849,7 @@ spec:
847849
- --probe-timeout=10s
848850
- --health-port=29603
849851
- --v=2
850-
image: mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.17.0
852+
image: mcr.microsoft.com/oss/v2/kubernetes-csi/livenessprobe:v2.18.0
851853
name: liveness-probe
852854
resources:
853855
limits:
@@ -866,13 +868,27 @@ spec:
866868
- --csi-address=$(ADDRESS)
867869
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
868870
- --v=2
871+
- --http-endpoint=localhost:29607
869872
env:
870873
- name: ADDRESS
871874
value: /csi/csi.sock
872875
- name: DRIVER_REG_SOCK_PATH
873876
value: /var/lib/kubelet/plugins/disk.csi.azure.com/csi.sock
874-
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.15.0
877+
image: mcr.microsoft.com/oss/v2/kubernetes-csi/csi-node-driver-registrar:v2.16.0
878+
livenessProbe:
879+
failureThreshold: 2
880+
httpGet:
881+
host: localhost
882+
path: /healthz
883+
port: healthz
884+
initialDelaySeconds: 20
885+
periodSeconds: 20
886+
timeoutSeconds: 10
875887
name: node-driver-registrar
888+
ports:
889+
- containerPort: 29607
890+
name: healthz
891+
protocol: TCP
876892
resources:
877893
limits:
878894
memory: 100Mi
@@ -923,7 +939,7 @@ spec:
923939
fieldPath: spec.nodeName
924940
- name: AZURE_GO_SDK_LOG_LEVEL
925941
value: null
926-
image: mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.0
942+
image: mcr.microsoft.com/oss/v2/kubernetes-csi/azuredisk-csi:v1.34.4
927943
imagePullPolicy: IfNotPresent
928944
lifecycle:
929945
preStop:
@@ -1020,8 +1036,8 @@ apiVersion: storage.k8s.io/v1
10201036
kind: CSIDriver
10211037
metadata:
10221038
annotations:
1023-
csiDriver: v1.34.0
1024-
snapshot: v8.4.0
1039+
csiDriver: v1.34.4
1040+
snapshot: v8.5.0
10251041
labels:
10261042
addon.kops.k8s.io/name: azuredisk-csi-driver.addons.k8s.io
10271043
app.kubernetes.io/managed-by: kops

‎tests/integration/update_cluster/gossip-azure/data/azurerm_storage_blob_gossip.k8s.local-addons-bootstrap_source‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ spec:
9191
k8s-addon: azure-cloud-controller.addons.k8s.io
9292
- id: k8s-1.31
9393
manifest: azuredisk-csi-driver.addons.k8s.io/k8s-1.31.yaml
94-
manifestHash: c4e39eea11e49c4ae1dbf981e9d98256de3183c496becbb1f175306a6c354eb3
94+
manifestHash: 743cb817f7db9e63cdff793d07dd043b226b0de5c3a37ccdd4af4943e67176db
9595
name: azuredisk-csi-driver.addons.k8s.io
9696
prune:
9797
kinds:

0 commit comments

Comments
 (0)