Merge pull request #225 from alebedev87/bump-n-rebase

NE-1802: Bump Golang, k8s.io, OpenShift API, and controller-runtime
openshift · Sep 17, 2024 · 63fb086 · 63fb086
2 parents b2a62fe + f1b2155
commit 63fb086
Show file tree

Hide file tree

Showing 2,361 changed files with 197,769 additions and 128,880 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.19-openshift-4.12
+  tag: rhel-8-release-golang-1.22-openshift-4.17
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -7,7 +7,7 @@ run:
   concurrency: 4
 
   # timeout for analysis, e.g. 30s, 5m, default is 1m
-  timeout: 1m
+  timeout: 10m
 
   # exit code when at least one issue was found, default is 1
   issues-exit-code: 1
@@ -24,8 +24,9 @@ run:
   # from this option's value (see skip-dirs-use-default).
   # "/" will be replaced by current OS file path separator to properly work
   # on Windows.
-  skip-dirs:
-    - vendor
+  issues:
+    exclude-dirs:
+      - vendor
 
   # default is true. Enables skipping of directories:
   #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
@@ -50,7 +51,8 @@ run:
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate|junit-xml|github-actions
   # default is "colored-line-number"
-  format: tab
+  formats:
+    - format: tab
 
   # print lines of code with issue, default is true
   print-issued-lines: true

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /opt/app-root/src
 COPY . .

diff --git a/Dockerfile.openshift b/Dockerfile.openshift
diff --git a/Makefile b/Makefile
@@ -41,8 +41,8 @@ endif
 
 CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen
 SETUP_ENVTEST := go run sigs.k8s.io/controller-runtime/tools/setup-envtest
-KUSTOMIZE := go run sigs.k8s.io/kustomize/kustomize/v4
-K8S_ENVTEST_VERSION := 1.21.4
+KUSTOMIZE := go run sigs.k8s.io/kustomize/kustomize/v5
+K8S_ENVTEST_VERSION := 1.30.0
 
 PACKAGE=github.com/openshift/external-dns-operator
 
@@ -112,7 +112,7 @@ vet: ## Run go vet against code.
 ENVTEST_ASSETS_DIR ?= $(shell pwd)/testbin
 test: manifests generate fmt vet ## Run tests.
 	mkdir -p "$(ENVTEST_ASSETS_DIR)"
-	KUBEBUILDER_ASSETS="$(shell $(SETUP_ENVTEST) use "$(K8S_ENVTEST_VERSION)" --print path --bin-dir "$(ENVTEST_ASSETS_DIR)")" go test ./... -race -covermode=atomic -coverprofile coverage.out
+	KUBEBUILDER_ASSETS="$(shell $(SETUP_ENVTEST) use "$(K8S_ENVTEST_VERSION)" --print path --bin-dir "$(ENVTEST_ASSETS_DIR)")" CGO_ENABLED=1 go test ./... -race -covermode=atomic -coverprofile coverage.out
 
 .PHONY: test-e2e
 test-e2e:
@@ -218,7 +218,7 @@ endef
 .PHONY: lint
 ## Checks the code with golangci-lint
 lint: $(GOLANGCI_LINT_BIN)
-	$(GOLANGCI_LINT_BIN) run -c .golangci.yaml --deadline=30m
+	$(GOLANGCI_LINT_BIN) run -c .golangci.yaml
 
 $(GOLANGCI_LINT_BIN):
 	mkdir -p $(BIN_DIR)

diff --git a/api/v1beta1/webhook_suite_test.go b/api/v1beta1/webhook_suite_test.go
@@ -36,6 +36,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metrics "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -85,12 +87,16 @@ var _ = BeforeSuite(func() {
 	// start webhook server using Manager
 	webhookInstallOptions := &testEnv.WebhookInstallOptions
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		Scheme:             scheme,
-		Host:               webhookInstallOptions.LocalServingHost,
-		Port:               webhookInstallOptions.LocalServingPort,
-		CertDir:            webhookInstallOptions.LocalServingCertDir,
-		LeaderElection:     false,
-		MetricsBindAddress: "0",
+		Scheme: scheme,
+		WebhookServer: webhook.NewServer(webhook.Options{
+			Host:    webhookInstallOptions.LocalServingHost,
+			Port:    webhookInstallOptions.LocalServingPort,
+			CertDir: webhookInstallOptions.LocalServingCertDir,
+		}),
+		LeaderElection: false,
+		Metrics: metrics.Options{
+			BindAddress: "0",
+		},
 	})
 	Expect(err).NotTo(HaveOccurred())
 

diff --git a/api/v1beta1/webhook_test.go b/api/v1beta1/webhook_test.go
@@ -6,7 +6,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func makeExternalDNS(name string, domains []ExternalDNSDomain) *ExternalDNS {
@@ -139,7 +139,7 @@ var _ = Describe("ExternalDNS admission webhook", func() {
 				{
 					ExternalDNSDomainUnion: ExternalDNSDomainUnion{
 						MatchType: DomainMatchTypeRegex,
-						Pattern:   pointer.String(`(.*\.test.com`),
+						Pattern:   ptr.To[string](`(.*\.test.com`),
 					},
 					FilterType: FilterTypeInclude,
 				},
@@ -166,14 +166,14 @@ var _ = Describe("ExternalDNS admission webhook", func() {
 				{
 					ExternalDNSDomainUnion: ExternalDNSDomainUnion{
 						MatchType: DomainMatchTypeExact,
-						Name:      pointer.String("abc.test.com"),
+						Name:      ptr.To[string]("abc.test.com"),
 					},
 					FilterType: FilterTypeInclude,
 				},
 				{
 					ExternalDNSDomainUnion: ExternalDNSDomainUnion{
 						MatchType: DomainMatchTypeExact,
-						Name:      pointer.String(`(.*)\.test\.com`),
+						Name:      ptr.To[string](`(.*)\.test\.com`),
 					},
 					FilterType: FilterTypeInclude,
 				},

diff --git a/bundle/manifests/external-dns-operator.clusterserviceversion.yaml b/bundle/manifests/external-dns-operator.clusterserviceversion.yaml
@@ -449,7 +449,7 @@ spec:
                     fieldRef:
                       fieldPath: metadata.namespace
                 - name: RELATED_IMAGE_EXTERNAL_DNS
-                  value: quay.io/external-dns-operator/external-dns@sha256:51e2acc81c804468932581379d674273fd2e62798be4e81c5c735bf0161590dd
+                  value: quay.io/external-dns-operator/external-dns@sha256:42c9f6d6b01d5e45b7d5064d2d6dea1f7b51346198d80e7f7f9821bd7fd072cf
                 - name: TRUSTED_CA_CONFIGMAP_NAME
                 image: quay.io/openshift/origin-external-dns-operator:latest
                 name: external-dns-operator

diff --git a/bundle/manifests/externaldns.olm.openshift.io_externaldnses.yaml b/bundle/manifests/externaldns.olm.openshift.io_externaldnses.yaml
@@ -311,11 +311,13 @@ spec:
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                           required:
                           - key
                           - operator
                           type: object
                         type: array
+                        x-kubernetes-list-type: atomic
                       matchLabels:
                         additionalProperties:
                           type: string
@@ -789,11 +791,13 @@ spec:
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                           required:
                           - key
                           - operator
                           type: object
                         type: array
+                        x-kubernetes-list-type: atomic
                       matchLabels:
                         additionalProperties:
                           type: string

diff --git a/config/crd/bases/externaldns.olm.openshift.io_externaldnses.yaml b/config/crd/bases/externaldns.olm.openshift.io_externaldnses.yaml
@@ -313,11 +313,13 @@ spec:
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                           required:
                           - key
                           - operator
                           type: object
                         type: array
+                        x-kubernetes-list-type: atomic
                       matchLabels:
                         additionalProperties:
                           type: string
@@ -791,11 +793,13 @@ spec:
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                           required:
                           - key
                           - operator
                           type: object
                         type: array
+                        x-kubernetes-list-type: atomic
                       matchLabels:
                         additionalProperties:
                           type: string

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -46,9 +46,9 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
         - name: RELATED_IMAGE_EXTERNAL_DNS
-          # openshift/external-dns commit: 441588e482514db7722f5c793cf70348b68d952d
-          # manifest link: https://quay.io/repository/external-dns-operator/external-dns/manifest/sha256:51e2acc81c804468932581379d674273fd2e62798be4e81c5c735bf0161590dd
-          value: quay.io/external-dns-operator/external-dns@sha256:51e2acc81c804468932581379d674273fd2e62798be4e81c5c735bf0161590dd
+          # openshift/external-dns commit: 8da2509b922d50ef7b1b8ea2297758888f32448d
+          # manifest link: https://quay.io/repository/external-dns-operator/external-dns/manifest/sha256:42c9f6d6b01d5e45b7d5064d2d6dea1f7b51346198d80e7f7f9821bd7fd072cf
+          value: quay.io/external-dns-operator/external-dns@sha256:42c9f6d6b01d5e45b7d5064d2d6dea1f7b51346198d80e7f7f9821bd7fd072cf
         - name: TRUSTED_CA_CONFIGMAP_NAME
         securityContext:
           capabilities: