Skip to content

Commit ee1189a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1186 from amacaskill/automated-cherry-pick-of-#1162-#1158-upstream-release-1.8
Automated cherry pick of #1162: Fix for CVEs #1158: go version updates
2 parents 8b509c4 + b887a1f commit ee1189a

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

‎Dockerfile

+17-15
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
@@ -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 k8s.gcr.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,30 @@ 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/libicudata.so.67 \
97+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicui18n.so.67 \
98+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libicuuc.so.67 \
9899
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libkmod.so.2 \
100+
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libpcre2-8.so.0 \
99101
/usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libstdc++.so.6 /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/
100102

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

‎Dockerfile.Windows

+1-1
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

+1-1
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

‎test/k8s-integration/main.go

+6
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,9 @@ func generateGCETestSkip(testParams *testParameters) string {
581581
skipString = skipString + "|\\[LinuxOnly\\]"
582582
}
583583

584+
// Snapshot and restore test fixes which is added in driver version 1.9+.
585+
skipString = skipString + "|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"
586+
584587
return skipString
585588
}
586589

@@ -598,6 +601,9 @@ func generateGKETestSkip(testParams *testParameters) string {
598601
skipString = skipString + "|pvc.data.source"
599602
}
600603

604+
// Snapshot and restore test fixes which is added in driver version 1.9+.
605+
skipString = skipString + "|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"
606+
601607
// "volumeMode should not mount / map unused volumes in a pod" tests a
602608
// (https://github.com/kubernetes/kubernetes/pull/81163)
603609
// bug-fix introduced in 1.16

0 commit comments

Comments
 (0)