From 1e4b86a97ab668c4f11b50b74c301cfa2735f517 Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Tue, 18 Mar 2025 17:41:58 +0000 Subject: [PATCH 1/4] upgrade sdk and kubebuilder --- .golangci.yml | 2 +- PROJECT | 2 +- main.go => cmd/main.go | 0 config/samples/kustomization.yaml | 1 + .../toolchain.dev.openshift.com_v1alpha1_useraccount.yaml | 6 ++++++ make/get-tool.mk | 4 ++-- make/go.mk | 2 +- make/run-cicd-script.mk | 2 +- 8 files changed, 13 insertions(+), 6 deletions(-) rename main.go => cmd/main.go (100%) create mode 100644 config/samples/toolchain.dev.openshift.com_v1alpha1_useraccount.yaml diff --git a/.golangci.yml b/.golangci.yml index 4967b99e..bbf3f13e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -30,4 +30,4 @@ linters-settings: rules: - name: dot-imports disabled: true # we allow for dot-imports - \ No newline at end of file + - name: comment-spacings \ No newline at end of file diff --git a/PROJECT b/PROJECT index 364ffd88..4293b235 100644 --- a/PROJECT +++ b/PROJECT @@ -1,5 +1,5 @@ layout: -- go.kubebuilder.io/v3 +- go.kubebuilder.io/v4 plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} diff --git a/main.go b/cmd/main.go similarity index 100% rename from main.go rename to cmd/main.go diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index 1cdd1c69..bf9a621e 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -1,4 +1,5 @@ ## Append samples you want in your CSV to this file as resources ## resources: +- toolchain.dev.openshift.com_v1alpha1_useraccount.yaml #TODO #+kubebuilder:scaffold:manifestskustomizesamples diff --git a/config/samples/toolchain.dev.openshift.com_v1alpha1_useraccount.yaml b/config/samples/toolchain.dev.openshift.com_v1alpha1_useraccount.yaml new file mode 100644 index 00000000..13e017d1 --- /dev/null +++ b/config/samples/toolchain.dev.openshift.com_v1alpha1_useraccount.yaml @@ -0,0 +1,6 @@ +apiVersion: toolchain.dev.openshift.com/v1alpha1 +kind: UserAccount +metadata: + name: useraccount-sample +# spec: + # TODO \ No newline at end of file diff --git a/make/get-tool.mk b/make/get-tool.mk index de5976d4..138710f6 100644 --- a/make/get-tool.mk +++ b/make/get-tool.mk @@ -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 diff --git a/make/go.mk b/make/go.mk index 3b617368..47662754 100644 --- a/make/go.mk +++ b/make/go.mk @@ -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}" \ diff --git a/make/run-cicd-script.mk b/make/run-cicd-script.mk index 245c1801..3d4f7bc2 100644 --- a/make/run-cicd-script.mk +++ b/make/run-cicd-script.mk @@ -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} .PHONY: run-cicd-script From 82dba1eca183cdf1c25d70d35679efb8ee156fd9 Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Tue, 18 Mar 2025 17:58:14 +0000 Subject: [PATCH 2/4] remove comment-spacings --- .golangci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index bbf3f13e..5e602f9d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -29,5 +29,4 @@ linters-settings: revive: rules: - name: dot-imports - disabled: true # we allow for dot-imports - - name: comment-spacings \ No newline at end of file + disabled: true # we allow for dot-imports \ No newline at end of file From 9082c9e1b89d402204e42b311409b2a9e6fa6cad Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Thu, 20 Mar 2025 12:37:27 +0000 Subject: [PATCH 3/4] revert replacement --- make/run-cicd-script.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/run-cicd-script.mk b/make/run-cicd-script.mk index 3d4f7bc2..245c1801 100644 --- a/make/run-cicd-script.mk +++ b/make/run-cicd-script.mk @@ -1,4 +1,4 @@ -OWNER_AND_BRANCH_LOCATION=rsoaresd/toolchain-cicd/openshift_4_17_cicd +OWNER_AND_BRANCH_LOCATION=codeready-toolchain/toolchain-cicd/master GH_SCRIPTS_URL=https://raw.githubusercontent.com/${OWNER_AND_BRANCH_LOCATION} .PHONY: run-cicd-script From db2ada7d745a2ce0288df4638a3bf4403da116f3 Mon Sep 17 00:00:00 2001 From: Rafaela Soares Date: Thu, 20 Mar 2025 15:25:13 +0000 Subject: [PATCH 4/4] empty commit - just for trigger gh actions