Skip to content

Commit 3793959

Browse files
authored
Merge pull request #699 from verult/1-2-0-sidecars-stable
Stable overlay - bump all sidecar versions to latest
2 parents 0747042 + 3090ce0 commit 3793959

File tree

4 files changed

+44
-77
lines changed

4 files changed

+44
-77
lines changed

deploy/kubernetes/base/controller/controller.yaml

+39-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
- "--v=5"
2929
- "--csi-address=/csi/csi.sock"
3030
- "--feature-gates=Topology=true"
31-
- "--metrics-address=:22011"
31+
- "--http-endpoint=:22011"
3232
- "--leader-election-namespace=$(PDCSI_NAMESPACE)"
3333
- "--timeout=250s"
3434
- "--extra-create-metadata"
@@ -41,6 +41,18 @@ spec:
4141
valueFrom:
4242
fieldRef:
4343
fieldPath: metadata.namespace
44+
ports:
45+
- containerPort: 22011
46+
name: http-endpoint
47+
protocol: TCP
48+
livenessProbe:
49+
failureThreshold: 1
50+
httpGet:
51+
path: /healthz/leader-election
52+
port: http-endpoint
53+
initialDelaySeconds: 10
54+
timeoutSeconds: 10
55+
periodSeconds: 20
4456
volumeMounts:
4557
- name: socket-dir
4658
mountPath: /csi
@@ -49,7 +61,7 @@ spec:
4961
args:
5062
- "--v=5"
5163
- "--csi-address=/csi/csi.sock"
52-
- "--metrics-address=:22012"
64+
- "--http-endpoint=:22012"
5365
- "--leader-election"
5466
- "--leader-election-namespace=$(PDCSI_NAMESPACE)"
5567
- "--timeout=250s"
@@ -58,6 +70,18 @@ spec:
5870
valueFrom:
5971
fieldRef:
6072
fieldPath: metadata.namespace
73+
ports:
74+
- containerPort: 22012
75+
name: http-endpoint
76+
protocol: TCP
77+
livenessProbe:
78+
failureThreshold: 1
79+
httpGet:
80+
path: /healthz/leader-election
81+
port: http-endpoint
82+
initialDelaySeconds: 10
83+
timeoutSeconds: 10
84+
periodSeconds: 20
6185
volumeMounts:
6286
- name: socket-dir
6387
mountPath: /csi
@@ -66,7 +90,7 @@ spec:
6690
args:
6791
- "--v=5"
6892
- "--csi-address=/csi/csi.sock"
69-
- "--metrics-address=:22013"
93+
- "--http-endpoint=:22013"
7094
- "--leader-election"
7195
- "--leader-election-namespace=$(PDCSI_NAMESPACE)"
7296
- "--handle-volume-inuse-error=false"
@@ -75,6 +99,18 @@ spec:
7599
valueFrom:
76100
fieldRef:
77101
fieldPath: metadata.namespace
102+
ports:
103+
- containerPort: 22013
104+
name: http-endpoint
105+
protocol: TCP
106+
livenessProbe:
107+
failureThreshold: 1
108+
httpGet:
109+
path: /healthz/leader-election
110+
port: http-endpoint
111+
initialDelaySeconds: 10
112+
timeoutSeconds: 10
113+
periodSeconds: 20
78114
volumeMounts:
79115
- name: socket-dir
80116
mountPath: /csi

deploy/kubernetes/images/stable/image.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: imagetag-csi-provisioner
55
imageTag:
66
name: k8s.gcr.io/sig-storage/csi-provisioner
7-
newTag: "v2.0.4"
7+
newTag: "v2.1.0"
88

99
---
1010
apiVersion: builtin
@@ -13,7 +13,7 @@ metadata:
1313
name: imagetag-csi-attacher
1414
imageTag:
1515
name: k8s.gcr.io/sig-storage/csi-attacher
16-
newTag: "v3.0.1"
16+
newTag: "v3.1.0"
1717
---
1818

1919
apiVersion: builtin
@@ -22,7 +22,7 @@ metadata:
2222
name: imagetag-csi-resizer
2323
imageTag:
2424
name: k8s.gcr.io/sig-storage/csi-resizer
25-
newTag: "v1.0.1"
25+
newTag: "v1.1.0"
2626
---
2727

2828
apiVersion: builtin
@@ -31,7 +31,7 @@ metadata:
3131
name: imagetag-csi-snapshotter
3232
imageTag:
3333
name: k8s.gcr.io/sig-storage/csi-snapshotter
34-
newTag: "v3.0.1"
34+
newTag: "v3.0.3"
3535
---
3636

3737
apiVersion: builtin
@@ -40,7 +40,7 @@ metadata:
4040
name: imagetag-csi-node-registrar
4141
imageTag:
4242
name: k8s.gcr.io/sig-storage/csi-node-driver-registrar
43-
newTag: "v2.0.1"
43+
newTag: "v2.1.0"
4444
---
4545

4646
apiVersion: builtin

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

-62
This file was deleted.

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

-7
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,3 @@ resources:
44
- ../stable
55
transformers:
66
- ../../images/prow-gke-release-staging-rc
7-
patchesJson6902:
8-
- target:
9-
group: apps
10-
version: v1
11-
kind: Deployment
12-
name: csi-gce-pd-controller
13-
path: controller_patches.yaml

0 commit comments

Comments
 (0)