From 53f1df032e0573b207db62cbd73d1d47e4148fff Mon Sep 17 00:00:00 2001 From: Varsha B Date: Fri, 4 Jul 2025 11:08:00 +0530 Subject: [PATCH 1/5] Setup openshift CI with go 1.24 Signed-off-by: Varsha B --- .ci-operator.yaml | 2 +- openshift-ci/build-root/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a547cd584..e5c5ff9ba 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: golang-1.22 \ No newline at end of file + tag: golang-1.24 \ No newline at end of file diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index c541d210c..fc79bce96 100644 --- a/openshift-ci/build-root/Dockerfile +++ b/openshift-ci/build-root/Dockerfile @@ -1,6 +1,6 @@ # Dockerfile to bootstrap build and test in openshift-ci -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.16 +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20 ARG KUBECTL_KUTTL_VERSION=0.12.1 ARG OPERATOR_SDK_VERSION=1.35.0 From c12a175ccfec1c9697d978e0cc5ec08199e767aa Mon Sep 17 00:00:00 2001 From: Varsha B Date: Fri, 4 Jul 2025 12:12:58 +0530 Subject: [PATCH 2/5] Fix CI failure Signed-off-by: Varsha B --- .ci-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e5c5ff9ba..16df33a15 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: golang-1.24 \ No newline at end of file + tag: rhel-9-release-golang-1.24-openshift-4.20 \ No newline at end of file From 814ba2b2f65581206a4581db3bc9c4d5548a86be Mon Sep 17 00:00:00 2001 From: Varsha B Date: Fri, 4 Jul 2025 12:58:49 +0530 Subject: [PATCH 3/5] update controller-gen version Signed-off-by: Varsha B --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 34cb9a662..89a215012 100644 --- a/Makefile +++ b/Makefile @@ -267,7 +267,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi CONTROLLER_GEN = $(shell pwd)/bin/controller-gen .PHONY: controller-gen controller-gen: ## Download controller-gen locally if necessary. - $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0) + $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.18.0) KUSTOMIZE = $(shell pwd)/bin/kustomize .PHONY: kustomize From c2b920d15139be303057eb2924dccaa66903f217 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Fri, 4 Jul 2025 13:33:24 +0530 Subject: [PATCH 4/5] update go version Signed-off-by: Varsha B --- bundle/manifests/gitops-operator.clusterserviceversion.yaml | 2 +- go.mod | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index 007945769..3a9ea880c 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -180,7 +180,7 @@ metadata: capabilities: Deep Insights console.openshift.io/plugins: '["gitops-plugin"]' containerImage: quay.io/redhat-developer/gitops-operator - createdAt: "2025-06-25T12:59:48Z" + createdAt: "2025-07-04T08:00:06Z" description: Enables teams to adopt GitOps principles for managing cluster configurations and application delivery across hybrid multi-cluster Kubernetes environments. features.operators.openshift.io/disconnected: "true" diff --git a/go.mod b/go.mod index 3d953ef3b..328eb051d 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/redhat-developer/gitops-operator -go 1.22.0 - -toolchain go1.22.5 +go 1.24.4 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250625125608-ebd6207c8bb1 From c2b4096830f17dc6506a6f323243fb104fd13127 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Fri, 4 Jul 2025 14:57:25 +0530 Subject: [PATCH 5/5] addressed review comment Signed-off-by: Varsha B --- bundle/manifests/gitops-operator.clusterserviceversion.yaml | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index 3a9ea880c..da8852985 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -180,7 +180,7 @@ metadata: capabilities: Deep Insights console.openshift.io/plugins: '["gitops-plugin"]' containerImage: quay.io/redhat-developer/gitops-operator - createdAt: "2025-07-04T08:00:06Z" + createdAt: "2025-07-04T09:26:06Z" description: Enables teams to adopt GitOps principles for managing cluster configurations and application delivery across hybrid multi-cluster Kubernetes environments. features.operators.openshift.io/disconnected: "true" diff --git a/go.mod b/go.mod index 328eb051d..29532ccc3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/redhat-developer/gitops-operator -go 1.24.4 +go 1.24.0 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250625125608-ebd6207c8bb1