Skip to content

upgrade operator-sdk and kubebuilder for openshift 4.17 #1160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 20, 2025
Merged

upgrade operator-sdk and kubebuilder for openshift 4.17 #1160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c21dfc4
upgrade operator-sdk and kubebuilder
rsoaresd Mar 18, 2025
91427fb
remove comment-spacings
rsoaresd Mar 18, 2025
9367878
Merge branch 'master' into operator-sdk-and-kubebuulder-upgrade
rsoaresd Mar 19, 2025
eaae3d8
Merge branch 'master' into operator-sdk-and-kubebuulder-upgrade
rsoaresd Mar 20, 2025
670dcb0
Merge branch 'master' into operator-sdk-and-kubebuulder-upgrade
rsoaresd Mar 20, 2025
f6fe535
revert replacement
rsoaresd Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ linters-settings:
rules:
- name: dot-imports
disabled: true # we allow for dot-imports
- name: comment-spacings


2 changes: 1 addition & 1 deletion PROJECT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
layout:
- go.kubebuilder.io/v3
- go.kubebuilder.io/v4
plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
Expand Down
0 main.go → cmd/main.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions make/get-tool.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# see go.mod
CONTROLLER_GEN_VERSION=v0.14.0
KUSTOMIZE_VERSION=v5.0.1
CONTROLLER_GEN_VERSION=v0.15.0
KUSTOMIZE_VERSION=v5.4.2
GO_BINDATA_VERSION=v3.1.2

CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
Expand Down
2 changes: 1 addition & 1 deletion make/go.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $(OUT_DIR)/operator:
go build ${V_FLAG} \
-ldflags "-X ${GO_PACKAGE_PATH}/version.Commit=${GIT_COMMIT_ID} -X ${GO_PACKAGE_PATH}/version.BuildTime=${BUILD_TIME}" \
-o $(OUT_DIR)/bin/host-operator \
main.go
./cmd/main.go

.PHONY: vendor
vendor:
Expand Down
2 changes: 1 addition & 1 deletion make/run-cicd-script.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OWNER_AND_BRANCH_LOCATION=codeready-toolchain/toolchain-cicd/master
OWNER_AND_BRANCH_LOCATION=rsoaresd/toolchain-cicd/openshift_4_17_cicd
GH_SCRIPTS_URL=https://raw.githubusercontent.com/${OWNER_AND_BRANCH_LOCATION}
Copy link
Contributor Author

@rsoaresd rsoaresd Mar 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

temporary until codeready-toolchain/toolchain-cicd#136 is merged / ensure that nothing breaks


.PHONY: run-cicd-script
Expand Down
Loading