Skip to content

Commit 35f5312

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #358 from Evalle/ISSUE-357
Switch to using official images for containers
2 parents 68962ce + 0ae4990 commit 35f5312

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

‎manifest_staging/charts/secrets-store-csi-driver/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ The following table lists the configurable parameters of the csi-secrets-store-p
3232
| `linux.nodeSelector` | Node Selector for the daemonset on linux nodes | `{}` |
3333
| `linux.tolerations` | Tolerations for the daemonset on linux nodes | `[]` |
3434
| `linux.metricsAddr` | The address the metric endpoint binds to | `:8095` |
35-
| `linux.registrarImage.repository` | Linux node-driver-registrar image repository | `quay.io/k8scsi/csi-node-driver-registrar` |
35+
| `linux.registrarImage.repository` | Linux node-driver-registrar image repository | `k8s.gcr.io/sig-storage/csi-node-driver-registrar` |
3636
| `linux.registrarImage.pullPolicy` | Linux node-driver-registrar image pull policy | `Always` |
37-
| `linux.registrarImage.tag` | Linux node-driver-registrar image tag | `v1.2.0` |
37+
| `linux.registrarImage.tag` | Linux node-driver-registrar image tag | `v2.0.1` |
3838
| `linux.registrar.resources` | The resource request/limits for the linux node-driver-registrar container image | `limits: 100m CPU, 100Mi; requests: 10m CPU, 20Mi` |
39-
| `linux.livenessProbeImage.repository` | Linux liveness-probe image repository | `quay.io/k8scsi/livenessprobe` |
39+
| `linux.livenessProbeImage.repository` | Linux liveness-probe image repository | `k8s.gcr.io/sig-storage/livenessprobe` |
4040
| `linux.livenessProbeImage.pullPolicy` | Linux liveness-probe image pull policy | `Always` |
41-
| `linux.livenessProbeImage.tag` | Linux liveness-probe image tag | `v2.0.0` |
41+
| `linux.livenessProbeImage.tag` | Linux liveness-probe image tag | `v2.1.0` |
4242
| `linux.livenessProbe.resources` | The resource request/limits for the linux liveness-probe container image | `limits: 100m CPU, 100Mi; requests: 10m CPU, 20Mi` |
4343
| `linux.env` | Environment variables to be passed for the daemonset on linux nodes | `[]` |
4444
| `linux.priorityClassName` | Indicates the importance of a Pod relative to other Pods. | `""` |
@@ -51,13 +51,13 @@ The following table lists the configurable parameters of the csi-secrets-store-p
5151
| `windows.nodeSelector` | Node Selector for the daemonset on windows nodes | `{}` |
5252
| `windows.tolerations` | Tolerations for the daemonset on windows nodes | `[]` |
5353
| `windows.metricsAddr` | The address the metric endpoint binds to | `:8095` |
54-
| `windows.registrarImage.repository` | Windows node-driver-registrar image repository | `mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar` |
54+
| `windows.registrarImage.repository` | Windows node-driver-registrar image repository | `k8s.gcr.io/sig-storage/csi-node-driver-registrar` |
5555
| `windows.registrarImage.pullPolicy` | Windows node-driver-registrar image pull policy | `Always` |
56-
| `windows.registrarImage.tag` | Windows node-driver-registrar image tag | `v1.2.1-alpha.1-windows-1809-amd64` |
56+
| `windows.registrarImage.tag` | Windows node-driver-registrar image tag | `v2.0.1` |
5757
| `windows.registrar.resources` | The resource request/limits for the windows node-driver-registrar container image | `limits: 200m CPU, 200Mi; requests: 10m CPU, 20Mi` |
58-
| `windows.livenessProbeImage.repository` | Windows liveness-probe image repository | `mcr.microsoft.com/oss/kubernetes-csi/livenessprobe` |
58+
| `windows.livenessProbeImage.repository` | Windows liveness-probe image repository | `k8s.gcr.io/sig-storage/livenessprobe` |
5959
| `windows.livenessProbeImage.pullPolicy` | Windows liveness-probe image pull policy | `Always` |
60-
| `windows.livenessProbeImage.tag` | Windows liveness-probe image tag | `v2.0.1-alpha.1-windows-1809-amd64` |
60+
| `windows.livenessProbeImage.tag` | Windows liveness-probe image tag | `v2.1.0` |
6161
| `windows.livenessProbe.resources` | The resource request/limits for the windows liveness-probe container image | `limits: 200m CPU, 200Mi; requests: 10m CPU, 20Mi` |
6262
| `windows.env` | Environment variables to be passed for the daemonset on windows nodes | `[]` |
6363
| `windows.priorityClassName` | Indicates the importance of a Pod relative to other Pods. | `""` |

‎manifest_staging/charts/secrets-store-csi-driver/values.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ linux:
1515
memory: 100Mi
1616

1717
registrarImage:
18-
repository: quay.io/k8scsi/csi-node-driver-registrar
19-
tag: v1.2.0
18+
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
19+
tag: v2.0.1
2020
pullPolicy: Always
2121

2222
registrar:
@@ -29,8 +29,8 @@ linux:
2929
memory: 20Mi
3030

3131
livenessProbeImage:
32-
repository: quay.io/k8scsi/livenessprobe
33-
tag: v2.0.0
32+
repository: k8s.gcr.io/sig-storage/livenessprobe
33+
tag: v2.1.0
3434
pullPolicy: Always
3535

3636
livenessProbe:
@@ -66,8 +66,8 @@ windows:
6666
memory: 100Mi
6767

6868
registrarImage:
69-
repository: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar
70-
tag: v1.2.1-alpha.1-windows-1809-amd64
69+
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
70+
tag: v2.0.1
7171
pullPolicy: IfNotPresent
7272

7373
registrar:
@@ -80,8 +80,8 @@ windows:
8080
memory: 20Mi
8181

8282
livenessProbeImage:
83-
repository: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe
84-
tag: v2.0.1-alpha.1-windows-1809-amd64
83+
repository: k8s.gcr.io/sig-storage/livenessprobe
84+
tag: v2.1.0
8585
pullPolicy: IfNotPresent
8686

8787
livenessProbe:

‎manifest_staging/deploy/secrets-store-csi-driver-windows.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
serviceAccountName: secrets-store-csi-driver
1515
containers:
1616
- name: node-driver-registrar
17-
image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v1.2.1-alpha.1-windows-1809-amd64
17+
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
1818
args:
1919
- --v=5
2020
- "--csi-address=unix://C:\\csi\\csi.sock"
@@ -96,7 +96,7 @@ spec:
9696
- name: providers-dir
9797
mountPath: C:\k\secrets-store-csi-providers
9898
- name: liveness-probe
99-
image: mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.0.1-alpha.1-windows-1809-amd64
99+
image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0
100100
imagePullPolicy: IfNotPresent
101101
args:
102102
- "--csi-address=unix://C:\\csi\\csi.sock"

‎manifest_staging/deploy/secrets-store-csi-driver.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
hostNetwork: true
1616
containers:
1717
- name: node-driver-registrar
18-
image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
18+
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
1919
args:
2020
- --v=5
2121
- --csi-address=/csi/csi.sock
@@ -98,7 +98,7 @@ spec:
9898
cpu: 50m
9999
memory: 100Mi
100100
- name: liveness-probe
101-
image: quay.io/k8scsi/livenessprobe:v2.0.0
101+
image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0
102102
imagePullPolicy: Always
103103
args:
104104
- --csi-address=/csi/csi.sock

0 commit comments

Comments
 (0)