From 9045ecfa44c3c321788764f49d534d89e0c761da Mon Sep 17 00:00:00 2001 From: Cheng Xing Date: Thu, 28 May 2020 17:56:03 -0700 Subject: [PATCH] Bump stable overlay image versions to match latest staging RC overlay --- deploy/kubernetes/base/controller.yaml | 4 ++++ .../enable_sidecar_metrics.yaml | 19 ------------------- .../kustomization.yaml | 7 ------- .../overlays/stable/kustomization.yaml | 8 ++++---- 4 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml index e357b3166..57f198b3b 100644 --- a/deploy/kubernetes/base/controller.yaml +++ b/deploy/kubernetes/base/controller.yaml @@ -27,6 +27,7 @@ spec: - "--v=5" - "--csi-address=/csi/csi.sock" - "--feature-gates=Topology=true" + - "--metrics-address=:22011" # - "--run-controller-service=false" # disable the controller service of the CSI driver # - "--run-node-service=false" # disable the node service of the CSI driver volumeMounts: @@ -37,6 +38,7 @@ spec: args: - "--v=5" - "--csi-address=/csi/csi.sock" + - "--metrics-address=:22012" volumeMounts: - name: socket-dir mountPath: /csi @@ -45,6 +47,7 @@ spec: args: - "--v=5" - "--csi-address=/csi/csi.sock" + - "--metrics-address=:22013" volumeMounts: - name: socket-dir mountPath: /csi @@ -53,6 +56,7 @@ spec: args: - "--v=5" - "--csi-address=/csi/csi.sock" + - "--metrics-address=:22014" volumeMounts: - name: socket-dir mountPath: /csi diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml deleted file mode 100644 index 1bf04c7be..000000000 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/enable_sidecar_metrics.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# for external-provisioner -- op: add - path: /spec/template/spec/containers/0/args/- - value: "--metrics-address=:22011" - -# for external-attacher -- op: add - path: /spec/template/spec/containers/1/args/- - value: "--metrics-address=:22012" - -# for external-resizer -- op: add - path: /spec/template/spec/containers/2/args/- - value: "--metrics-address=:22013" - -# for external-snapshotter -- op: add - path: /spec/template/spec/containers/3/args/- - value: "--metrics-address=:22014" diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml index ae61405a7..2841b734e 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml @@ -21,10 +21,3 @@ images: - name: gke.gcr.io/csi-snapshotter newName: gcr.io/gke-release-staging/csi-snapshotter newTag: "v2.1.1-gke.0" -patchesJson6902: -- target: - group: apps - version: v1 - kind: StatefulSet - name: csi-gce-pd-controller - path: enable_sidecar_metrics.yaml diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml index 9aac76765..b02b39c95 100644 --- a/deploy/kubernetes/overlays/stable/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable/kustomization.yaml @@ -10,16 +10,16 @@ images: newTag: "v0.7.0-gke.0" - name: gke.gcr.io/csi-provisioner newName: gke.gcr.io/csi-provisioner - newTag: "v1.5.0-gke.0" + newTag: "v1.6.0-gke.0" - name: gke.gcr.io/csi-attacher newName: gke.gcr.io/csi-attacher - newTag: "v2.1.1-gke.0" + newTag: "v2.2.0-gke.0" - name: gke.gcr.io/csi-node-driver-registrar newName: gke.gcr.io/csi-node-driver-registrar - newTag: "v1.2.0-gke.0" + newTag: "v1.3.0-gke.0" - name: gke.gcr.io/csi-resizer newName: gke.gcr.io/csi-resizer - newTag: "v0.4.0-gke.0" + newTag: "v0.5.0-gke.0" - name: gke.gcr.io/csi-snapshotter newName: gke.gcr.io/csi-snapshotter newTag: "v2.1.1-gke.0"