Merge pull request #829 from mattcary/update-101

mattcary · web-flow · commit 5f52b22b248a · 2021-09-01T17:42:59.000-07:00
Update base image to buster-v1.9.0
diff --git a/Dockerfile b/Dockerfile
@@ -14,17 +14,17 @@
 
 
 
-FROM golang:1.13.4 as builder
+FROM golang:1.13.15 as builder
 WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 ADD . .
 RUN make
 
 # MAD HACKS: Build a version first so we can take the scsi_id bin and put it somewhere else in our real build
-FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3 as base
+FROM k8s.gcr.io/build-image/debian-base-amd64:buster-v1.9.0 as base
 RUN clean-install udev
 
 # Start from Kubernetes Debian base
-FROM k8s.gcr.io/build-image/debian-base-amd64:v2.1.3 
+FROM k8s.gcr.io/build-image/debian-base-amd64:buster-v1.9.0
 COPY --from=builder /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/bin/gce-pd-csi-driver /gce-pd-csi-driver
 # Install necessary dependencies
 RUN clean-install util-linux e2fsprogs mount ca-certificates udev xfsprogs
diff --git a/deploy/kubernetes/install-kustomize.sh b/deploy/kubernetes/install-kustomize.sh
@@ -17,5 +17,5 @@ if [ -f "kustomize" ]; then
   rm kustomize
 fi
 echo "installing latest version of kustomize"
-curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash
+curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash -x
 mv kustomize ${INSTALL_DIR}
diff --git a/pkg/gce-pd-csi-driver/utils_linux.go b/pkg/gce-pd-csi-driver/utils_linux.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 /*
 Copyright 2020 The Kubernetes Authors.
diff --git a/pkg/gce-pd-csi-driver/utils_windows.go b/pkg/gce-pd-csi-driver/utils_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 /*
 Copyright 2020 The Kubernetes Authors.
diff --git a/pkg/mount-manager/safe-mounter_linux.go b/pkg/mount-manager/safe-mounter_linux.go
@@ -1,4 +1,4 @@
-// +build linux
+//go:build linux
 
 /*
 Copyright 2018 The Kubernetes Authors.
diff --git a/pkg/mount-manager/safe-mounter_windows.go b/pkg/mount-manager/safe-mounter_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 /*
 Copyright 2020 The Kubernetes Authors.
diff --git a/pkg/mount-manager/statter_windows.go b/pkg/mount-manager/statter_windows.go
@@ -1,4 +1,5 @@
-// +build windows
+//go:build windows
+
 /*
 Copyright 2019 The Kubernetes Authors.
 
diff --git a/pkg/resizefs/resizefs_linux.go b/pkg/resizefs/resizefs_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/pkg/resizefs/resizefs_unsupported.go b/pkg/resizefs/resizefs_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /*
diff --git a/test/k8s-integration/.dockerized-kube-version-defs b/test/k8s-integration/.dockerized-kube-version-defs
@@ -1,5 +1,5 @@
 KUBE_GIT_COMMIT='somefakecommit'
 KUBE_GIT_TREE_STATE='dirty'
-KUBE_GIT_VERSION='v888.888.888-fake-testing-master.version'
-KUBE_GIT_MAJOR='888'
-KUBE_GIT_MINOR='888+'
+KUBE_GIT_VERSION='v1.23.888-fake-testing-master.version'
+KUBE_GIT_MAJOR='1'
+KUBE_GIT_MINOR='23+'
diff --git a/test/k8s-integration/cluster.go b/test/k8s-integration/cluster.go
@@ -312,8 +312,8 @@ func getNormalizedVersion(kubeVersion, gkeVersion string) (string, error) {
 
 }
 
-func getKubeClusterVersion() (string, error) {
-	out, err := exec.Command("kubectl", "version", "-o=json").CombinedOutput()
+func getKubeClusterVersion(k8sDir string) (string, error) {
+	out, err := exec.Command(filepath.Join(k8sDir, "cluster", "kubectl.sh"), "version", "-o=json").CombinedOutput()
 	if err != nil {
 		return "", fmt.Errorf("failed to obtain cluster version, error: %v", err)
 	}
@@ -325,14 +325,14 @@ func getKubeClusterVersion() (string, error) {
 	var v version
 	err = json.Unmarshal(out, &v)
 	if err != nil {
-		return "", fmt.Errorf("Failed to parse kubectl version output, error: %v", err)
+		return "", fmt.Errorf("Failed to parse kubectl version output, error: %v: %s", err, out)
 	}
 
 	return v.ServerVersion.GitVersion, nil
 }
 
-func mustGetKubeClusterVersion() string {
-	ver, err := getKubeClusterVersion()
+func mustGetKubeClusterVersion(k8sDir string) string {
+	ver, err := getKubeClusterVersion(k8sDir)
 	if err != nil {
 		klog.Fatalf("Error: %v", err)
 	}
diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go
@@ -355,7 +355,7 @@ func handle() error {
 	// Kubernetes version of GKE deployments are expected to be of the pattern x.y.z-gke.k,
 	// hence we use the main.Version utils to parse and compare GKE managed cluster versions.
 	// For clusters deployed on GCE, use the apimachinery version utils (which supports non-gke based semantic versioning).
-	clusterVersion := mustGetKubeClusterVersion()
+	clusterVersion := mustGetKubeClusterVersion(k8sDir)
 	var testSkip string
 	switch *deploymentStrat {
 	case "gce":
diff --git a/test/run-k8s-integration.sh b/test/run-k8s-integration.sh
@@ -15,8 +15,8 @@ readonly boskos_resource_type="${GCE_PD_BOSKOS_RESOURCE_TYPE:-gce-project}"
 readonly do_driver_build="${GCE_PD_DO_DRIVER_BUILD:-true}"
 readonly deployment_strategy=${DEPLOYMENT_STRATEGY:-gce}
 readonly gke_cluster_version=${GKE_CLUSTER_VERSION:-latest}
-readonly kube_version=${GCE_PD_KUBE_VERSION:-master}
-readonly test_version=${TEST_VERSION:-master}
+readonly kube_version=${GCE_PD_KUBE_VERSION:-1.18.20}
+readonly test_version=${TEST_VERSION:-1.18.20}
 readonly gce_zone=${GCE_CLUSTER_ZONE:-us-central1-b}
 readonly gce_region=${GCE_CLUSTER_REGION:-}
 readonly image_type=${IMAGE_TYPE:-cos}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !windows`
	`1`	`+//go:build !windows`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`Copyright 2020 The Kubernetes Authors.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build windows`
	`1`	`+//go:build windows`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`Copyright 2020 The Kubernetes Authors.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build linux`
	`1`	`+//go:build linux`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`Copyright 2018 The Kubernetes Authors.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build linux`
`1`	`2`	`// +build linux`
`2`	`3`
`3`	`4`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build !linux`
`1`	`2`	`// +build !linux`
`2`	`3`
`3`	`4`	`/*`