Skip to content

Commit 3221a25

Browse files
wlan0harshavardhana
authored andcommitted
use go1.17 for everything
1 parent 3d784bf commit 3221a25

10 files changed

+18
-18
lines changed

build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ if [ -t 1 ]; then
2727
-e HOME=/go/home \
2828
-v "${SCRIPT_ROOT}:/go/src/github.com/minio/direct-csi" \
2929
-w /go/src/github.com/minio/direct-csi \
30-
--entrypoint hack/build-without-docker.sh golang:1.16
30+
--entrypoint hack/build-without-docker.sh golang:1.17
3131
else
3232
docker run \
3333
-u $(id -u ${USER}):$(id -g ${USER}) \
3434
-e HOME=/go/home \
3535
-v "${SCRIPT_ROOT}:/go/src/github.com/minio/direct-csi" \
3636
-w /go/src/github.com/minio/direct-csi \
37-
--entrypoint hack/build-without-docker.sh golang:1.16
37+
--entrypoint hack/build-without-docker.sh golang:1.17
3838
fi

pkg/apis/direct.csi.min.io/v1alpha1/deepcopy_generated.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/direct.csi.min.io/v1alpha1/openapi_generated.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/direct.csi.min.io/v1beta1/deepcopy_generated.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/direct.csi.min.io/v1beta1/openapi_generated.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/direct.csi.min.io/v1beta2/conversion_generated.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/direct.csi.min.io/v1beta2/deepcopy_generated.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/direct.csi.min.io/v1beta2/openapi_generated.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/installer/const.go

+6-13
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ import (
2222

2323
// CSI provisioner images
2424
const (
25-
// quay.io/minio/csi-provisioner:v2.2.2
26-
CSIImageCSIProvisioner = "csi-provisioner@sha256:3b465cbcadf7d437fc70c3b6aa2c93603a7eef0a3f5f1e861d91f303e4aabdee"
25+
// quay.io/minio/csi-provisioner:v2.2.2-go1.17
26+
CSIImageCSIProvisioner = "csi-provisioner@sha256:d4f94539565cf62aea57062b6a42c5156337003133fd3f51b93df9a789e69840"
2727

28-
// quay.io/minio/csi-node-driver-registrar:v2.2.0
29-
CSIImageNodeDriverRegistrar = "csi-node-driver-registrar@sha256:ba763bb01ddc09e312240c8abc310aa2e2dd6aee636d342f6dd9238a6bff179c"
28+
// quay.io/minio/csi-node-driver-registrar:v2.2.0-go1.17
29+
CSIImageNodeDriverRegistrar = "csi-node-driver-registrar@sha256:843fb23b1a3fa1de986378b0b8c08c35f8e62499d386de8ec57801fd029afe6d"
3030

31-
// quay.io/minio/livenessprobe:v2.2.0
32-
CSIImageLivenessProbe = "livenessprobe@sha256:072e29e350ed7e870e119cbba37324348e1d00f0ba06d4ea288413466d1aa8e8"
31+
// quay.io/minio/livenessprobe:v2.2.0-go1.17
32+
CSIImageLivenessProbe = "livenessprobe@sha256:928a80be4d363e0e438ff28dcdb00d8d674d3059c6149a8cda64ce6016a9a3f8"
3333
)
3434

3535
// Misc
@@ -70,13 +70,6 @@ const (
7070
nodeDriverRegistrarContainerName = "node-driver-registrar"
7171
csiProvisionerContainerName = "csi-provisioner"
7272

73-
// "csi-provisioner:v2.2.0"
74-
csiProvisionerContainerImage = "csi-provisioner@sha256:3b465cbcadf7d437fc70c3b6aa2c93603a7eef0a3f5f1e861d91f303e4aabdee"
75-
// "livenessprobe:v2.2.0"
76-
livenessProbeContainerImage = "livenessprobe@sha256:072e29e350ed7e870e119cbba37324348e1d00f0ba06d4ea288413466d1aa8e8"
77-
// "csi-node-driver-registrar:v2.2.0"
78-
nodeDriverRegistrarContainerImage = "csi-node-driver-registrar@sha256:ba763bb01ddc09e312240c8abc310aa2e2dd6aee636d342f6dd9238a6bff179c"
79-
8073
healthZContainerPort = 9898
8174
healthZContainerPortName = "healthz"
8275
healthZContainerPortProtocol = "TCP"

pkg/installer/install.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ func CreateDaemonSet(ctx context.Context,
326326
Containers: []corev1.Container{
327327
{
328328
Name: nodeDriverRegistrarContainerName,
329-
Image: filepath.Join(registry, org, nodeDriverRegistrarContainerImage),
329+
Image: filepath.Join(registry, org, CSIImageNodeDriverRegistrar),
330330
Args: []string{
331331
fmt.Sprintf("--v=%d", logLevel),
332332
"--csi-address=unix:///csi/csi.sock",
@@ -416,7 +416,7 @@ func CreateDaemonSet(ctx context.Context,
416416
},
417417
{
418418
Name: livenessProbeContainerName,
419-
Image: filepath.Join(registry, org, livenessProbeContainerImage),
419+
Image: filepath.Join(registry, org, CSIImageLivenessProbe),
420420
Args: []string{
421421
"--csi-address=/csi/csi.sock",
422422
"--health-port=9898",
@@ -600,7 +600,7 @@ func CreateDeployment(ctx context.Context, identity string, directCSIContainerIm
600600
Containers: []corev1.Container{
601601
{
602602
Name: csiProvisionerContainerName,
603-
Image: filepath.Join(registry, org, csiProvisionerContainerImage),
603+
Image: filepath.Join(registry, org, CSIImageCSIProvisioner),
604604
Args: []string{
605605
fmt.Sprintf("--v=%d", logLevel),
606606
"--timeout=300s",

0 commit comments

Comments
 (0)