Skip to content

Commit 28a3093

Browse files
authored
Merge pull request #704 from andyzhangx/upgrade-sidecar-versions
upgrade sidecar image versions and fixed CVE-2022-28948 in image build
2 parents 775d7ec + 517e6f1 commit 28a3093

File tree

9 files changed

+27
-17
lines changed

9 files changed

+27
-17
lines changed

charts/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ The following table lists the configurable parameters of the latest Azure Blob S
6565
| `image.blob.tag` | blob-csi-driver docker image tag | `latest` |
6666
| `image.blob.pullPolicy` | blob-csi-driver image pull policy | `IfNotPresent` |
6767
| `image.csiProvisioner.repository` | csi-provisioner docker image | `mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner` |
68-
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.1.0` |
68+
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.1.1` |
6969
| `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
7070
| `image.livenessProbe.repository` | liveness-probe docker image | `mcr.microsoft.com/oss/kubernetes-csi/livenessprobe` |
71-
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.6.0` |
71+
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.7.0` |
7272
| `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` |
7373
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar` |
74-
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.5.0` |
74+
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.5.1` |
7575
| `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | `IfNotPresent` |
7676
| `image.csiResizer.repository` | csi-resizer docker image | `mcr.microsoft.com/oss/kubernetes-csi/csi-resizer` |
77-
| `image.csiResizer.tag` | csi-resizer docker image tag | `v1.4.0` |
77+
| `image.csiResizer.tag` | csi-resizer docker image tag | `v1.5.0` |
7878
| `image.csiResizer.pullPolicy` | csi-resizer image pull policy | `IfNotPresent` |
7979
| `imagePullSecrets` | Specify docker-registry secret names as an array | [] (does not add image pull secrets to deployed pods) |
8080
| `cloud` | the cloud environment the driver is running on | `AzurePublicCloud` |
3 Bytes
Binary file not shown.

charts/latest/blob-csi-driver/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ image:
66
pullPolicy: IfNotPresent
77
csiProvisioner:
88
repository: /oss/kubernetes-csi/csi-provisioner
9-
tag: v3.1.0
9+
tag: v3.1.1
1010
pullPolicy: IfNotPresent
1111
livenessProbe:
1212
repository: /oss/kubernetes-csi/livenessprobe
13-
tag: v2.6.0
13+
tag: v2.7.0
1414
pullPolicy: IfNotPresent
1515
nodeDriverRegistrar:
1616
repository: /oss/kubernetes-csi/csi-node-driver-registrar
17-
tag: v2.5.0
17+
tag: v2.5.1
1818
pullPolicy: IfNotPresent
1919
csiResizer:
2020
repository: /oss/kubernetes-csi/csi-resizer
21-
tag: v1.4.0
21+
tag: v1.5.0
2222
pullPolicy: IfNotPresent
2323

2424
cloud: AzurePublicCloud

deploy/csi-blob-controller.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
effect: "NoSchedule"
3232
containers:
3333
- name: csi-provisioner
34-
image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.1.0
34+
image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.1.1
3535
args:
3636
- "-v=2"
3737
- "--csi-address=$(ADDRESS)"
@@ -52,7 +52,7 @@ spec:
5252
cpu: 10m
5353
memory: 20Mi
5454
- name: liveness-probe
55-
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.6.0
55+
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.7.0
5656
args:
5757
- --csi-address=/csi/csi.sock
5858
- --probe-timeout=3s
@@ -110,7 +110,7 @@ spec:
110110
cpu: 10m
111111
memory: 20Mi
112112
- name: csi-resizer
113-
image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.4.0
113+
image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.5.0
114114
args:
115115
- "-csi-address=$(ADDRESS)"
116116
- "-v=2"

deploy/csi-blob-node.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
volumeMounts:
6969
- mountPath: /csi
7070
name: socket-dir
71-
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.6.0
71+
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.7.0
7272
args:
7373
- --csi-address=/csi/csi.sock
7474
- --probe-timeout=3s
@@ -81,7 +81,7 @@ spec:
8181
cpu: 10m
8282
memory: 20Mi
8383
- name: node-driver-registrar
84-
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.5.0
84+
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.5.1
8585
args:
8686
- --csi-address=$(ADDRESS)
8787
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ require (
100100
gopkg.in/inf.v0 v0.9.1 // indirect
101101
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
102102
gopkg.in/yaml.v2 v2.4.0 // indirect
103-
gopkg.in/yaml.v3 v3.0.0 // indirect
103+
gopkg.in/yaml.v3 v3.0.1 // indirect
104104
k8s.io/apiserver v0.24.0 // indirect
105105
k8s.io/cloud-provider v0.24.0 // indirect
106106
k8s.io/component-helpers v0.24.0 // indirect

go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1142,8 +1142,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
11421142
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
11431143
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
11441144
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1145-
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
11461145
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1146+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
1147+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
11471148
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
11481149
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
11491150
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

vendor/gopkg.in/yaml.v3/parserc.go

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ gopkg.in/tomb.v1
510510
# gopkg.in/yaml.v2 v2.4.0
511511
## explicit; go 1.15
512512
gopkg.in/yaml.v2
513-
# gopkg.in/yaml.v3 v3.0.0
513+
# gopkg.in/yaml.v3 v3.0.1
514514
## explicit
515515
gopkg.in/yaml.v3
516516
# k8s.io/api v0.24.1 => k8s.io/api v0.23.3

0 commit comments

Comments
 (0)