Skip to content

Commit fee5a93

Browse files
authored
Update k8s APIs to v1.30 and Operator-SDK to v1.38.0 (#769)
* Update k8s APIs to v1.30 and Operator-sdk to v1.38.0 * Name change * Update RCO and OLO * Update go.sum
1 parent d598115 commit fee5a93

27 files changed

+3318
-505
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
66
VERSION ?= 1.4.3
7-
OPERATOR_SDK_RELEASE_VERSION ?= v1.37.0
7+
OPERATOR_SDK_RELEASE_VERSION ?= v1.38.0
88
LIBERTY_VERSION ?= 25.0.0.1
99

1010
# CHANNELS define the bundle channels used in the bundle.
@@ -155,14 +155,14 @@ kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
155155
$(KUSTOMIZE): $(LOCALBIN)
156156
test -s $(LOCALBIN)/kustomize || GOBIN=$(LOCALBIN) GO111MODULE=on go install sigs.k8s.io/kustomize/kustomize/v5@v$(KUSTOMIZE_VERSION)
157157

158-
CONTROLLER_TOOLS_VERSION ?= 0.14.0
158+
CONTROLLER_TOOLS_VERSION ?= 0.15.0
159159
.PHONY: controller-gen
160160
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
161161
$(CONTROLLER_GEN): $(LOCALBIN)
162162
test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v$(CONTROLLER_TOOLS_VERSION)
163163

164164
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
165-
ENVTEST_K8S_VERSION = 1.29
165+
ENVTEST_K8S_VERSION = 1.30.0
166166
.PHONY: envtest
167167
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
168168
$(ENVTEST): $(LOCALBIN)

bundle.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=ibm-websphere-liberty
88
LABEL operators.operatorframework.io.bundle.channels.v1=v1.4
99
LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.4
10-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.37.0
10+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.38.0
1111
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1212
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4
1313

bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ metadata:
6161
capabilities: Auto Pilot
6262
categories: Application Runtime
6363
containerImage: icr.io/cpopen/websphere-liberty-operator:daily
64-
createdAt: "2025-04-24T02:52:09Z"
64+
createdAt: "2025-06-17T18:31:12Z"
6565
description: Deploy and manage containerized Liberty applications
6666
features.operators.openshift.io/disconnected: "true"
6767
olm.skipRange: '>=1.0.0 <1.4.3'
6868
operators.openshift.io/infrastructure-features: '["disconnected"]'
69-
operators.operatorframework.io/builder: operator-sdk-v1.37.0
69+
operators.operatorframework.io/builder: operator-sdk-v1.38.0
7070
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
7171
repository: https://github.com/WASdev/websphere-liberty-operator
7272
support: IBM

bundle/manifests/liberty.websphere.ibm.com_webspherelibertyapplications.yaml

Lines changed: 781 additions & 71 deletions
Large diffs are not rendered by default.

bundle/manifests/liberty.websphere.ibm.com_webspherelibertydumps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/instance: websphere-liberty-operator

bundle/manifests/liberty.websphere.ibm.com_webspherelibertytraces.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/instance: websphere-liberty-operator

bundle/metadata/annotations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ annotations:
66
operators.operatorframework.io.bundle.package.v1: ibm-websphere-liberty
77
operators.operatorframework.io.bundle.channels.v1: v1.4
88
operators.operatorframework.io.bundle.channel.default.v1: v1.4
9-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.37.0
9+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.38.0
1010
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1111
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4
1212

cmd/main.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ func main() {
7272
var enableLeaderElection bool
7373
var probeAddr string
7474

75-
flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
75+
flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metrics endpoint binds to. "+
76+
"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
7677
flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
7778
flag.BoolVar(&enableLeaderElection, "enable-leader-election", false,
7879
"Enable leader election for controller manager. "+
@@ -98,11 +99,13 @@ func main() {
9899
"the manager will watch and manage resources in all Namespaces")
99100
}
100101

102+
metricsServerOptions := metricsserver.Options{
103+
BindAddress: metricsAddr,
104+
}
105+
101106
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
102-
Scheme: scheme,
103-
Metrics: metricsserver.Options{
104-
BindAddress: metricsAddr,
105-
},
107+
Scheme: scheme,
108+
Metrics: metricsServerOptions,
106109
WebhookServer: &webhook.DefaultServer{
107110
Options: webhook.Options{
108111
Port: 9443,

0 commit comments

Comments
 (0)