Skip to content

Commit b871828

Browse files
alebedev87alebedev87
committed
NE-1802: Bump Golang, k8s.io, OpenShift API, and controller-runtime
- Bump Golang to 1.22: - Update go.mod - Update Dockerfiles - Add `CGO_ENABLED=1` to `go test -race` (golang/go#51235). - Bump k8s.io/* modules to 0.30.3 and OpenShift API to the latest. - Bump Controller runtime bumped to 0.18.5: - Controller's `Watch` function now has a single generic source parameter (kubernetes-sigs/controller-runtime#2783). - Manager's `CertDir` option removed, now using the dedicated webhook server option (kubernetes-sigs/controller-runtime#2422). - Cache's `Namespaces` option replaced by `DefaultNamespaces` (kubernetes-sigs/controller-runtime#2421). - Regenerate CRD and bundle manifests: - ExternalDNS API uses `metav1.LabelSelector` for the label filtering. It was updated with `+listType=atomic` marker which resulted in the addition of `x-kubernetes-list-type: atomic` to CRD. - Bump `kustomize` to v5 to fix a conflict caused by k8s.io bumps: - `kyaml` unable to use the bumped `github.com/google/gnostic-models/openapiv2` package.
1 parent ace229b commit b871828

File tree

14 files changed

+303
-314
lines changed

14 files changed

+303
-314
lines changed

‎.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.19-openshift-4.12
4+
tag: rhel-8-release-golang-1.22-openshift-4.17

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.19 as builder
2+
FROM golang:1.22 as builder
33

44
WORKDIR /opt/app-root/src
55
COPY . .

‎Dockerfile.openshift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17 AS builder
22
WORKDIR /external-dns-operator
33
COPY . .
44
RUN make build-operator
55

6-
FROM registry.ci.openshift.org/ocp/4.12:base
6+
FROM registry.ci.openshift.org/ocp/4.17:base
77
COPY --from=builder /external-dns-operator/bin/external-dns-operator /usr/bin/
88
COPY --from=builder /external-dns-operator/bundle/manifests /manifests
99
COPY --from=builder /external-dns-operator/bundle/metadata /metadata

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ endif
4141

4242
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen
4343
SETUP_ENVTEST := go run sigs.k8s.io/controller-runtime/tools/setup-envtest
44-
KUSTOMIZE := go run sigs.k8s.io/kustomize/kustomize/v4
45-
K8S_ENVTEST_VERSION := 1.21.4
44+
KUSTOMIZE := go run sigs.k8s.io/kustomize/kustomize/v5
45+
K8S_ENVTEST_VERSION := 1.30.0
4646

4747
PACKAGE=github.com/openshift/external-dns-operator
4848

@@ -110,7 +110,7 @@ vet: ## Run go vet against code.
110110
ENVTEST_ASSETS_DIR ?= $(shell pwd)/testbin
111111
test: manifests generate fmt vet ## Run tests.
112112
mkdir -p "$(ENVTEST_ASSETS_DIR)"
113-
KUBEBUILDER_ASSETS="$(shell $(SETUP_ENVTEST) use "$(K8S_ENVTEST_VERSION)" --print path --bin-dir "$(ENVTEST_ASSETS_DIR)")" go test ./... -race -covermode=atomic -coverprofile coverage.out
113+
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
114114

115115
.PHONY: test-e2e
116116
test-e2e:

‎api/v1beta1/webhook_suite_test.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ import (
3636
"sigs.k8s.io/controller-runtime/pkg/envtest"
3737
logf "sigs.k8s.io/controller-runtime/pkg/log"
3838
"sigs.k8s.io/controller-runtime/pkg/log/zap"
39+
metrics "sigs.k8s.io/controller-runtime/pkg/metrics/server"
40+
"sigs.k8s.io/controller-runtime/pkg/webhook"
3941
)
4042

4143
// These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -85,12 +87,16 @@ var _ = BeforeSuite(func() {
8587
// start webhook server using Manager
8688
webhookInstallOptions := &testEnv.WebhookInstallOptions
8789
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
88-
Scheme: scheme,
89-
Host: webhookInstallOptions.LocalServingHost,
90-
Port: webhookInstallOptions.LocalServingPort,
91-
CertDir: webhookInstallOptions.LocalServingCertDir,
92-
LeaderElection: false,
93-
MetricsBindAddress: "0",
90+
Scheme: scheme,
91+
WebhookServer: webhook.NewServer(webhook.Options{
92+
Host: webhookInstallOptions.LocalServingHost,
93+
Port: webhookInstallOptions.LocalServingPort,
94+
CertDir: webhookInstallOptions.LocalServingCertDir,
95+
}),
96+
LeaderElection: false,
97+
Metrics: metrics.Options{
98+
BindAddress: "0",
99+
},
94100
})
95101
Expect(err).NotTo(HaveOccurred())
96102

‎bundle/manifests/externaldns.olm.openshift.io_externaldnses.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,13 @@ spec:
311311
items:
312312
type: string
313313
type: array
314+
x-kubernetes-list-type: atomic
314315
required:
315316
- key
316317
- operator
317318
type: object
318319
type: array
320+
x-kubernetes-list-type: atomic
319321
matchLabels:
320322
additionalProperties:
321323
type: string
@@ -789,11 +791,13 @@ spec:
789791
items:
790792
type: string
791793
type: array
794+
x-kubernetes-list-type: atomic
792795
required:
793796
- key
794797
- operator
795798
type: object
796799
type: array
800+
x-kubernetes-list-type: atomic
797801
matchLabels:
798802
additionalProperties:
799803
type: string

‎config/crd/bases/externaldns.olm.openshift.io_externaldnses.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,13 @@ spec:
313313
items:
314314
type: string
315315
type: array
316+
x-kubernetes-list-type: atomic
316317
required:
317318
- key
318319
- operator
319320
type: object
320321
type: array
322+
x-kubernetes-list-type: atomic
321323
matchLabels:
322324
additionalProperties:
323325
type: string
@@ -791,11 +793,13 @@ spec:
791793
items:
792794
type: string
793795
type: array
796+
x-kubernetes-list-type: atomic
794797
required:
795798
- key
796799
- operator
797800
type: object
798801
type: array
802+
x-kubernetes-list-type: atomic
799803
matchLabels:
800804
additionalProperties:
801805
type: string

‎go.mod

Lines changed: 65 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,125 @@
11
module github.com/openshift/external-dns-operator
22

3-
go 1.19
3+
go 1.22.0
4+
5+
toolchain go1.22.3
46

57
require (
68
github.com/Azure/azure-sdk-for-go v60.1.0+incompatible
79
github.com/Azure/go-autorest/autorest v0.11.27
810
github.com/Azure/go-autorest/autorest/adal v0.9.20
911
github.com/aws/aws-sdk-go v1.41.6
10-
github.com/go-logr/logr v1.2.4
11-
github.com/google/go-cmp v0.5.9
12+
github.com/go-logr/logr v1.4.1
13+
github.com/google/go-cmp v0.6.0
1214
github.com/infobloxopen/infoblox-go-client v1.1.1
1315
github.com/miekg/dns v1.0.14
1416
github.com/onsi/ginkgo v1.16.5
15-
github.com/onsi/gomega v1.27.7
16-
github.com/openshift/api v0.0.0-20230712163317-e19a88e10d9c
17+
github.com/onsi/gomega v1.32.0
18+
github.com/openshift/api v0.0.0-20240812094746-86145edb40cf
1719
github.com/openshift/cloud-credential-operator v0.0.0-20211118210017-9066dcc747fa
1820
github.com/operator-framework/api v0.11.0
19-
google.golang.org/api v0.58.0
20-
k8s.io/api v0.27.7
21-
k8s.io/apimachinery v0.27.7
22-
k8s.io/apiserver v0.27.7
23-
k8s.io/client-go v0.27.7
24-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
25-
sigs.k8s.io/controller-runtime v0.15.3
21+
google.golang.org/api v0.126.0
22+
k8s.io/api v0.30.3
23+
k8s.io/apimachinery v0.30.3
24+
k8s.io/apiserver v0.30.3
25+
k8s.io/client-go v0.30.3
26+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
27+
sigs.k8s.io/controller-runtime v0.18.5
2628
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20220602164547-f46919744bee
2729
sigs.k8s.io/controller-tools v0.6.2
28-
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
30+
sigs.k8s.io/kustomize/kustomize/v5 v5.4.3
2931
)
3032

3133
require (
32-
cloud.google.com/go v0.97.0 // indirect
34+
cloud.google.com/go/compute v1.23.0 // indirect
35+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
3336
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
3437
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
3538
github.com/Azure/go-autorest/autorest/to v0.3.0 // indirect
3639
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3740
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
38-
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
3941
github.com/beorn7/perks v1.0.1 // indirect
4042
github.com/blang/semver/v4 v4.0.0 // indirect
4143
github.com/cespare/xxhash/v2 v2.2.0 // indirect
42-
github.com/davecgh/go-spew v1.1.1 // indirect
43-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
44+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
45+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4446
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
45-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
47+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
4648
github.com/fatih/color v1.12.0 // indirect
47-
github.com/fsnotify/fsnotify v1.6.0 // indirect
48-
github.com/go-errors/errors v1.0.1 // indirect
49-
github.com/go-logr/zapr v1.2.4 // indirect
49+
github.com/fsnotify/fsnotify v1.7.0 // indirect
50+
github.com/go-errors/errors v1.4.2 // indirect
51+
github.com/go-logr/zapr v1.3.0 // indirect
5052
github.com/go-openapi/jsonpointer v0.19.6 // indirect
51-
github.com/go-openapi/jsonreference v0.20.1 // indirect
52-
github.com/go-openapi/swag v0.22.3 // indirect
53+
github.com/go-openapi/jsonreference v0.20.2 // indirect
54+
github.com/go-openapi/swag v0.22.4 // indirect
5355
github.com/gobuffalo/flect v0.2.3 // indirect
5456
github.com/gogo/protobuf v1.3.2 // indirect
55-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
57+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
5658
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
57-
github.com/golang/protobuf v1.5.3 // indirect
58-
github.com/google/gnostic v0.5.7-v3refs // indirect
59-
github.com/google/gofuzz v1.1.0 // indirect
59+
github.com/golang/protobuf v1.5.4 // indirect
60+
github.com/google/gnostic-models v0.6.8 // indirect
61+
github.com/google/gofuzz v1.2.0 // indirect
62+
github.com/google/s2a-go v0.1.4 // indirect
6063
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
61-
github.com/google/uuid v1.3.0 // indirect
62-
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
64+
github.com/google/uuid v1.3.1 // indirect
65+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
66+
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
6367
github.com/imdario/mergo v0.3.12 // indirect
64-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
68+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6569
github.com/jmespath/go-jmespath v0.4.0 // indirect
6670
github.com/josharian/intern v1.0.0 // indirect
6771
github.com/json-iterator/go v1.1.12 // indirect
6872
github.com/mailru/easyjson v0.7.7 // indirect
6973
github.com/mattn/go-colorable v0.1.8 // indirect
7074
github.com/mattn/go-isatty v0.0.12 // indirect
71-
github.com/mattn/go-runewidth v0.0.7 // indirect
7275
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
73-
github.com/mitchellh/mapstructure v1.4.1 // indirect
7476
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7577
github.com/modern-go/reflect2 v1.0.2 // indirect
7678
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
7779
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7880
github.com/nxadm/tail v1.4.8 // indirect
79-
github.com/olekukonko/tablewriter v0.0.4 // indirect
8081
github.com/pkg/errors v0.9.1 // indirect
81-
github.com/prometheus/client_golang v1.15.1 // indirect
82+
github.com/prometheus/client_golang v1.16.0 // indirect
8283
github.com/prometheus/client_model v0.4.0 // indirect
83-
github.com/prometheus/common v0.42.0 // indirect
84-
github.com/prometheus/procfs v0.9.0 // indirect
84+
github.com/prometheus/common v0.44.0 // indirect
85+
github.com/prometheus/procfs v0.12.0 // indirect
86+
github.com/sergi/go-diff v1.2.0 // indirect
8587
github.com/sirupsen/logrus v1.9.0 // indirect
8688
github.com/spf13/afero v1.6.0 // indirect
87-
github.com/spf13/cobra v1.6.0 // indirect
89+
github.com/spf13/cobra v1.8.0 // indirect
8890
github.com/spf13/pflag v1.0.5 // indirect
89-
github.com/xlab/treeprint v1.1.0 // indirect
90-
go.opencensus.io v0.23.0 // indirect
91+
github.com/xlab/treeprint v1.2.0 // indirect
92+
go.opencensus.io v0.24.0 // indirect
9193
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
92-
go.uber.org/atomic v1.7.0 // indirect
93-
go.uber.org/multierr v1.6.0 // indirect
94-
go.uber.org/zap v1.24.0 // indirect
95-
golang.org/x/crypto v0.14.0 // indirect
96-
golang.org/x/mod v0.10.0 // indirect
97-
golang.org/x/net v0.17.0 // indirect
98-
golang.org/x/oauth2 v0.5.0 // indirect
99-
golang.org/x/sys v0.13.0 // indirect
100-
golang.org/x/term v0.13.0 // indirect
101-
golang.org/x/text v0.13.0 // indirect
94+
go.uber.org/multierr v1.11.0 // indirect
95+
go.uber.org/zap v1.26.0 // indirect
96+
golang.org/x/crypto v0.21.0 // indirect
97+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
98+
golang.org/x/mod v0.15.0 // indirect
99+
golang.org/x/net v0.23.0 // indirect
100+
golang.org/x/oauth2 v0.12.0 // indirect
101+
golang.org/x/sys v0.18.0 // indirect
102+
golang.org/x/term v0.18.0 // indirect
103+
golang.org/x/text v0.14.0 // indirect
102104
golang.org/x/time v0.3.0 // indirect
103-
golang.org/x/tools v0.9.1 // indirect
104-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
105+
golang.org/x/tools v0.18.0 // indirect
106+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
105107
google.golang.org/appengine v1.6.7 // indirect
106-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
107-
google.golang.org/grpc v1.51.0 // indirect
108-
google.golang.org/protobuf v1.30.0 // indirect
108+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
109+
google.golang.org/grpc v1.58.3 // indirect
110+
google.golang.org/protobuf v1.33.0 // indirect
111+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
109112
gopkg.in/inf.v0 v0.9.1 // indirect
110113
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
111114
gopkg.in/yaml.v2 v2.4.0 // indirect
112115
gopkg.in/yaml.v3 v3.0.1 // indirect
113-
k8s.io/apiextensions-apiserver v0.27.7 // indirect
114-
k8s.io/component-base v0.27.7 // indirect
115-
k8s.io/klog/v2 v2.90.1 // indirect
116-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
116+
k8s.io/apiextensions-apiserver v0.30.3 // indirect
117+
k8s.io/klog/v2 v2.120.1 // indirect
118+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
117119
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
118-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
119-
sigs.k8s.io/kustomize/cmd/config v0.10.9 // indirect
120-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
121-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
122-
sigs.k8s.io/yaml v1.3.0 // indirect
120+
sigs.k8s.io/kustomize/api v0.17.3 // indirect
121+
sigs.k8s.io/kustomize/cmd/config v0.14.2 // indirect
122+
sigs.k8s.io/kustomize/kyaml v0.17.2 // indirect
123+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
124+
sigs.k8s.io/yaml v1.4.0 // indirect
123125
)

0 commit comments

Comments
 (0)