Skip to content

Commit 9ebcd37

Browse files
vitus133vitus133
committed
Bump operator-sdk to v1.36.1
Signed-off-by: Vitaly Grinberg <[email protected]>
1 parent 3f2dd9c commit 9ebcd37

File tree

8 files changed

+36
-35
lines changed

8 files changed

+36
-35
lines changed

‎Makefile‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION).0 $(BUNDLE_METADATA_OPTS
4040

4141
# Set the Operator SDK version to use. By default, what is installed on the system is used.
4242
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
43-
OPERATOR_SDK_VERSION ?= v1.22.0-ocp
43+
OPERATOR_SDK_VERSION ?= v1.36.1-ocp
4444

4545
# Image URL to use all building/pushing image targets
4646
IMG ?= ghcr.io/k8snetworkplumbingwg/ptp-operator:$(VERSION)
@@ -174,19 +174,16 @@ $(CONTROLLER_GEN): $(LOCALBIN)
174174
GOFLAGS=-mod=mod GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
175175

176176
.PHONY: operator-sdk
177-
ifeq ($(OS), Darwin)
177+
178178
OPERATOR_SDK ?= $(LOCALBIN)/x86_64/operator-sdk
179-
else
180-
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
181-
endif
182179
OPERATOR_SDK_VERSION_INSTALLED = $(shell $(OPERATOR_SDK) version 2>/dev/null | sed 's/^operator-sdk version: "\([^"]*\).*/\1/')
183180
operator-sdk: ## Download operator-sdk locally if necessary.
184181
ifneq ($(OPERATOR_SDK_VERSION),$(OPERATOR_SDK_VERSION_INSTALLED))
185182
ifeq ($(OS), Darwin)
186183
mkdir -p $(LOCALBIN)/x86_64/
187-
curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/operator-sdk/4.11.0/operator-sdk-darwin-x86_64.tar.gz? | tar -xz -C bin/x86_64/
184+
curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/operator-sdk/4.17.0/operator-sdk-v1.36.1-ocp-darwin-x86_64.tar.gz? | tar -xz -C bin/
188185
else
189-
curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/operator-sdk/4.11.0/operator-sdk-linux-x86_64.tar.gz? | tar -xz -C bin/
186+
curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/operator-sdk/4.17.0/operator-sdk-v1.36.1-ocp-linux-x86_64.tar.gz? | tar -xz -C bin/
190187
endif
191188
endif
192189

‎bundle.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=ptp-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
9-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.0-ocp
9+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.36.1-ocp
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1111
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
1212

‎bundle/manifests/ptp-operator.clusterserviceversion.yaml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ metadata:
6161
categories: Networking
6262
certified: "false"
6363
containerImage: quay.io/openshift/origin-ptp-operator:4.21
64-
createdAt: "2025-09-10"
64+
createdAt: "2025-09-25T09:20:14Z"
6565
description: This software enables configuration of Precision Time Protocol(PTP)
6666
on Kubernetes. It detects hardware capable PTP devices on each node, and configures
6767
linuxptp processes such as ptp4l, phc2sys and timemaster.
@@ -78,7 +78,7 @@ metadata:
7878
olm.skipRange: ">=4.3.0-0 <4.21.0"
7979
operatorframework.io/suggested-namespace: openshift-ptp
8080
operators.openshift.io/infrastructure-features: '["disconnected"]'
81-
operators.operatorframework.io/builder: operator-sdk-v1.22.0-ocp
81+
operators.operatorframework.io/builder: operator-sdk-v1.36.1-ocp
8282
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
8383
provider: Red Hat
8484
repository: https://github.com/k8snetworkplumbingwg/ptp-operator
@@ -104,10 +104,10 @@ spec:
104104
kind: PtpOperatorConfig
105105
name: ptpoperatorconfigs.ptp.openshift.io
106106
specDescriptors:
107-
- description: 'ApiVersion is used to determine which API is used for the event
108-
service 1.0: default version. event service is mapped to internal REST-API.
109-
2.x: event service is mapped to O-RAN v3.0 Compliant O-Cloud Notification
110-
REST-API.'
107+
- description: |-
108+
ApiVersion is used to determine which API is used for the event service
109+
1.0: default version. event service is mapped to internal REST-API.
110+
2.x: event service is mapped to O-RAN v3.0 Compliant O-Cloud Notification REST-API.
111111
displayName: ApiVersion
112112
path: ptpEventConfig.apiVersion
113113
x-descriptors:
@@ -117,8 +117,9 @@ spec:
117117
path: ptpEventConfig.storageType
118118
x-descriptors:
119119
- urn:alm:descriptor:com.tectonic.ui:text
120-
- description: 'TransportHost format is <protocol>://<transport-service>.<namespace>.svc.cluster.local:<transport-port>
121-
Example HTTP transport: "http://ptp-event-publisher-service-NODE_NAME.openshift-ptp.svc.cluster.local:9043"'
120+
- description: |-
121+
TransportHost format is <protocol>://<transport-service>.<namespace>.svc.cluster.local:<transport-port>
122+
Example HTTP transport: "http://ptp-event-publisher-service-NODE_NAME.openshift-ptp.svc.cluster.local:9043"
122123
displayName: Transport Host
123124
path: ptpEventConfig.transportHost
124125
x-descriptors:

‎bundle/metadata/annotations.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ annotations:
55
operators.operatorframework.io.bundle.metadata.v1: metadata/
66
operators.operatorframework.io.bundle.package.v1: ptp-operator
77
operators.operatorframework.io.bundle.channels.v1: alpha
8-
operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.0-ocp
8+
operators.operatorframework.io.metrics.builder: operator-sdk-v1.36.1-ocp
99
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
1010
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
1111

‎bundleci.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
66
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
77
LABEL operators.operatorframework.io.bundle.package.v1=ptp-operator
88
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
9-
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.13.0+git
9+
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.36.1+git
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1111
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
1212

‎config/manifests/bases/ptp-operator.clusterserviceversion.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ spec:
9797
kind: PtpOperatorConfig
9898
name: ptpoperatorconfigs.ptp.openshift.io
9999
specDescriptors:
100-
- description: 'ApiVersion is used to determine which API is used for the event
101-
service 1.0: default version. event service is mapped to internal REST-API.
102-
2.x: event service is mapped to O-RAN v3.0 Compliant O-Cloud Notification
103-
REST-API.'
100+
- description: |-
101+
ApiVersion is used to determine which API is used for the event service
102+
1.0: default version. event service is mapped to internal REST-API.
103+
2.x: event service is mapped to O-RAN v3.0 Compliant O-Cloud Notification REST-API.
104104
displayName: ApiVersion
105105
path: ptpEventConfig.apiVersion
106106
x-descriptors:
@@ -110,8 +110,9 @@ spec:
110110
path: ptpEventConfig.storageType
111111
x-descriptors:
112112
- urn:alm:descriptor:com.tectonic.ui:text
113-
- description: 'TransportHost format is <protocol>://<transport-service>.<namespace>.svc.cluster.local:<transport-port>
114-
Example HTTP transport: "http://ptp-event-publisher-service-NODE_NAME.openshift-ptp.svc.cluster.local:9043"'
113+
- description: |-
114+
TransportHost format is <protocol>://<transport-service>.<namespace>.svc.cluster.local:<transport-port>
115+
Example HTTP transport: "http://ptp-event-publisher-service-NODE_NAME.openshift-ptp.svc.cluster.local:9043"
115116
displayName: Transport Host
116117
path: ptpEventConfig.transportHost
117118
x-descriptors:

‎hack/check-git-tree.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
#!/bin/bash
22

33
RC=0
4-
if [ -n "$(git status --porcelain)" ]; then
4+
# exclude createdAt from the diff
5+
if [ $(git diff -I createdAt |wc -l ) -gt 0 ]; then
56
echo "Unstaged or untracked changes exist:"
6-
git status --porcelain
7-
git diff
7+
git status
8+
git diff -I createdAt
89
RC=1
910
else
1011
echo "git tree is clean"

‎manifests/stable/ptp-operator.clusterserviceversion.yaml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ metadata:
6161
categories: Networking
6262
certified: "false"
6363
containerImage: quay.io/openshift/origin-ptp-operator:4.21
64-
createdAt: "2025-09-10"
64+
createdAt: "2025-09-25T09:20:14Z"
6565
description: This software enables configuration of Precision Time Protocol(PTP)
6666
on Kubernetes. It detects hardware capable PTP devices on each node, and configures
6767
linuxptp processes such as ptp4l, phc2sys and timemaster.
@@ -78,7 +78,7 @@ metadata:
7878
olm.skipRange: ">=4.3.0-0 <4.21.0"
7979
operatorframework.io/suggested-namespace: openshift-ptp
8080
operators.openshift.io/infrastructure-features: '["disconnected"]'
81-
operators.operatorframework.io/builder: operator-sdk-v1.22.0-ocp
81+
operators.operatorframework.io/builder: operator-sdk-v1.36.1-ocp
8282
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
8383
provider: Red Hat
8484
repository: https://github.com/k8snetworkplumbingwg/ptp-operator
@@ -104,10 +104,10 @@ spec:
104104
kind: PtpOperatorConfig
105105
name: ptpoperatorconfigs.ptp.openshift.io
106106
specDescriptors:
107-
- description: 'ApiVersion is used to determine which API is used for the event
108-
service 1.0: default version. event service is mapped to internal REST-API.
109-
2.x: event service is mapped to O-RAN v3.0 Compliant O-Cloud Notification
110-
REST-API.'
107+
- description: |-
108+
ApiVersion is used to determine which API is used for the event service
109+
1.0: default version. event service is mapped to internal REST-API.
110+
2.x: event service is mapped to O-RAN v3.0 Compliant O-Cloud Notification REST-API.
111111
displayName: ApiVersion
112112
path: ptpEventConfig.apiVersion
113113
x-descriptors:
@@ -117,8 +117,9 @@ spec:
117117
path: ptpEventConfig.storageType
118118
x-descriptors:
119119
- urn:alm:descriptor:com.tectonic.ui:text
120-
- description: 'TransportHost format is <protocol>://<transport-service>.<namespace>.svc.cluster.local:<transport-port>
121-
Example HTTP transport: "http://ptp-event-publisher-service-NODE_NAME.openshift-ptp.svc.cluster.local:9043"'
120+
- description: |-
121+
TransportHost format is <protocol>://<transport-service>.<namespace>.svc.cluster.local:<transport-port>
122+
Example HTTP transport: "http://ptp-event-publisher-service-NODE_NAME.openshift-ptp.svc.cluster.local:9043"
122123
displayName: Transport Host
123124
path: ptpEventConfig.transportHost
124125
x-descriptors:

0 commit comments

Comments
 (0)