use go1.17 for everything

minio · Aug 31, 2021 · 3221a25 · 3221a25
1 parent 3d784bf
commit 3221a25
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/build.sh b/build.sh
@@ -27,12 +27,12 @@ if [ -t 1 ]; then
            -e HOME=/go/home \
            -v "${SCRIPT_ROOT}:/go/src/github.com/minio/direct-csi" \
            -w /go/src/github.com/minio/direct-csi \
-           --entrypoint hack/build-without-docker.sh golang:1.16
+           --entrypoint hack/build-without-docker.sh golang:1.17
 else
     docker run \
            -u $(id -u ${USER}):$(id -g ${USER}) \
            -e HOME=/go/home \
            -v "${SCRIPT_ROOT}:/go/src/github.com/minio/direct-csi" \
            -w /go/src/github.com/minio/direct-csi \
-           --entrypoint hack/build-without-docker.sh golang:1.16
+           --entrypoint hack/build-without-docker.sh golang:1.17
 fi
diff --git a/pkg/apis/direct.csi.min.io/v1alpha1/deepcopy_generated.go b/pkg/apis/direct.csi.min.io/v1alpha1/deepcopy_generated.go
diff --git a/pkg/apis/direct.csi.min.io/v1alpha1/openapi_generated.go b/pkg/apis/direct.csi.min.io/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/direct.csi.min.io/v1beta1/deepcopy_generated.go b/pkg/apis/direct.csi.min.io/v1beta1/deepcopy_generated.go
diff --git a/pkg/apis/direct.csi.min.io/v1beta1/openapi_generated.go b/pkg/apis/direct.csi.min.io/v1beta1/openapi_generated.go
diff --git a/pkg/apis/direct.csi.min.io/v1beta2/conversion_generated.go b/pkg/apis/direct.csi.min.io/v1beta2/conversion_generated.go
diff --git a/pkg/apis/direct.csi.min.io/v1beta2/deepcopy_generated.go b/pkg/apis/direct.csi.min.io/v1beta2/deepcopy_generated.go
diff --git a/pkg/apis/direct.csi.min.io/v1beta2/openapi_generated.go b/pkg/apis/direct.csi.min.io/v1beta2/openapi_generated.go
diff --git a/pkg/installer/const.go b/pkg/installer/const.go
@@ -22,14 +22,14 @@ import (
 
 // CSI provisioner images
 const (
-	// quay.io/minio/csi-provisioner:v2.2.2
-	CSIImageCSIProvisioner = "csi-provisioner@sha256:3b465cbcadf7d437fc70c3b6aa2c93603a7eef0a3f5f1e861d91f303e4aabdee"
+	// quay.io/minio/csi-provisioner:v2.2.2-go1.17
+	CSIImageCSIProvisioner = "csi-provisioner@sha256:d4f94539565cf62aea57062b6a42c5156337003133fd3f51b93df9a789e69840"
 
-	// quay.io/minio/csi-node-driver-registrar:v2.2.0
-	CSIImageNodeDriverRegistrar = "csi-node-driver-registrar@sha256:ba763bb01ddc09e312240c8abc310aa2e2dd6aee636d342f6dd9238a6bff179c"
+	// quay.io/minio/csi-node-driver-registrar:v2.2.0-go1.17
+	CSIImageNodeDriverRegistrar = "csi-node-driver-registrar@sha256:843fb23b1a3fa1de986378b0b8c08c35f8e62499d386de8ec57801fd029afe6d"
 
-	// quay.io/minio/livenessprobe:v2.2.0
-	CSIImageLivenessProbe = "livenessprobe@sha256:072e29e350ed7e870e119cbba37324348e1d00f0ba06d4ea288413466d1aa8e8"
+	// quay.io/minio/livenessprobe:v2.2.0-go1.17
+	CSIImageLivenessProbe = "livenessprobe@sha256:928a80be4d363e0e438ff28dcdb00d8d674d3059c6149a8cda64ce6016a9a3f8"
 )
 
 // Misc
@@ -70,13 +70,6 @@ const (
 	nodeDriverRegistrarContainerName = "node-driver-registrar"
 	csiProvisionerContainerName      = "csi-provisioner"
 
-	// "csi-provisioner:v2.2.0"
-	csiProvisionerContainerImage = "csi-provisioner@sha256:3b465cbcadf7d437fc70c3b6aa2c93603a7eef0a3f5f1e861d91f303e4aabdee"
-	// "livenessprobe:v2.2.0"
-	livenessProbeContainerImage = "livenessprobe@sha256:072e29e350ed7e870e119cbba37324348e1d00f0ba06d4ea288413466d1aa8e8"
-	// "csi-node-driver-registrar:v2.2.0"
-	nodeDriverRegistrarContainerImage = "csi-node-driver-registrar@sha256:ba763bb01ddc09e312240c8abc310aa2e2dd6aee636d342f6dd9238a6bff179c"
-
 	healthZContainerPort         = 9898
 	healthZContainerPortName     = "healthz"
 	healthZContainerPortProtocol = "TCP"

diff --git a/pkg/installer/install.go b/pkg/installer/install.go
@@ -326,7 +326,7 @@ func CreateDaemonSet(ctx context.Context,
 		Containers: []corev1.Container{
 			{
 				Name:  nodeDriverRegistrarContainerName,
-				Image: filepath.Join(registry, org, nodeDriverRegistrarContainerImage),
+				Image: filepath.Join(registry, org, CSIImageNodeDriverRegistrar),
 				Args: []string{
 					fmt.Sprintf("--v=%d", logLevel),
 					"--csi-address=unix:///csi/csi.sock",
@@ -416,7 +416,7 @@ func CreateDaemonSet(ctx context.Context,
 			},
 			{
 				Name:  livenessProbeContainerName,
-				Image: filepath.Join(registry, org, livenessProbeContainerImage),
+				Image: filepath.Join(registry, org, CSIImageLivenessProbe),
 				Args: []string{
 					"--csi-address=/csi/csi.sock",
 					"--health-port=9898",
@@ -600,7 +600,7 @@ func CreateDeployment(ctx context.Context, identity string, directCSIContainerIm
 		Containers: []corev1.Container{
 			{
 				Name:  csiProvisionerContainerName,
-				Image: filepath.Join(registry, org, csiProvisionerContainerImage),
+				Image: filepath.Join(registry, org, CSIImageCSIProvisioner),
 				Args: []string{
 					fmt.Sprintf("--v=%d", logLevel),
 					"--timeout=300s",