Update to go1.17 (gardener#4822)

* Update the go version in the Dockerfile * Update the go version in the TestDefinitions * make generate * Format the ./hack dir
krgostev · Apr 21, 2022 · a4d26e1 · a4d26e1
1 parent 683ab76
commit a4d26e1
Show file tree

Hide file tree

Showing 83 changed files with 83 additions and 27 deletions.
diff --git a/.test-defs/CreateManagedSeed.yaml b/.test-defs/CreateManagedSeed.yaml
@@ -16,4 +16,4 @@ spec:
     -shoot-name=$SHOOT_NAME
     -deploy-gardenlet=$DEPLOY_GARDENLET
     -backup-provider=$BACKUP_PROVIDER
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/CreateShoot.yaml b/.test-defs/CreateShoot.yaml
@@ -39,4 +39,4 @@ spec:
 #    -machine-type=$MACHINE_TYPE
 #    -external-domain=
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/DeleteManagedSeed.yaml b/.test-defs/DeleteManagedSeed.yaml
@@ -13,4 +13,4 @@ spec:
     --v -ginkgo.v -ginkgo.progress -ginkgo.noColor
     -kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
     -managed-seed-name=$MANAGED_SEED_NAME
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/DeleteShoot.yaml b/.test-defs/DeleteShoot.yaml
@@ -14,4 +14,4 @@ spec:
     --shoot-name=$SHOOT_NAME
     --project-namespace=$PROJECT_NAMESPACE
     --kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/GardenletLandscaper.yaml b/.test-defs/GardenletLandscaper.yaml
@@ -20,4 +20,4 @@ spec:
     -component-name=$COMPONENT_NAME
     -component-version=$VERSION
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/HibernateShoot.yaml b/.test-defs/HibernateShoot.yaml
@@ -15,4 +15,4 @@ spec:
     --project-namespace=$PROJECT_NAMESPACE
     --kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/MigrateShoot.yaml b/.test-defs/MigrateShoot.yaml
@@ -17,4 +17,4 @@ spec:
     -kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
     -mr-exclude-list="$MR_EXCLUDE_LIST"
     -resources-with-generated-name="$RESOURCES_WITH_GENERATED_NAME"
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/ReconcileShoots.yaml b/.test-defs/ReconcileShoots.yaml
@@ -15,4 +15,4 @@ spec:
     -kubecfg=$TM_KUBECONFIG_PATH/gardener.config
     -version=$GARDENER_VERSION
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/ShootKubernetesUpdateTest.yaml b/.test-defs/ShootKubernetesUpdateTest.yaml
@@ -17,4 +17,4 @@ spec:
     -shoot-name=$SHOOT_NAME
     -project-namespace=$PROJECT_NAMESPACE
     -version=$K8S_VERSION
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteGardenerBeta.yaml b/.test-defs/TestSuiteGardenerBeta.yaml
@@ -19,4 +19,4 @@ spec:
       -ginkgo.focus="\[BETA\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteGardenerBetaSerial.yaml b/.test-defs/TestSuiteGardenerBetaSerial.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[BETA\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteGardenerDefault.yaml b/.test-defs/TestSuiteGardenerDefault.yaml
@@ -19,4 +19,4 @@ spec:
       -ginkgo.focus="\[DEFAULT\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteGardenerDefaultSerial.yaml b/.test-defs/TestSuiteGardenerDefaultSerial.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[DEFAULT\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteGardenerRelease.yaml b/.test-defs/TestSuiteGardenerRelease.yaml
@@ -19,4 +19,4 @@ spec:
       -ginkgo.focus="\[RELEASE\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteGardenerReleaseSerial.yaml b/.test-defs/TestSuiteGardenerReleaseSerial.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[RELEASE\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteShootBeta.yaml b/.test-defs/TestSuiteShootBeta.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[BETA\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteShootBetaDisruptive.yaml b/.test-defs/TestSuiteShootBetaDisruptive.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[BETA\].*\[DISRUPTIVE\]"
       -ginkgo.skip="\[SERIAL\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteShootBetaSerial.yaml b/.test-defs/TestSuiteShootBetaSerial.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[BETA\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteShootDefault.yaml b/.test-defs/TestSuiteShootDefault.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[DEFAULT\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteShootDefaultDisruptive.yaml b/.test-defs/TestSuiteShootDefaultDisruptive.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[DEFAULT\].*\[DISRUPTIVE\]"
       -ginkgo.skip="\[SERIAL\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteShootDefaultSerial.yaml b/.test-defs/TestSuiteShootDefaultSerial.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[DEFAULT\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteShootRelease.yaml b/.test-defs/TestSuiteShootRelease.yaml
@@ -21,4 +21,4 @@ spec:
       -ginkgo.focus="\[RELEASE\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteShootReleaseDisruptive.yaml b/.test-defs/TestSuiteShootReleaseDisruptive.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[RELEASE\].*\[DISRUPTIVE\]"
       -ginkgo.skip="\[SERIAL\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/TestSuiteShootReleaseSerial.yaml b/.test-defs/TestSuiteShootReleaseSerial.yaml
@@ -23,4 +23,4 @@ spec:
       -ginkgo.focus="\[RELEASE\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/.test-defs/WakeUpShoot.yaml b/.test-defs/WakeUpShoot.yaml
@@ -15,4 +15,4 @@ spec:
     --project-namespace=$PROJECT_NAMESPACE
     --kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
 
-  image: eu.gcr.io/gardener-project/3rd/golang:1.16.9
+  image: eu.gcr.io/gardener-project/3rd/golang:1.17.2
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 #############      builder       #############
-FROM golang:1.16.9 AS builder
+FROM golang:1.17.2 AS builder
 
 WORKDIR /go/src/github.com/gardener/gardener
 COPY . .

diff --git a/Makefile b/Makefile
@@ -226,7 +226,7 @@ generate-extensions-crds:
 
 .PHONY: format
 format:
-	@./hack/format.sh ./cmd ./extensions ./pkg ./plugin ./test ./landscaper
+	@./hack/format.sh ./cmd ./extensions ./pkg ./plugin ./test ./landscaper ./hack
 
 .PHONY: test
 test:

diff --git a/hack/api-reference/template/tools.go b/hack/api-reference/template/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 // Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file

diff --git a/hack/tools.go b/hack/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 // Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file

diff --git a/landscaper/pkg/controlplane/apis/imports/v1alpha1/zz_generated.conversion.go b/landscaper/pkg/controlplane/apis/imports/v1alpha1/zz_generated.conversion.go
diff --git a/landscaper/pkg/controlplane/apis/imports/v1alpha1/zz_generated.deepcopy.go b/landscaper/pkg/controlplane/apis/imports/v1alpha1/zz_generated.deepcopy.go
diff --git a/landscaper/pkg/controlplane/apis/imports/v1alpha1/zz_generated.defaults.go b/landscaper/pkg/controlplane/apis/imports/v1alpha1/zz_generated.defaults.go
diff --git a/landscaper/pkg/controlplane/apis/imports/zz_generated.deepcopy.go b/landscaper/pkg/controlplane/apis/imports/zz_generated.deepcopy.go
diff --git a/landscaper/pkg/gardenlet/apis/imports/v1alpha1/zz_generated.conversion.go b/landscaper/pkg/gardenlet/apis/imports/v1alpha1/zz_generated.conversion.go
diff --git a/landscaper/pkg/gardenlet/apis/imports/v1alpha1/zz_generated.deepcopy.go b/landscaper/pkg/gardenlet/apis/imports/v1alpha1/zz_generated.deepcopy.go
diff --git a/landscaper/pkg/gardenlet/apis/imports/v1alpha1/zz_generated.defaults.go b/landscaper/pkg/gardenlet/apis/imports/v1alpha1/zz_generated.defaults.go
diff --git a/landscaper/pkg/gardenlet/apis/imports/zz_generated.deepcopy.go b/landscaper/pkg/gardenlet/apis/imports/zz_generated.deepcopy.go
diff --git a/pkg/admissioncontroller/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/admissioncontroller/apis/config/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/admissioncontroller/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/admissioncontroller/apis/config/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/admissioncontroller/apis/config/v1alpha1/zz_generated.defaults.go b/pkg/admissioncontroller/apis/config/v1alpha1/zz_generated.defaults.go
diff --git a/pkg/admissioncontroller/apis/config/zz_generated.deepcopy.go b/pkg/admissioncontroller/apis/config/zz_generated.deepcopy.go
diff --git a/pkg/apis/authentication/v1alpha1/zz_generated.conversion.go b/pkg/apis/authentication/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/authentication/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/authentication/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/authentication/v1alpha1/zz_generated.defaults.go b/pkg/apis/authentication/v1alpha1/zz_generated.defaults.go
diff --git a/pkg/apis/authentication/zz_generated.deepcopy.go b/pkg/apis/authentication/zz_generated.deepcopy.go
diff --git a/pkg/apis/core/v1alpha1/zz_generated.conversion.go b/pkg/apis/core/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/core/v1alpha1/zz_generated.defaults.go b/pkg/apis/core/v1alpha1/zz_generated.defaults.go
diff --git a/pkg/apis/core/v1beta1/zz_generated.conversion.go b/pkg/apis/core/v1beta1/zz_generated.conversion.go
diff --git a/pkg/apis/core/v1beta1/zz_generated.deepcopy.go b/pkg/apis/core/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/apis/core/v1beta1/zz_generated.defaults.go b/pkg/apis/core/v1beta1/zz_generated.defaults.go
diff --git a/pkg/apis/core/zz_generated.deepcopy.go b/pkg/apis/core/zz_generated.deepcopy.go
diff --git a/pkg/apis/extensions/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/extensions/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/operations/v1alpha1/zz_generated.conversion.go b/pkg/apis/operations/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/operations/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/operations/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/operations/v1alpha1/zz_generated.defaults.go b/pkg/apis/operations/v1alpha1/zz_generated.defaults.go
diff --git a/pkg/apis/operations/zz_generated.deepcopy.go b/pkg/apis/operations/zz_generated.deepcopy.go
diff --git a/pkg/apis/resources/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/resources/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/seedmanagement/v1alpha1/zz_generated.conversion.go b/pkg/apis/seedmanagement/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/seedmanagement/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/seedmanagement/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/seedmanagement/v1alpha1/zz_generated.defaults.go b/pkg/apis/seedmanagement/v1alpha1/zz_generated.defaults.go
diff --git a/pkg/apis/seedmanagement/zz_generated.deepcopy.go b/pkg/apis/seedmanagement/zz_generated.deepcopy.go
diff --git a/pkg/apis/settings/v1alpha1/zz_generated.conversion.go b/pkg/apis/settings/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/settings/v1alpha1/zz_generated.defaults.go b/pkg/apis/settings/v1alpha1/zz_generated.defaults.go
diff --git a/pkg/apis/settings/zz_generated.deepcopy.go b/pkg/apis/settings/zz_generated.deepcopy.go
diff --git a/pkg/controllermanager/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/controllermanager/apis/config/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/controllermanager/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/controllermanager/apis/config/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controllermanager/apis/config/v1alpha1/zz_generated.defaults.go b/pkg/controllermanager/apis/config/v1alpha1/zz_generated.defaults.go
diff --git a/pkg/controllermanager/apis/config/zz_generated.deepcopy.go b/pkg/controllermanager/apis/config/zz_generated.deepcopy.go
diff --git a/pkg/gardenlet/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/gardenlet/apis/config/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/gardenlet/apis/config/v1alpha1/zz_generated.deepcopy.go b/pkg/gardenlet/apis/config/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/gardenlet/apis/config/v1alpha1/zz_generated.defaults.go b/pkg/gardenlet/apis/config/v1alpha1/zz_generated.defaults.go