Skip to content

upgrade sdk and kubebuilder for openshift 4.17 #645

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 5 commits into from
Mar 20, 2025
Merged

upgrade sdk and kubebuilder for openshift 4.17 #645

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e4b86a
upgrade sdk and kubebuilder
rsoaresd Mar 18, 2025
82dba1e
remove comment-spacings
rsoaresd Mar 18, 2025
ae4c0bf
Merge branch 'master' into operator-sdk-and-kubebuulder-upgrade
rsoaresd Mar 19, 2025
9082c9e
revert replacement
rsoaresd Mar 20, 2025
db2ada7
empty commit - just for trigger gh actions
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
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ 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.
1 change: 1 addition & 0 deletions config/samples/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## Append samples you want in your CSV to this file as resources ##
resources:
- toolchain.dev.openshift.com_v1alpha1_useraccount.yaml
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.

"dummy" file because without it was failing with:

Error: accumulating resources: accumulation err='accumulating resources from '../samples': '/Users/rsoaresd/member-operator/config/samples' must resolve to a file': couldn't make target for path '/Users/rsoaresd/member-operator/config/samples': kustomization.yaml is empty

Copy link
Contributor

@alexeykazakov alexeykazakov 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.

this /samples/ thing doesn't really applied anyway, right? IT's more for documentation purposes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, they serve as "examples of Custom Resources that can be applied to the cluster"

#TODO
#+kubebuilder:scaffold:manifestskustomizesamples
6 changes: 6 additions & 0 deletions config/samples/toolchain.dev.openshift.com_v1alpha1_useraccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: toolchain.dev.openshift.com/v1alpha1
kind: UserAccount
metadata:
name: useraccount-sample
# spec:
# TODO
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 @@ -16,7 +16,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/member-operator \
main.go
./cmd/main.go
$(Q)CGO_ENABLED=0 GOARCH=${goarch} GOOS=linux \
go build ${V_FLAG} \
-ldflags "-X ${GO_PACKAGE_PATH}/version.Commit=${GIT_COMMIT_ID} -X ${GO_PACKAGE_PATH}/version.BuildTime=${BUILD_TIME}" \
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