Skip to content

Commit e195d28

Browse files
yashsingh74yashsingh74
authored
Merge branch 'master' into update-registry
2 parents 8b2f0df + 87c973c commit e195d28

File tree

349 files changed

+77296
-38002
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

349 files changed

+77296
-38002
lines changed

‎CHANGELOG/CHANGELOG-1.10.md

Lines changed: 288 additions & 0 deletions
Large diffs are not rendered by default.

‎CHANGELOG/CHANGELOG-1.7.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# v1.7.6 - Changelog since v.1.7.4
2+
3+
## Changes by Kind
4+
5+
### Other (Cleanup or Flake)
6+
7+
- go version updates ([#1158](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1158), [@saikat-royc](https://github.com/saikat-royc))
8+
- Fix for CVEs - update base image ([#1162](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1162), [@sunnylovestiramisu](https://github.com/sunnylovestiramisu))
9+
- Fix missing shared library libedit.so.2 caused from updating base image in [#1162](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1162) ([#1177](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1177), [@sunnylovestiramisu ](https://github.com/sunnylovestiramisu))
10+
111
# v1.7.4 - Changelog since v.1.7.3
212

313
## Changes by Kind

‎CHANGELOG/CHANGELOG-1.8.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# v1.8.4 - Changelog since v1.8.2
2+
3+
4+
## Changes by Kind
5+
6+
### Other (Cleanup or Flake)
7+
8+
- go version updates ([#1158](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1158), [@saikat-royc](https://github.com/saikat-royc))
9+
- Fix for CVEs - update base image ([#1162](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1162), [@sunnylovestiramisu](https://github.com/sunnylovestiramisu))
10+
- Fix missing shared library libedit.so.2 caused from updating base image in [#1162](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1162) ([#1177](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1177), [@sunnylovestiramisu ](https://github.com/sunnylovestiramisu))
11+
112
# v1.8.2 - Changelog since v1.8.1
213

314

‎CHANGELOG/CHANGELOG-1.9.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
# v1.9.3 - Changelog since v1.9.2
2+
3+
## Changes by Kind
4+
5+
### Bug or Regression
6+
7+
- Fix missing libedit.so.2 error ([#1177](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1177), [@sunnylovestiramisu](https://github.com/sunnylovestiramisu))
8+
- Update go version to 1.20.3 for k/k 1.27 ([#1180](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1180), [@sunnylovestiramisu](https://github.com/sunnylovestiramisu))
9+
10+
# v1.9.2 - Changelog since v1.9.1
11+
12+
## Changes by Kind
13+
14+
### Bug or Regression
15+
16+
- Revert feature to add PV, PVC and namespace name as labels to the PD [#1090](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1090) ([#1174](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1174), [@sunnylovestiramisu](https://github.com/sunnylovestiramisu))
17+
18+
19+
# v1.9.1 - Changelog since v1.9.0
20+
21+
## Changes by Kind
22+
23+
### Feature
24+
25+
- go version updates ([#1158](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1158), [@saikat-royc](https://github.com/saikat-royc))
26+
27+
- Fix for CVEs - update base image ([#1162](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1162), [@sunnylovestiramisu](https://github.com/sunnylovestiramisu))
28+
29+
- Fix multiarch build ([#1165](https://github.com/kubernetes-sigs/gcp-compute-persistent-disk-csi-driver/pull/1165), [@sunnylovestiramisu](https://github.com/sunnylovestiramisu))
30+
131
# v1.9.0 - Changelog since v1.8.2
232

333
## Changes by Kind

‎Dockerfile

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
ARG BUILDPLATFORM
1616

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

1919
ARG STAGINGVERSION
2020
ARG TARGETPLATFORM
@@ -24,7 +24,7 @@ ADD . .
2424
RUN GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GCE_PD_CSI_STAGING_VERSION=$STAGINGVERSION make gce-pd-driver
2525

2626
# Start from Kubernetes Debian base.
27-
FROM registry.k8s.io/build-image/debian-base:buster-v1.9.0 as debian
27+
FROM gke.gcr.io/debian-base:bullseye-v1.4.3-gke.0 as debian
2828
# Install necessary dependencies
2929
# google_nvme_id script depends on the following packages: nvme-cli, xxd, bash
3030
RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs nvme-cli xxd bash
@@ -74,28 +74,31 @@ COPY --from=debian /bin/ln /bin/ln
7474
COPY --from=debian /bin/udevadm /bin/udevadm
7575

7676
# Copy shared libraries into distroless base.
77-
COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
77+
COPY --from=debian /lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre.so.3 \
78+
/lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
79+
/lib/${LIB_DIR_PREFIX}-linux-gnu/libtinfo.so.6 \
80+
/lib/${LIB_DIR_PREFIX}-linux-gnu/libe2p.so.2 \
7881
/lib/${LIB_DIR_PREFIX}-linux-gnu/libcom_err.so.2 \
7982
/lib/${LIB_DIR_PREFIX}-linux-gnu/libdevmapper.so.1.02.1 \
80-
/lib/${LIB_DIR_PREFIX}-linux-gnu/libe2p.so.2 \
8183
/lib/${LIB_DIR_PREFIX}-linux-gnu/libext2fs.so.2 \
8284
/lib/${LIB_DIR_PREFIX}-linux-gnu/libgcc_s.so.1 \
8385
/lib/${LIB_DIR_PREFIX}-linux-gnu/liblzma.so.5 \
84-
/lib/${LIB_DIR_PREFIX}-linux-gnu/libmount.so.1 \
85-
/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre.so.3 \
86-
/lib/${LIB_DIR_PREFIX}-linux-gnu/libreadline.so.5 \
87-
/lib/${LIB_DIR_PREFIX}-linux-gnu/libselinux.so.1 \
88-
/lib/${LIB_DIR_PREFIX}-linux-gnu/libtinfo.so.6 \
89-
/lib/${LIB_DIR_PREFIX}-linux-gnu/libudev.so.1 \
90-
/lib/${LIB_DIR_PREFIX}-linux-gnu/libuuid.so.1 \
86+
/lib/${LIB_DIR_PREFIX}-linux-gnu/libreadline.so.8 \
9187
/lib/${LIB_DIR_PREFIX}-linux-gnu/libz.so.1 /lib/${LIB_DIR_PREFIX}-linux-gnu/
9288

93-
COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
89+
COPY --from=debian /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libblkid.so.1 \
90+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libinih.so.1 \
91+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libmount.so.1 \
92+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libudev.so.1 \
93+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libuuid.so.1 \
94+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libacl.so.1 \
9495
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libattr.so.1 \
95-
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicudata.so.63 \
96-
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicui18n.so.63 \
97-
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicuuc.so.63 \
96+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libedit.so.2 \
97+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicudata.so.67 \
98+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicui18n.so.67 \
99+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicuuc.so.67 \
98100
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
101+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \
99102
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libstdc++.so.6 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/
100103

101104
# Copy NVME support required script and rules into distroless base.

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ endif
3737
all: gce-pd-driver gce-pd-driver-windows
3838
gce-pd-driver: require-GCE_PD_CSI_STAGING_VERSION
3939
mkdir -p bin
40-
go build -mod=vendor -gcflags=$(GCFLAGS) -ldflags "-linkmode 'external' -extldflags '-static' -X main.version=$(STAGINGVERSION)" -o bin/${DRIVERBINARY} ./cmd/gce-pd-csi-driver/
40+
CGO_ENABLED=0 go build -mod=vendor -gcflags=$(GCFLAGS) -ldflags "-extldflags=static -X main.version=$(STAGINGVERSION)" -o bin/${DRIVERBINARY} ./cmd/gce-pd-csi-driver/
4141

4242
gce-pd-driver-windows: require-GCE_PD_CSI_STAGING_VERSION
4343
ifeq (${GOARCH}, amd64)

‎OWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ reviewers:
44
- mattcary
55
- msau42
66
- saikat-royc
7+
- sunnylovestiramisu
78
approvers:
89
- amacaskill
910
- leiyiz
1011
- mattcary
1112
- msau42
1213
- saikat-royc
14+
- sunnylovestiramisu
1315
emeritus_reviewers:
1416
- davidz627
1517
- jingxu97

‎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.9.0`
15+
Latest stable image: `registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.10.0`
1616

1717
### Test Status
1818

‎cmd/gce-pd-csi-driver/main.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ var (
5959
waitForOpBackoffSteps = flag.Int("wait-op-backoff-steps", 100, "Steps for wait for operation backoff")
6060
waitForOpBackoffCap = flag.Duration("wait-op-backoff-cap", 0, "Cap for wait for operation backoff")
6161

62-
maxprocs = flag.Int("maxprocs", 1, "GOMAXPROCS override")
62+
maxProcs = flag.Int("maxprocs", 1, "GOMAXPROCS override")
63+
maxConcurrentFormat = flag.Int("max-concurrent-format", 1, "The maximum number of concurrent format exec calls")
64+
concurrentFormatTimeout = flag.Duration("concurrent-format-timeout", 1*time.Minute, "The maximum duration of a format operation before its concurrency token is released")
6365

6466
version string
6567
)
@@ -88,7 +90,7 @@ func main() {
8890
func handle() {
8991
var err error
9092

91-
runtime.GOMAXPROCS(*maxprocs)
93+
runtime.GOMAXPROCS(*maxProcs)
9294
klog.Infof("Sys info: NumCPU: %v MAXPROC: %v", runtime.NumCPU(), runtime.GOMAXPROCS(0))
9395

9496
if version == "" {
@@ -110,16 +112,16 @@ func handle() {
110112
klog.Fatalf("Bad extra volume labels: %v", err.Error())
111113
}
112114

113-
gceDriver := driver.GetGCEDriver()
114-
115-
//Initialize GCE Driver
116115
ctx, cancel := context.WithCancel(context.Background())
117116
defer cancel()
118117

119-
//Initialize identity server
118+
// Initialize driver
119+
gceDriver := driver.GetGCEDriver()
120+
121+
// Initialize identity server
120122
identityServer := driver.NewIdentityServer(gceDriver)
121123

122-
//Initialize requirements for the controller service
124+
// Initialize requirements for the controller service
123125
var controllerServer *driver.GCEControllerServer
124126
if *runControllerService {
125127
cloudProvider, err := gce.CreateCloudProvider(ctx, version, *cloudConfigFilePath, *computeEndpoint)
@@ -133,10 +135,10 @@ func handle() {
133135
klog.Warningf("controller service is disabled but cloud config given - it has no effect")
134136
}
135137

136-
//Initialize requirements for the node service
138+
// Initialize requirements for the node service
137139
var nodeServer *driver.GCENodeServer
138140
if *runNodeService {
139-
mounter, err := mountmanager.NewSafeMounter()
141+
mounter, err := mountmanager.NewSafeMounter(*maxConcurrentFormat, *concurrentFormatTimeout)
140142
if err != nil {
141143
klog.Fatalf("Failed to get safe mounter: %v", err.Error())
142144
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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-rc4"
51+
newTag: "v1.8.4-rc2"
5252
---
5353

0 commit comments

Comments
 (0)