Upgrade: Go v1.20 and packages

ref: https://issues.redhat.com/browse/ACM-5042 Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
dhaiducek · May 8, 2023 · d7cb435 · d7cb435
1 parent 1fa8cc0
commit d7cb435
Show file tree

Hide file tree

Showing 24 changed files with 327 additions and 994 deletions.
diff --git a/Makefile b/Makefile
@@ -57,8 +57,8 @@ fmt:
 ############################################################
 
 .PHONY: test
-test: kubebuilder-dependencies kubebuilder
- KUBEBUILDER_ASSETS=$(LOCAL_BIN) go test $(TESTARGS) `go list ./... | grep -v test/e2e`
+test: envtest kubebuilder
+ KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test $(TESTARGS) `go list ./... | grep -v test/e2e`
 
 .PHONY: test-coverage
 test-coverage: TESTARGS = -json -cover -covermode=atomic -coverprofile=coverage_unit.out

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright Contributors to the Open Cluster Management project
 
 # Stage 1: Use image builder to build the target binaries
-FROM golang:1.19 AS builder
+FROM golang:1.20 AS builder
 
 ENV COMPONENT=config-policy-controller
 ENV REPO_PATH=/go/src/github.com/open-cluster-management/${COMPONENT}

diff --git a/build/common/Makefile.common.mk b/build/common/Makefile.common.mk
@@ -39,7 +39,7 @@ controller-gen: ## Download controller-gen locally if necessary.
 
 .PHONY: kustomize
 kustomize: ## Download kustomize locally if necessary.
- $(call go-get-tool,sigs.k8s.io/kustomize/kustomize/v4@v4.5.4)
+ $(call go-get-tool,sigs.k8s.io/kustomize/kustomize/v5@v5.0.1)
 
 ############################################################
 # Lint
@@ -53,7 +53,7 @@ lint: lint-dependencies lint-yaml lint-go
 
 .PHONY: lint-dependencies
 lint-dependencies:
- $(call go-get-tool,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2)
+ $(call go-get-tool,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2)
 
 .PHONY: lint-yaml
 lint-yaml:
@@ -68,20 +68,22 @@ lint-go:
 .PHONY: fmt-dependencies
 fmt-dependencies:
  $(call go-get-tool,github.com/daixiang0/gci@v0.10.1)
- $(call go-get-tool,mvdan.cc/gofumpt@v0.4.0)
+ $(call go-get-tool,mvdan.cc/gofumpt@v0.5.0)
 
 .PHONY: fmt
 fmt: fmt-dependencies
  find . -not \( -path "./.go" -prune \) -name "*.go" | xargs gofmt -s -w
  find . -not \( -path "./.go" -prune \) -name "*.go" | xargs gofumpt -l -w
+ find . -not \( -path "./.go" -prune \) -name "*.go" | xargs gci write -s standard -s default -s "prefix($(shell cat go.mod | head -1 | cut -d " " -f 2))"
 
 ############################################################
 # Unit Test
 ############################################################
-KUBEBUILDER = $(LOCAL_BIN)/kubebuilder
-KBVERSION = 3.9.1
-K8S_VERSION = 1.26.1
 GOSEC = $(LOCAL_BIN)/gosec
+KUBEBUILDER = $(LOCAL_BIN)/kubebuilder
+ENVTEST = $(LOCAL_BIN)/setup-envtest
+KBVERSION = 3.12.0
+ENVTEST_K8S_VERSION = 1.26.x
 
 .PHONY: kubebuilder
 kubebuilder:
@@ -91,13 +93,9 @@ kubebuilder:
  chmod +x $(KUBEBUILDER); \
  fi
 
-.PHONY: kubebuilder-dependencies
-kubebuilder-dependencies: $(LOCAL_BIN)
- @if [ ! -f $(LOCAL_BIN)/etcd ] || [ ! -f $(LOCAL_BIN)/kube-apiserver ] || [ ! -f $(LOCAL_BIN)/kubectl ] || \
- [ "$$($(KUBEBUILDER) version 2>/dev/null | grep -o KubeBuilderVersion:\"[0-9]*\.[0-9]\.[0-9]*\")" != "KubeBuilderVersion:\"$(KBVERSION)\"" ]; then \
- echo "Installing envtest Kubebuilder assets"; \
- curl -L "https://go.kubebuilder.io/test-tools/$(K8S_VERSION)/$(GOOS)/$(GOARCH)" | tar xz --strip-components=2 -C $(LOCAL_BIN); \
- fi
+.PHONY: envtest
+envtest:
+ $(call go-get-tool,sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
 
 .PHONY: gosec
 gosec:

diff --git a/controllers/configurationpolicy_controller.go b/controllers/configurationpolicy_controller.go
@@ -1339,7 +1339,7 @@ func addConditionToStatus(
 
  // do not add condition unless it does not already appear in the status
  if !checkMessageSimilarity(plc.Status.CompliancyDetails[index].Conditions, cond) {
- conditions := AppendCondition(plc.Status.CompliancyDetails[index].Conditions, cond, "", false)
+ conditions := AppendCondition(plc.Status.CompliancyDetails[index].Conditions, cond)
  plc.Status.CompliancyDetails[index].Conditions = conditions
  updateNeeded = true
  }
@@ -1950,8 +1950,7 @@ func (r *ConfigurationPolicyReconciler) getMapping(
  policy.Status.CompliancyDetails[index].ComplianceState = policyv1.NonCompliant
 
  if !checkMessageSimilarity(policy.Status.CompliancyDetails[index].Conditions, cond) {
- conditions := AppendCondition(policy.Status.CompliancyDetails[index].Conditions,
- cond, gvk.GroupKind().Kind, false)
+ conditions := AppendCondition(policy.Status.CompliancyDetails[index].Conditions, cond)
  policy.Status.CompliancyDetails[index].Conditions = conditions
  updateNeeded = true
  }
@@ -2321,10 +2320,10 @@ func mergeArrays(newArr []interface{}, old []interface{}, ctype string) (result
  key := fmt.Sprint(val2)
  if seen[key] {
  continue
- } else {
- seen[key] = true
  }
 
+ seen[key] = true
+
  count := 0
  val2 := oldItemSet[key].value
  // for each list item in the existing array, iterate through the template array and try to find a match
@@ -2667,7 +2666,7 @@ func (r *ConfigurationPolicyReconciler) checkAndUpdateResource(
 
 // AppendCondition check and appends conditions to the policy status
 func AppendCondition(
- conditions []policyv1.Condition, newCond *policyv1.Condition, resourceType string, resolved ...bool,
+ conditions []policyv1.Condition, newCond *policyv1.Condition,
 ) (conditionsRes []policyv1.Condition) {
  defer recoverFlow()
 

diff --git a/controllers/encryption_test.go b/controllers/encryption_test.go
@@ -32,11 +32,11 @@ func getReconciler(includeSecret bool) ConfigurationPolicyReconciler {
  // Generate AES-256 keys and store them as a secret.
  key := make([]byte, keySize/8)
  _, err := rand.Read(key)
- Expect(err).To(BeNil())
+ Expect(err).ToNot(HaveOccurred())
 
  previousKey := make([]byte, keySize/8)
  _, err = rand.Read(previousKey)
- Expect(err).To(BeNil())
+ Expect(err).ToNot(HaveOccurred())
 
  encryptionSecret := &corev1.Secret{
  ObjectMeta: metav1.ObjectMeta{
@@ -74,7 +74,7 @@ func TestGetEncryptionKey(t *testing.T) {
  r := getReconciler(true)
  cachedEncryptionKey, err := r.getEncryptionKey(clusterName)
 
- Expect(err).To(BeNil())
+ Expect(err).ToNot(HaveOccurred())
  Expect(cachedEncryptionKey.key).ToNot(BeNil())
  Expect(cachedEncryptionKey.previousKey).ToNot(BeNil())
 }
@@ -86,7 +86,7 @@ func TestGetEncryptionKeyFail(t *testing.T) {
  r := getReconciler(false)
  cachedEncryptionKey, err := r.getEncryptionKey(clusterName)
 
- Expect(err).ToNot(BeNil())
+ Expect(err).To(HaveOccurred())
  Expect(cachedEncryptionKey).To(BeNil())
 }
 
@@ -100,7 +100,7 @@ func TestGetEncryptionConfig(t *testing.T) {
  policy := getEmptyPolicy()
 
  config, usedCache, err := r.getEncryptionConfig(policy, false)
- Expect(err).To(BeNil())
+ Expect(err).ToNot(HaveOccurred())
  Expect(usedCache).To(BeFalse())
  Expect(config).ToNot(BeNil())
  Expect(config.AESKey).ToNot(BeNil())
@@ -124,13 +124,13 @@ func TestGetEncryptionConfigCached(t *testing.T) {
 
  key := make([]byte, keySize/8)
  _, err := rand.Read(key)
- Expect(err).To(BeNil())
+ Expect(err).ToNot(HaveOccurred())
 
  r.cachedEncryptionKey = &cachedEncryptionKey{key: key}
  policy := getEmptyPolicy()
 
  config, usedCache, err := r.getEncryptionConfig(policy, false)
- Expect(err).To(BeNil())
+ Expect(err).ToNot(HaveOccurred())
  Expect(usedCache).To(BeTrue())
  Expect(config).ToNot(BeNil())
  Expect(config.AESKey).ToNot(BeNil())
@@ -189,7 +189,7 @@ func TestGetEncryptionConfigForceRefresh(t *testing.T) {
  policy := getEmptyPolicy()
 
  config, usedCache, err := r.getEncryptionConfig(policy, true)
- Expect(err).To(BeNil())
+ Expect(err).ToNot(HaveOccurred())
  Expect(usedCache).To(BeFalse())
  Expect(config).ToNot(BeNil())
  Expect(config.AESKey).ToNot(Equal(key))
@@ -214,7 +214,7 @@ func TestGetEncryptionKeyEmptySecret(t *testing.T) {
  r := ConfigurationPolicyReconciler{Client: client, DecryptionConcurrency: 5}
  cachedEncryptionKey, err := r.getEncryptionKey(clusterName)
 
- Expect(err).To(BeNil())
+ Expect(err).ToNot(HaveOccurred())
  Expect(cachedEncryptionKey.key).To(BeNil())
  Expect(cachedEncryptionKey.previousKey).To(BeNil())
 }

diff --git a/go.mod b/go.mod
@@ -1,106 +1,112 @@
 module open-cluster-management.io/config-policy-controller
 
-go 1.19
+go 1.20
 
 require (
  github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
  github.com/go-logr/zapr v1.2.3
- github.com/google/go-cmp v0.5.8
- github.com/onsi/ginkgo/v2 v2.1.6
- github.com/onsi/gomega v1.20.1
- github.com/prometheus/client_golang v1.13.0
+ github.com/google/go-cmp v0.5.9
+ github.com/onsi/ginkgo/v2 v2.9.4
+ github.com/onsi/gomega v1.27.6
+ github.com/prometheus/client_golang v1.15.1
  github.com/spf13/pflag v1.0.5
- github.com/stolostron/go-log-utils v0.1.1
- github.com/stolostron/go-template-utils/v3 v3.2.0
- github.com/stretchr/testify v1.7.0
- k8s.io/api v0.23.9
- k8s.io/apiextensions-apiserver v0.23.5
- k8s.io/apimachinery v0.23.9
+ github.com/stolostron/go-log-utils v0.1.2
+ github.com/stolostron/go-template-utils/v3 v3.2.1
+ github.com/stretchr/testify v1.8.1
+ k8s.io/api v0.27.1
+ k8s.io/apiextensions-apiserver v0.27.1
+ k8s.io/apimachinery v0.27.1
  k8s.io/client-go v12.0.0+incompatible
  k8s.io/klog v1.0.0
- k8s.io/klog/v2 v2.70.1
- k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf
- k8s.io/kubectl v0.23.9
- open-cluster-management.io/addon-framework v0.2.0
- sigs.k8s.io/controller-runtime v0.11.2
+ k8s.io/klog/v2 v2.100.1
+ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
+ k8s.io/kubectl v0.27.1
+ open-cluster-management.io/addon-framework v0.6.1
+ sigs.k8s.io/controller-runtime v0.14.6
  sigs.k8s.io/yaml v1.3.0
 )
 
 require (
- cloud.google.com/go v0.81.0 // indirect
- github.com/Azure/go-autorest v14.2.0+incompatible // indirect
- github.com/Azure/go-autorest/autorest v0.11.18 // indirect
- github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
- github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
- github.com/Azure/go-autorest/logger v0.2.1 // indirect
- github.com/Azure/go-autorest/tracing v0.6.0 // indirect
  github.com/Masterminds/goutils v1.1.1 // indirect
- github.com/Masterminds/semver/v3 v3.1.1 // indirect
- github.com/Masterminds/sprig/v3 v3.2.2 // indirect
- github.com/PuerkitoBio/purell v1.1.1 // indirect
- github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+ github.com/Masterminds/semver/v3 v3.2.1 // indirect
+ github.com/Masterminds/sprig/v3 v3.2.3 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/evanphx/json-patch v4.12.0+incompatible // indirect
- github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
- github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
- github.com/fsnotify/fsnotify v1.5.1 // indirect
- github.com/go-logr/logr v1.2.2 // indirect
- github.com/go-openapi/jsonpointer v0.19.5 // indirect
- github.com/go-openapi/jsonreference v0.19.5 // indirect
- github.com/go-openapi/swag v0.19.14 // indirect
+ github.com/emicklei/go-restful/v3 v3.10.2 // indirect
+ github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+ github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+ github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
+ github.com/fsnotify/fsnotify v1.6.0 // indirect
+ github.com/go-errors/errors v1.0.1 // indirect
+ github.com/go-logr/logr v1.2.4 // indirect
+ github.com/go-openapi/jsonpointer v0.19.6 // indirect
+ github.com/go-openapi/jsonreference v0.20.2 // indirect
+ github.com/go-openapi/swag v0.22.3 // indirect
+ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
- github.com/golang/protobuf v1.5.2 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
+ github.com/google/gnostic v0.6.9 // indirect
  github.com/google/gofuzz v1.2.0 // indirect
- github.com/google/uuid v1.2.0 // indirect
- github.com/googleapis/gnostic v0.5.5 // indirect
- github.com/huandu/xstrings v1.3.2 // indirect
- github.com/imdario/mergo v0.3.12 // indirect
+ github.com/google/pprof v0.0.0-20230502171905-255e3b9b56de // indirect
+ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+ github.com/google/uuid v1.3.0 // indirect
+ github.com/huandu/xstrings v1.4.0 // indirect
+ github.com/imdario/mergo v0.3.15 // indirect
+ github.com/jellydator/ttlcache/v3 v3.0.1 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/mailru/easyjson v0.7.6 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
- github.com/mitchellh/copystructure v1.1.1 // indirect
- github.com/mitchellh/reflectwalk v1.0.1 // indirect
+ github.com/mailru/easyjson v0.7.7 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+ github.com/mitchellh/copystructure v1.2.0 // indirect
+ github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/prometheus/client_model v0.2.0 // indirect
- github.com/prometheus/common v0.37.0 // indirect
- github.com/prometheus/procfs v0.8.0 // indirect
- github.com/shopspring/decimal v1.2.0 // indirect
+ github.com/prometheus/client_model v0.4.0 // indirect
+ github.com/prometheus/common v0.43.0 // indirect
+ github.com/prometheus/procfs v0.9.0 // indirect
+ github.com/shopspring/decimal v1.3.1 // indirect
  github.com/spf13/cast v1.5.0 // indirect
- github.com/stolostron/kubernetes-dependency-watches v0.0.0-20221007134235-7551d84cf688 // indirect
- go.uber.org/atomic v1.7.0 // indirect
- go.uber.org/multierr v1.6.0 // indirect
- go.uber.org/zap v1.21.0 // indirect
- golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
- golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
- golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
- golang.org/x/sys v0.1.0 // indirect
- golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
- golang.org/x/text v0.3.7 // indirect
- golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+ github.com/stolostron/kubernetes-dependency-watches v0.2.1 // indirect
+ github.com/xlab/treeprint v1.1.0 // indirect
+ go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
+ go.uber.org/atomic v1.11.0 // indirect
+ go.uber.org/multierr v1.11.0 // indirect
+ go.uber.org/zap v1.24.0 // indirect
+ golang.org/x/crypto v0.8.0 // indirect
+ golang.org/x/net v0.9.0 // indirect
+ golang.org/x/oauth2 v0.7.0 // indirect
+ golang.org/x/sync v0.2.0 // indirect
+ golang.org/x/sys v0.8.0 // indirect
+ golang.org/x/term v0.8.0 // indirect
+ golang.org/x/text v0.9.0 // indirect
+ golang.org/x/time v0.3.0 // indirect
+ golang.org/x/tools v0.8.0 // indirect
  gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/protobuf v1.28.1 // indirect
- gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+ google.golang.org/protobuf v1.30.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/component-base v0.23.9 // indirect
- k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
- open-cluster-management.io/api v0.6.1-0.20220208144021-3297cac74dc5 // indirect
- sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
- sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+ k8s.io/cli-runtime v0.26.4 // indirect
+ k8s.io/component-base v0.27.1 // indirect
+ k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
+ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+ sigs.k8s.io/kustomize/api v0.12.1 // indirect
+ sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
 replace (
  golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // CVE-2021-43565
  golang.org/x/text => golang.org/x/text v0.3.8 // CVE-2022-32149
  gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 // CVE-2022-3064
- k8s.io/client-go => k8s.io/client-go v0.23.9
+ k8s.io/api => k8s.io/api v0.26.4 // Replaced so that 'go get -u' works. Remove/bump when upgrading.
+ k8s.io/client-go => k8s.io/client-go v0.26.4
+ k8s.io/kubectl => k8s.io/kubectl v0.26.4 // Set to v0.23.17 (or remove) to run 'go get -u'
 )