Skip to content

Commit c3c890e

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #402 from stuggi/operator_sdk_1.41.1
Upgrade to Operator SDK 1.41.1
2 parents 547f59f + 1dd5460 commit c3c890e

176 files changed

Lines changed: 1942 additions & 959 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.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: tools
33
namespace: openstack-k8s-operators
4-
tag: ci-build-root-golang-1.24-sdk-1.31
4+
tag: ci-build-root-golang-1.24-sdk-1.41.1

‎.github/workflows/build-designate-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
operator_name: designate
1818
go_version: 1.24.x
19-
operator_sdk_version: 1.31.0
19+
operator_sdk_version: 1.41.1
2020
secrets:
2121
IMAGENAMESPACE: ${{ secrets.IMAGENAMESPACE }}
2222
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}

‎.github/workflows/force-bump-pr-manual.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
with:
1010
operator_name: designate
1111
branch_name: ${{ github.ref_name }}
12-
custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.31
12+
custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.41.1
1313
secrets:
1414
FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}

‎.github/workflows/force-bump-pr-scheduled.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/force-bump-branches.yaml@main
1111
with:
1212
operator_name: designate
13-
custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.31
13+
custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.41.1
1414
secrets:
1515
FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}

.github/workflows/release-neutron-operator.yaml renamed to .github/workflows/release-designate-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Release Neutron Operator
1+
name: Release Designate Operator
22

33
on:
44
release:

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ repos:
7474
rev: e30d72fcbced0ab8a7b6d23be1dee129e2a7b849
7575
hooks:
7676
- id: kuttl-single-test-assert
77-
args: ["tests/kuttl"]
77+
args: ["test/kuttl"]

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN mkdir -p ${DEST_ROOT}/usr/local/bin/
2424
RUN if [ ! -f $CACHITO_ENV_FILE ]; then go mod download ; fi
2525

2626
# Build manager
27-
RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; env ${GO_BUILD_EXTRA_ENV_ARGS} go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/manager main.go
27+
RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; env ${GO_BUILD_EXTRA_ENV_ARGS} go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/manager cmd/main.go
2828

2929
RUN cp -r templates ${DEST_ROOT}/templates
3030

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,13 @@ golangci-lint:
124124

125125
.PHONY: test
126126
test: manifests generate fmt vet envtest ginkgo ## Run tests.
127-
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) -v debug --bin-dir $(LOCALBIN) use $(ENVTEST_K8S_VERSION) -p path)" OPERATOR_TEMPLATES="$(shell pwd)/templates" $(GINKGO) -v --trace --cover --coverpkg=../../pkg/,../../controllers,../../api/v1beta1 --coverprofile cover.out --covermode=atomic --randomize-all ${PROC_CMD} $(GINKGO_ARGS) ./tests/...
127+
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) -v debug --bin-dir $(LOCALBIN) use $(ENVTEST_K8S_VERSION) -p path)" OPERATOR_TEMPLATES="$(shell pwd)/templates" $(GINKGO) -v --trace --cover --coverpkg=../../internal/...,../../api/v1beta1/... --coverprofile cover.out --covermode=atomic --randomize-all ${PROC_CMD} $(GINKGO_ARGS) ./test/...
128128

129129
##@ Build
130130

131131
.PHONY: build
132132
build: generate fmt vet ## Build manager binary.
133-
go build -o bin/manager main.go
133+
go build -o bin/manager cmd/main.go
134134

135135
.PHONY: run
136136
run: export METRICS_PORT?=8080
@@ -140,7 +140,7 @@ run: export ENABLE_WEBHOOKS?=false
140140
run: export OPERATOR_TEMPLATES=./templates/
141141
run: manifests generate fmt vet ## Run a controller from your host.
142142
/bin/bash hack/clean_local_webhook.sh
143-
go run ./main.go -metrics-bind-address ":$(METRICS_PORT)" -health-probe-bind-address ":$(HEALTH_PORT)" -pprof-bind-address ":$(PPROF_PORT)"
143+
go run ./cmd/main.go -metrics-bind-address ":$(METRICS_PORT)" -health-probe-bind-address ":$(HEALTH_PORT)" -pprof-bind-address ":$(PPROF_PORT)"
144144

145145
.PHONY: docker-build
146146
docker-build: test ## Build docker image with the manager.
@@ -188,9 +188,9 @@ OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
188188
GINKGO ?= $(LOCALBIN)/ginkgo
189189

190190
## Tool Versions
191-
KUSTOMIZE_VERSION ?= v3.8.7
191+
KUSTOMIZE_VERSION ?= v5.6.0
192192
CONTROLLER_TOOLS_VERSION ?= v0.18.0
193-
OPERATOR_SDK_VERSION ?= v1.31.0
193+
OPERATOR_SDK_VERSION ?= v1.41.1
194194
GOTOOLCHAIN_VERSION ?= go1.24.0
195195

196196
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

‎PROJECT‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
# Code generated by tool. DO NOT EDIT.
2+
# This file is used to track the info used to scaffold your project
3+
# and allow the plugins properly work.
4+
# More info: https://book.kubebuilder.io/reference/project-config.html
15
domain: openstack.org
26
layout:
3-
- go.kubebuilder.io/v3
7+
- go.kubebuilder.io/v4
48
plugins:
59
manifests.sdk.operatorframework.io/v2: {}
610
scorecard.sdk.operatorframework.io/v2: {}
@@ -65,4 +69,22 @@ resources:
6569
kind: DesignateWorker
6670
path: github.com/openstack-k8s-operators/designate-operator/api/v1beta1
6771
version: v1beta1
72+
- api:
73+
crdVersion: v1
74+
namespaced: true
75+
controller: true
76+
domain: openstack.org
77+
group: designate
78+
kind: DesignateBackendbind9
79+
path: github.com/openstack-k8s-operators/designate-operator/api/v1beta1
80+
version: v1beta1
81+
- api:
82+
crdVersion: v1
83+
namespaced: true
84+
controller: true
85+
domain: openstack.org
86+
group: designate
87+
kind: DesignateUnbound
88+
path: github.com/openstack-k8s-operators/designate-operator/api/v1beta1
89+
version: v1beta1
6890
version: "3"

‎api/go.mod‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,17 @@ module github.com/openstack-k8s-operators/designate-operator/api
33
go 1.24.4
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.27.2
76
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20251103072528-9eb684fef4ef
87
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20251103072528-9eb684fef4ef
98
k8s.io/api v0.31.13
109
k8s.io/apimachinery v0.31.13
11-
k8s.io/client-go v0.31.13
10+
k8s.io/client-go v0.31.13 // indirect
1211
sigs.k8s.io/controller-runtime v0.19.7
1312
)
1413

15-
require (
16-
github.com/onsi/gomega v1.38.2
17-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251101153632-7b8179a60945
18-
)
14+
require github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20251110170511-c2d4a351a7c3
1915

2016
require (
21-
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2217
github.com/beorn7/perks v1.0.1 // indirect
2318
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2419
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -28,18 +23,15 @@ require (
2823
github.com/fsnotify/fsnotify v1.9.0 // indirect
2924
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3025
github.com/go-logr/logr v1.4.3 // indirect
31-
github.com/go-logr/zapr v1.3.0 // indirect
3226
github.com/go-openapi/jsonpointer v0.21.1 // indirect
3327
github.com/go-openapi/jsonreference v0.21.0 // indirect
3428
github.com/go-openapi/swag v0.23.1 // indirect
35-
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3629
github.com/gogo/protobuf v1.3.2 // indirect
3730
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3831
github.com/golang/protobuf v1.5.4 // indirect
3932
github.com/google/gnostic-models v0.7.0 // indirect
4033
github.com/google/go-cmp v0.7.0 // indirect
4134
github.com/google/gofuzz v1.2.0 // indirect
42-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4335
github.com/google/uuid v1.6.0 // indirect
4436
github.com/imdario/mergo v0.3.16 // indirect
4537
github.com/josharian/intern v1.0.0 // indirect
@@ -53,22 +45,18 @@ require (
5345
github.com/prometheus/client_model v0.6.2 // indirect
5446
github.com/prometheus/common v0.65.0 // indirect
5547
github.com/prometheus/procfs v0.16.1 // indirect
48+
github.com/rogpeppe/go-internal v1.13.1 // indirect
5649
github.com/spf13/pflag v1.0.7 // indirect
5750
github.com/x448/float16 v0.8.4 // indirect
58-
go.uber.org/multierr v1.11.0 // indirect
59-
go.uber.org/zap v1.27.0 // indirect
6051
go.yaml.in/yaml/v2 v2.4.2 // indirect
6152
go.yaml.in/yaml/v3 v3.0.4 // indirect
6253
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
63-
golang.org/x/mod v0.27.0 // indirect
6454
golang.org/x/net v0.43.0 // indirect
6555
golang.org/x/oauth2 v0.30.0 // indirect
66-
golang.org/x/sync v0.17.0 // indirect
6756
golang.org/x/sys v0.36.0 // indirect
6857
golang.org/x/term v0.35.0 // indirect
6958
golang.org/x/text v0.29.0 // indirect
7059
golang.org/x/time v0.12.0 // indirect
71-
golang.org/x/tools v0.36.0 // indirect
7260
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
7361
google.golang.org/protobuf v1.36.7 // indirect
7462
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)