Skip to content

Commit 85088c4

Browse files
authored
Merge pull request #517 from verult/stable-bump
Bump stable overlay image versions to match latest staging RC overlay
2 parents 3324f67 + 9045ecf commit 85088c4

File tree

4 files changed

+8
-30
lines changed

4 files changed

+8
-30
lines changed

deploy/kubernetes/base/controller.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ spec:
2727
- "--v=5"
2828
- "--csi-address=/csi/csi.sock"
2929
- "--feature-gates=Topology=true"
30+
- "--metrics-address=:22011"
3031
# - "--run-controller-service=false" # disable the controller service of the CSI driver
3132
# - "--run-node-service=false" # disable the node service of the CSI driver
3233
volumeMounts:
@@ -37,6 +38,7 @@ spec:
3738
args:
3839
- "--v=5"
3940
- "--csi-address=/csi/csi.sock"
41+
- "--metrics-address=:22012"
4042
volumeMounts:
4143
- name: socket-dir
4244
mountPath: /csi
@@ -45,6 +47,7 @@ spec:
4547
args:
4648
- "--v=5"
4749
- "--csi-address=/csi/csi.sock"
50+
- "--metrics-address=:22013"
4851
volumeMounts:
4952
- name: socket-dir
5053
mountPath: /csi
@@ -53,6 +56,7 @@ spec:
5356
args:
5457
- "--v=5"
5558
- "--csi-address=/csi/csi.sock"
59+
- "--metrics-address=:22014"
5660
volumeMounts:
5761
- name: socket-dir
5862
mountPath: /csi

deploy/kubernetes/overlays/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml

-19
This file was deleted.

deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,3 @@ images:
2121
- name: gke.gcr.io/csi-snapshotter
2222
newName: gcr.io/gke-release-staging/csi-snapshotter
2323
newTag: "v2.1.1-gke.0"
24-
patchesJson6902:
25-
- target:
26-
group: apps
27-
version: v1
28-
kind: StatefulSet
29-
name: csi-gce-pd-controller
30-
path: enable_sidecar_metrics.yaml

deploy/kubernetes/overlays/stable/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ images:
1010
newTag: "v0.7.0-gke.0"
1111
- name: gke.gcr.io/csi-provisioner
1212
newName: gke.gcr.io/csi-provisioner
13-
newTag: "v1.5.0-gke.0"
13+
newTag: "v1.6.0-gke.0"
1414
- name: gke.gcr.io/csi-attacher
1515
newName: gke.gcr.io/csi-attacher
16-
newTag: "v2.1.1-gke.0"
16+
newTag: "v2.2.0-gke.0"
1717
- name: gke.gcr.io/csi-node-driver-registrar
1818
newName: gke.gcr.io/csi-node-driver-registrar
19-
newTag: "v1.2.0-gke.0"
19+
newTag: "v1.3.0-gke.0"
2020
- name: gke.gcr.io/csi-resizer
2121
newName: gke.gcr.io/csi-resizer
22-
newTag: "v0.4.0-gke.0"
22+
newTag: "v0.5.0-gke.0"
2323
- name: gke.gcr.io/csi-snapshotter
2424
newName: gke.gcr.io/csi-snapshotter
2525
newTag: "v2.1.1-gke.0"

0 commit comments

Comments
 (0)