Skip to content

Commit

Permalink
Merge pull request #704 from andyzhangx/upgrade-sidecar-versions
Browse files Browse the repository at this point in the history 
upgrade sidecar image versions and fixed CVE-2022-28948 in image build
  • Loading branch information
@andyzhangx
andyzhangx committed Jun 20, 2022
2 parents 775d7ec + 517e6f1 commit 28a3093
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 17 deletions.
8 changes: 4 additions & 4 deletions charts/README.md
View file
Expand Up @@ -65,16 +65,16 @@ The following table lists the configurable parameters of the latest Azure Blob S
| `image.blob.tag` | blob-csi-driver docker image tag | `latest` |
| `image.blob.pullPolicy` | blob-csi-driver image pull policy | `IfNotPresent` |
| `image.csiProvisioner.repository` | csi-provisioner docker image | `mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner` |
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.1.0` |
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v3.1.1` |
| `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
| `image.livenessProbe.repository` | liveness-probe docker image | `mcr.microsoft.com/oss/kubernetes-csi/livenessprobe` |
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.6.0` |
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.7.0` |
| `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` |
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar` |
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.5.0` |
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.5.1` |
| `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | `IfNotPresent` |
| `image.csiResizer.repository` | csi-resizer docker image | `mcr.microsoft.com/oss/kubernetes-csi/csi-resizer` |
| `image.csiResizer.tag` | csi-resizer docker image tag | `v1.4.0` |
| `image.csiResizer.tag` | csi-resizer docker image tag | `v1.5.0` |
| `image.csiResizer.pullPolicy` | csi-resizer image pull policy | `IfNotPresent` |
| `imagePullSecrets` | Specify docker-registry secret names as an array | [] (does not add image pull secrets to deployed pods) |
| `cloud` | the cloud environment the driver is running on | `AzurePublicCloud` |
Expand Down
Binary file modified charts/latest/blob-csi-driver-v1.15.0.tgz
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions charts/latest/blob-csi-driver/values.yaml
View file
Expand Up @@ -6,19 +6,19 @@ image:
pullPolicy: IfNotPresent
csiProvisioner:
repository: /oss/kubernetes-csi/csi-provisioner
tag: v3.1.0
tag: v3.1.1
pullPolicy: IfNotPresent
livenessProbe:
repository: /oss/kubernetes-csi/livenessprobe
tag: v2.6.0
tag: v2.7.0
pullPolicy: IfNotPresent
nodeDriverRegistrar:
repository: /oss/kubernetes-csi/csi-node-driver-registrar
tag: v2.5.0
tag: v2.5.1
pullPolicy: IfNotPresent
csiResizer:
repository: /oss/kubernetes-csi/csi-resizer
tag: v1.4.0
tag: v1.5.0
pullPolicy: IfNotPresent

cloud: AzurePublicCloud
Expand Down
6 changes: 3 additions & 3 deletions deploy/csi-blob-controller.yaml
View file
Expand Up @@ -31,7 +31,7 @@ spec:
effect: "NoSchedule"
containers:
- name: csi-provisioner
image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.1.0
image: mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.1.1
args:
- "-v=2"
- "--csi-address=$(ADDRESS)"
Expand All @@ -52,7 +52,7 @@ spec:
cpu: 10m
memory: 20Mi
- name: liveness-probe
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.6.0
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.7.0
args:
- --csi-address=/csi/csi.sock
- --probe-timeout=3s
Expand Down Expand Up @@ -110,7 +110,7 @@ spec:
cpu: 10m
memory: 20Mi
- name: csi-resizer
image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.4.0
image: mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.5.0
args:
- "-csi-address=$(ADDRESS)"
- "-v=2"
Expand Down
4 changes: 2 additions & 2 deletions deploy/csi-blob-node.yaml
View file
Expand Up @@ -68,7 +68,7 @@ spec:
volumeMounts:
- mountPath: /csi
name: socket-dir
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.6.0
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.7.0
args:
- --csi-address=/csi/csi.sock
- --probe-timeout=3s
Expand All @@ -81,7 +81,7 @@ spec:
cpu: 10m
memory: 20Mi
- name: node-driver-registrar
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.5.0
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.5.1
args:
- --csi-address=$(ADDRESS)
- --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Expand Up @@ -100,7 +100,7 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.24.0 // indirect
k8s.io/cloud-provider v0.24.0 // indirect
k8s.io/component-helpers v0.24.0 // indirect
Expand Down
3 changes: 2 additions & 1 deletion go.sum
View file
Expand Up @@ -1142,8 +1142,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
Expand Down
11 changes: 10 additions & 1 deletion vendor/gopkg.in/yaml.v3/parserc.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Expand Up @@ -510,7 +510,7 @@ gopkg.in/tomb.v1
# gopkg.in/yaml.v2 v2.4.0
## explicit; go 1.15
gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.0
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# k8s.io/api v0.24.1 => k8s.io/api v0.23.3
Expand Down

0 comments on commit 28a3093

Please sign in to comment.