Skip to content

Commit 8b2f0df

Browse files
authored
Merge branch 'master' into update-registry
2 parents b267924 + d356363 commit 8b2f0df

File tree

10 files changed

+39
-15
lines changed

10 files changed

+39
-15
lines changed

CHANGELOG/CHANGELOG-1.9.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
- Improve logging for device path verification ([#1142](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1142), [@saikat-royc](https://github.com/saikat-royc))
2121
- Update csi-attacher to v4.2.0 ([#1144](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1144), [@sunnylovestiramisu](https://github.com/sunnylovestiramisu))
22+
- Update sidecar based on internal versions ([#1154](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1154), [@sunnylovestiramisu](https://github.com/sunnylovestiramisu))
2223

2324
## Dependencies
2425

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
ARG BUILDPLATFORM
1616

17-
FROM --platform=$BUILDPLATFORM golang:1.19.4 as builder
17+
FROM --platform=$BUILDPLATFORM golang:1.19.6 as builder
1818

1919
ARG STAGINGVERSION
2020
ARG TARGETPLATFORM

Dockerfile.Windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
ARG BASE_IMAGE
16-
FROM --platform=$BUILDPLATFORM golang:1.19.4 AS builder
16+
FROM --platform=$BUILDPLATFORM golang:1.19.6 AS builder
1717

1818
ARG TARGETPLATFORM
1919
ARG BUILDPLATFORM

Dockerfile.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.19.4 as builder
15+
FROM golang:1.19.6 as builder
1616
WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
1717
ADD . .
1818

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ lifecycle of Google Compute Engine Persistent Disks.
1212
## Project Status
1313

1414
Status: GA
15-
Latest stable image: `registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.8.2`
15+
Latest stable image: `registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.9.0`
1616

1717
### Test Status
1818

deploy/kubernetes/images/prow-stable-sidecar-rc-master/image.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
name: imagetag-csi-provisioner-prow-rc
88
imageTag:
99
name: registry.k8s.io/sig-storage/csi-provisioner
10-
newTag: "v3.2.1"
10+
newTag: "v3.4.0"
1111
---
1212
apiVersion: builtin
1313
kind: ImageTagTransformer
@@ -23,23 +23,23 @@ metadata:
2323
name: imagetag-csi-resize-prow-rc
2424
imageTag:
2525
name: registry.k8s.io/sig-storage/csi-resizer
26-
newTag: "v1.5.0"
26+
newTag: "v1.7.0"
2727
---
2828
apiVersion: builtin
2929
kind: ImageTagTransformer
3030
metadata:
3131
name: imagetag-csi-snapshotter-prow-head
3232
imageTag:
3333
name: registry.k8s.io/sig-storage/csi-snapshotter
34-
newTag: "v6.0.1"
34+
newTag: "v6.1.0"
3535
---
3636
apiVersion: builtin
3737
kind: ImageTagTransformer
3838
metadata:
3939
name: imagetag-csi-node-registrar-prow-rc
4040
imageTag:
4141
name: registry.k8s.io/sig-storage/csi-node-driver-registrar
42-
newTag: "v2.5.1"
42+
newTag: "v2.7.0"
4343
---
4444
apiVersion: builtin
4545
kind: ImageTagTransformer
@@ -48,6 +48,6 @@ metadata:
4848
imageTag:
4949
name: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
5050
newName: gcr.io/k8s-staging-cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
51-
newTag: "v1.9.0-rc1"
51+
newTag: "v1.9.0-rc4"
5252
---
5353

deploy/kubernetes/images/stable-master/image.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: imagetag-csi-provisioner
55
imageTag:
66
name: registry.k8s.io/sig-storage/csi-provisioner
7-
newTag: "v3.1.0"
7+
newTag: "v3.4.0"
88

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

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

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

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

4646
apiVersion: builtin
@@ -52,5 +52,5 @@ imageTag:
5252
# Don't change stable image without changing pdImagePlaceholder in
5353
# test/k8s-integration/main.go
5454
newName: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
55-
newTag: "v1.8.2"
55+
newTag: "v1.9.0"
5656
---
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Set default-fstype for attacher sidecar.
2+
- op: add
3+
path: /spec/template/spec/containers/1/args/-
4+
value: "--default-fstype=ext4"
5+

deploy/kubernetes/overlays/stable-master/kustomization.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,18 @@ namespace:
44
gce-pd-csi-driver
55
resources:
66
- ../../base/
7+
patchesJson6902:
8+
- path: max-grpc-log-length.yaml
9+
target:
10+
group: apps
11+
kind: Deployment
12+
name: csi-gce-pd-controller
13+
version: v1
14+
- path: default-fstype.yaml
15+
target:
16+
group: apps
17+
kind: Deployment
18+
name: csi-gce-pd-controller
19+
version: v1
720
transformers:
821
- ../../images/stable-master
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Set max-grpc-log-length for attacher sidecar.
2+
- op: add
3+
path: /spec/template/spec/containers/1/args/-
4+
value: "--max-grpc-log-length=10000"
5+

0 commit comments

Comments
 (0)