From 3090ce017ecd89e5aa439deb570d9aa68dc3142c Mon Sep 17 00:00:00 2001 From: Cheng Xing Date: Tue, 26 Jan 2021 16:47:07 -0800 Subject: [PATCH] Stable overlay - bump all sidecar versions to latest --- .../base/controller/controller.yaml | 42 ++++++++++++- deploy/kubernetes/images/stable/image.yaml | 10 +-- .../controller_patches.yaml | 62 ------------------- .../kustomization.yaml | 7 --- 4 files changed, 44 insertions(+), 77 deletions(-) delete mode 100644 deploy/kubernetes/overlays/prow-gke-release-staging-rc/controller_patches.yaml diff --git a/deploy/kubernetes/base/controller/controller.yaml b/deploy/kubernetes/base/controller/controller.yaml index 44ab3064c..ffb2f83e7 100644 --- a/deploy/kubernetes/base/controller/controller.yaml +++ b/deploy/kubernetes/base/controller/controller.yaml @@ -28,7 +28,7 @@ spec: - "--v=5" - "--csi-address=/csi/csi.sock" - "--feature-gates=Topology=true" - - "--metrics-address=:22011" + - "--http-endpoint=:22011" - "--leader-election-namespace=$(PDCSI_NAMESPACE)" - "--timeout=250s" - "--extra-create-metadata" @@ -41,6 +41,18 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + ports: + - containerPort: 22011 + name: http-endpoint + protocol: TCP + livenessProbe: + failureThreshold: 1 + httpGet: + path: /healthz/leader-election + port: http-endpoint + initialDelaySeconds: 10 + timeoutSeconds: 10 + periodSeconds: 20 volumeMounts: - name: socket-dir mountPath: /csi @@ -49,7 +61,7 @@ spec: args: - "--v=5" - "--csi-address=/csi/csi.sock" - - "--metrics-address=:22012" + - "--http-endpoint=:22012" - "--leader-election" - "--leader-election-namespace=$(PDCSI_NAMESPACE)" - "--timeout=250s" @@ -58,6 +70,18 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + ports: + - containerPort: 22012 + name: http-endpoint + protocol: TCP + livenessProbe: + failureThreshold: 1 + httpGet: + path: /healthz/leader-election + port: http-endpoint + initialDelaySeconds: 10 + timeoutSeconds: 10 + periodSeconds: 20 volumeMounts: - name: socket-dir mountPath: /csi @@ -66,7 +90,7 @@ spec: args: - "--v=5" - "--csi-address=/csi/csi.sock" - - "--metrics-address=:22013" + - "--http-endpoint=:22013" - "--leader-election" - "--leader-election-namespace=$(PDCSI_NAMESPACE)" - "--handle-volume-inuse-error=false" @@ -75,6 +99,18 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + ports: + - containerPort: 22013 + name: http-endpoint + protocol: TCP + livenessProbe: + failureThreshold: 1 + httpGet: + path: /healthz/leader-election + port: http-endpoint + initialDelaySeconds: 10 + timeoutSeconds: 10 + periodSeconds: 20 volumeMounts: - name: socket-dir mountPath: /csi diff --git a/deploy/kubernetes/images/stable/image.yaml b/deploy/kubernetes/images/stable/image.yaml index 5814e03aa..b641cbe57 100644 --- a/deploy/kubernetes/images/stable/image.yaml +++ b/deploy/kubernetes/images/stable/image.yaml @@ -4,7 +4,7 @@ metadata: name: imagetag-csi-provisioner imageTag: name: k8s.gcr.io/sig-storage/csi-provisioner - newTag: "v2.0.4" + newTag: "v2.1.0" --- apiVersion: builtin @@ -13,7 +13,7 @@ metadata: name: imagetag-csi-attacher imageTag: name: k8s.gcr.io/sig-storage/csi-attacher - newTag: "v3.0.1" + newTag: "v3.1.0" --- apiVersion: builtin @@ -22,7 +22,7 @@ metadata: name: imagetag-csi-resizer imageTag: name: k8s.gcr.io/sig-storage/csi-resizer - newTag: "v1.0.1" + newTag: "v1.1.0" --- apiVersion: builtin @@ -31,7 +31,7 @@ metadata: name: imagetag-csi-snapshotter imageTag: name: k8s.gcr.io/sig-storage/csi-snapshotter - newTag: "v3.0.1" + newTag: "v3.0.3" --- apiVersion: builtin @@ -40,7 +40,7 @@ metadata: name: imagetag-csi-node-registrar imageTag: name: k8s.gcr.io/sig-storage/csi-node-driver-registrar - newTag: "v2.0.1" + newTag: "v2.1.0" --- apiVersion: builtin diff --git a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/controller_patches.yaml b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/controller_patches.yaml deleted file mode 100644 index 2feb0ba9e..000000000 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/controller_patches.yaml +++ /dev/null @@ -1,62 +0,0 @@ -# for external-provisioner -- op: replace - path: /spec/template/spec/containers/0/args/3 - value: "--http-endpoint=:22011" -- op: add - path: /spec/template/spec/containers/0/ports - value: - - containerPort: 22011 - name: http-endpoint - protocol: TCP -- op: add - path: /spec/template/spec/containers/0/livenessProbe - value: - failureThreshold: 1 - httpGet: - path: /healthz/leader-election - port: http-endpoint - initialDelaySeconds: 10 - timeoutSeconds: 10 - periodSeconds: 20 - -# for external-attacher -- op: replace - path: /spec/template/spec/containers/1/args/2 - value: "--http-endpoint=:22012" -- op: add - path: /spec/template/spec/containers/1/ports - value: - - containerPort: 22012 - name: http-endpoint - protocol: TCP -- op: add - path: /spec/template/spec/containers/1/livenessProbe - value: - failureThreshold: 1 - httpGet: - path: /healthz/leader-election - port: http-endpoint - initialDelaySeconds: 10 - timeoutSeconds: 10 - periodSeconds: 20 - -# for external-resizer -- op: replace - path: /spec/template/spec/containers/2/args/2 - value: "--http-endpoint=:22013" -- op: add - path: /spec/template/spec/containers/2/ports - value: - - containerPort: 22013 - name: http-endpoint - protocol: TCP -- op: add - path: /spec/template/spec/containers/2/livenessProbe - value: - failureThreshold: 1 - httpGet: - path: /healthz/leader-election - port: http-endpoint - initialDelaySeconds: 10 - timeoutSeconds: 10 - periodSeconds: 20 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 bf28e23cb..644186669 100644 --- a/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml +++ b/deploy/kubernetes/overlays/prow-gke-release-staging-rc/kustomization.yaml @@ -4,10 +4,3 @@ resources: - ../stable transformers: - ../../images/prow-gke-release-staging-rc -patchesJson6902: -- target: - group: apps - version: v1 - kind: Deployment - name: csi-gce-pd-controller - path: controller_patches.yaml