Update Golang to 1.16.2 (gardener#3739)

* Upgrade to Golang 1.16.2 * Replace packr with go:embed * Replace go-bindata with go:embed
jfortin-sap · Mar 22, 2021 · c50704b · c50704b
1 parent 8a51383
commit c50704b
Show file tree

Hide file tree

Showing 122 changed files with 95 additions and 7,683 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: golang:1.15.3
+image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.2
diff --git a/.test-defs/DeleteShoot.yaml b/.test-defs/DeleteShoot.yaml
@@ -15,4 +15,4 @@ spec:
     --project-namespace=$PROJECT_NAMESPACE
     --kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
 
-  image: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.2
diff --git a/.test-defs/MigrateShoot.yaml b/.test-defs/MigrateShoot.yaml
@@ -16,4 +16,4 @@ spec:
     -shoot-namespace=$PROJECT_NAMESPACE
     -kubecfg="$TM_KUBECONFIG_PATH/gardener.config"
     -mr-exclude-list="$MR_EXCLUDE_LIST"
-  image: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.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: golang:1.15.3
+  image: golang:1.16.2
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 #############      builder       #############
 ARG GCR_PULL_URL=eu.gcr.io/gardener-project/3rd/
-FROM ${GCR_PULL_URL}golang:1.15.9 AS builder
+FROM ${GCR_PULL_URL}golang:1.16.2 AS builder
 
 WORKDIR /go/src/github.com/gardener/gardener
 COPY . .

diff --git a/Makefile b/Makefile
@@ -147,7 +147,6 @@ install-requirements:
 	@go install -mod=vendor github.com/ahmetb/gen-crd-api-reference-docs
 	@go install -mod=vendor github.com/golang/mock/mockgen
 	@go install -mod=vendor sigs.k8s.io/controller-tools/cmd/controller-gen
-	@GO111MODULE=off go get github.com/go-bindata/go-bindata/...
 	@./hack/install-promtool.sh
 	@./hack/install-requirements.sh
 

diff --git a/extensions/pkg/controller/operatingsystemconfig/oscommon/generator/test/README.md b/extensions/pkg/controller/operatingsystemconfig/oscommon/generator/test/README.md
@@ -10,24 +10,27 @@ in a test file.
 Each Generator implementation can use this function as shown bellow:
 
 ```go
+package my_generator_test
+
 import (
-	"github.com/gobuffalo/packr"
+	"embed"
+
 	"github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig/oscommon/generator/test"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
-var _ Describe("My Generator Test", func(){
-      var box packr.Box
-
-      BeforeSuite(func() {
-            box = packr.NewBox("/path/to/testfiles")
-      })
+//go:embed /path/to/testfiles
+var files embed.FS
 
-      Describe("Conformance Tests", test.DescribeTest(NewGenerator(),box))
+var _ = Describe("My Generator Test", func(){
+    Describe("Conformance Tests", 
+        test.DescribeTest(NewGenerator(), files),
+    )
 
-      Describe("My other Tests", func(){
-           ...
-      })
+    Describe("My other Tests", func(){
+        // ...
+    })
 })
 ```
diff --git a/...nsions/pkg/controller/operatingsystemconfig/oscommon/generator/test/template_generator.go b/...nsions/pkg/controller/operatingsystemconfig/oscommon/generator/test/template_generator.go
@@ -15,12 +15,13 @@
 package test
 
 import (
+	"embed"
+
 	"github.com/gardener/gardener/extensions/pkg/controller/operatingsystemconfig/oscommon/generator"
 	extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
 
-	"github.com/gobuffalo/packr"
-	"github.com/onsi/ginkgo"
-	"github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 )
 
 var (
@@ -29,13 +30,12 @@ var (
 
 // DescribeTest returns a function which can be used in tests for the
 // template generator implementation. It receives an instance of a template
-// generator and a packr Box with the test files to be used in the tests.
-var DescribeTest = func(g generator.Generator, box packr.Box) func() {
+// generator and embedded files with the test files to be used in the tests.
+var DescribeTest = func(g generator.Generator, files embed.FS) func() {
 	return func() {
-
-		ginkgo.It("should render correctly", func() {
-			expectedCloudInit, err := box.Find("cloud-init")
-			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+		It("should render correctly", func() {
+			expectedCloudInit, err := files.ReadFile("cloud-init")
+			Expect(err).NotTo(HaveOccurred())
 
 			cloudInit, _, err := g.Generate(&generator.OperatingSystemConfig{
 				Object: &extensionsv1alpha1.OperatingSystemConfig{},
@@ -62,8 +62,8 @@ var DescribeTest = func(g generator.Generator, box packr.Box) func() {
 				Bootstrap: true,
 			})
 
-			gomega.Expect(err).NotTo(gomega.HaveOccurred())
-			gomega.Expect(cloudInit).To(gomega.Equal(expectedCloudInit))
+			Expect(err).NotTo(HaveOccurred())
+			Expect(cloudInit).To(Equal(expectedCloudInit))
 		})
 	}
 }
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/gardener/gardener
 
-go 1.15
+go 1.16
 
 require (
 	github.com/Masterminds/semver v1.5.0
@@ -16,7 +16,6 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v0.3.0
 	github.com/go-openapi/spec v0.19.3
-	github.com/gobuffalo/packr v1.30.1
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/mock v1.5.0
 	github.com/googleapis/gnostic v0.5.1