From 4d6f0bee928fd2846526c29cfb3fa8de9f3ea7fe Mon Sep 17 00:00:00 2001 From: Varsha B Date: Tue, 9 Sep 2025 11:17:06 +0530 Subject: [PATCH 1/8] Change build-root image Signed-off-by: Varsha B --- .ci-operator.yaml | 6 +++--- go.mod | 6 +++--- go.sum | 8 ++++---- openshift-ci/build-root/Dockerfile | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e4a575ddc..6e80febf8 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: - name: builder - namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.20 \ No newline at end of file + namespace: openshift + name: release + tag: golang-1.24 \ No newline at end of file diff --git a/go.mod b/go.mod index c17462dab..2df33e719 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/redhat-developer/gitops-operator -go 1.24.4 +go 1.24.6 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8 - github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250825094300-73f08c092df7 - github.com/argoproj/argo-cd/v3 v3.1.0-rc2 + github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250828161935-75b2e086ba21 + github.com/argoproj/argo-cd/v3 v3.1.1 github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58 github.com/go-logr/logr v1.4.3 github.com/google/go-cmp v0.7.0 diff --git a/go.sum b/go.sum index 422c39816..1364b8e3f 100644 --- a/go.sum +++ b/go.sum @@ -31,10 +31,10 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8 h1:6+eo7BKrNkSIhQ1nnyCUloSNrGzghlb8r8e7GokoeBo= github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8/go.mod h1:yTwzKUV79YyI764hkXdVojGYBA9yKJk3qXx5mRuQ2Xc= -github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250825094300-73f08c092df7 h1:Y7UmKUW707B7xVLjfnBVkQgM00Dmi7JOCxB9WZ092zE= -github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250825094300-73f08c092df7/go.mod h1:7zgj/iHFq1r1OZmLX9yxUAarttxnklMbqZb/63euXA8= -github.com/argoproj/argo-cd/v3 v3.1.0-rc2 h1:oT9whFw3tShGkW1WrHJReFkAJvmsgS2KGJkcRIFSnt8= -github.com/argoproj/argo-cd/v3 v3.1.0-rc2/go.mod h1:vrxw1sapzdI3nnkwRKP84cMTzYjOKP7XsEy5fW1FQgg= +github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250828161935-75b2e086ba21 h1:3hrm9AsOV10mEKS7E7GRbpI4Zb391lw11wGM+/2hh7g= +github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250828161935-75b2e086ba21/go.mod h1:fhN/hOiIuSANIgYxF3sxjVfTbj7MR9pkp73om6zYKMA= +github.com/argoproj/argo-cd/v3 v3.1.1 h1:5qzZUtfpHTwrySprpQwpvjPUHKUz7gBs/wK7PSiVQ8I= +github.com/argoproj/argo-cd/v3 v3.1.1/go.mod h1:QqvzXzddclRLN7m9XrMb1SM6rOTFP9druSh7wrapZbw= github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58 h1:9ESamu44v3dR9j/I4/4Aa1Fx3QSIE8ElK1CR8Z285uk= github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58/go.mod h1:aIBEG3ohgaC1gh/sw2On6knkSnXkqRLDoBj234Dqczw= github.com/argoproj/pkg v0.13.7-0.20250305113207-cbc37dc61de5 h1:YBoLSjpoaJXaXAldVvBRKJuOPvIXz9UOv6S96gMJM/Q= diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index 78e940687..bd422192d 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/ocp/builder:rhel-9-golang-1.24-openshift-4.20 +FROM quay.io/devtools_gitops/go-toolset:1.24.6 USER root ARG KUBECTL_KUTTL_VERSION=0.12.1 From 2f42b55deead3f83978a5b30129e09c67d5a77ee Mon Sep 17 00:00:00 2001 From: Varsha B Date: Tue, 9 Sep 2025 11:30:28 +0530 Subject: [PATCH 2/8] change imagestream 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 6e80febf8..b93604e26 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: namespace: openshift name: release - tag: golang-1.24 \ No newline at end of file + tag: golang-1.23 \ No newline at end of file From 72a226e5767ce534218cb796ccc822d2b7ec6c20 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Tue, 9 Sep 2025 11:59:55 +0530 Subject: [PATCH 3/8] change user Signed-off-by: Varsha B --- .ci-operator.yaml | 7 +++---- openshift-ci/build-root/Dockerfile | 2 +- openshift-ci/build-root/Dockerfile.custom-go-toolset | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 openshift-ci/build-root/Dockerfile.custom-go-toolset diff --git a/.ci-operator.yaml b/.ci-operator.yaml index b93604e26..31c474ffb 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,3 @@ -build_root_image: - namespace: openshift - name: release - tag: golang-1.23 \ No newline at end of file +build_root: + dockerfile_path: Dockerfile.custom-go-toolset + context_dir: openshift-ci/build-root \ No newline at end of file diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index bd422192d..bd6953ed4 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 quay.io/devtools_gitops/go-toolset:1.24.6 +FROM registry.access.redhat.com/ubi8/go-toolset:latest USER root ARG KUBECTL_KUTTL_VERSION=0.12.1 diff --git a/openshift-ci/build-root/Dockerfile.custom-go-toolset b/openshift-ci/build-root/Dockerfile.custom-go-toolset new file mode 100644 index 000000000..79a1597fe --- /dev/null +++ b/openshift-ci/build-root/Dockerfile.custom-go-toolset @@ -0,0 +1,2 @@ +FROM ci/ubi8-go-toolset:latest +USER root \ No newline at end of file From bc1774ca1d202aa559b3c4bed0ae381d38548024 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Tue, 9 Sep 2025 12:08:00 +0530 Subject: [PATCH 4/8] addressing 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 31c474ffb..9763d7115 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,3 +1,3 @@ -build_root: +build_root_image: dockerfile_path: Dockerfile.custom-go-toolset context_dir: openshift-ci/build-root \ No newline at end of file From 0f081e0294441bffc71f44ec6d39ace9d656f2f8 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Tue, 9 Sep 2025 12:21:16 +0530 Subject: [PATCH 5/8] fix typo Signed-off-by: Varsha B --- openshift-ci/build-root/Dockerfile.custom-go-toolset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift-ci/build-root/Dockerfile.custom-go-toolset b/openshift-ci/build-root/Dockerfile.custom-go-toolset index 79a1597fe..b25f0e34b 100644 --- a/openshift-ci/build-root/Dockerfile.custom-go-toolset +++ b/openshift-ci/build-root/Dockerfile.custom-go-toolset @@ -1,2 +1,2 @@ -FROM ci/ubi8-go-toolset:latest +FROM ci/ubi-8-go-toolset:latest USER root \ No newline at end of file From 809ef377d8e0a9337f3965bb57cac7ae48d2d62b Mon Sep 17 00:00:00 2001 From: Varsha B Date: Tue, 9 Sep 2025 15:26:00 +0530 Subject: [PATCH 6/8] adding project_image Signed-off-by: Varsha B --- .ci-operator.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 9763d7115..254215a92 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,3 +1,4 @@ -build_root_image: - dockerfile_path: Dockerfile.custom-go-toolset - context_dir: openshift-ci/build-root \ No newline at end of file +build_root: + project_image: + dockerfile_path: Dockerfile.custom-go-toolset + context_dir: openshift-ci/build-root \ No newline at end of file From 6095d04cbac84f2032e44bb928fadc47c68d396c Mon Sep 17 00:00:00 2001 From: Varsha B Date: Tue, 9 Sep 2025 15:37:27 +0530 Subject: [PATCH 7/8] fix typo 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 254215a92..6329ae78e 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ -build_root: +build_root_image: project_image: dockerfile_path: Dockerfile.custom-go-toolset context_dir: openshift-ci/build-root \ No newline at end of file From b8fb86e1aa9b8c2b2189664efedef6d7ddb27e42 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Mon, 15 Sep 2025 15:19:22 +0530 Subject: [PATCH 8/8] custom image Signed-off-by: Varsha B --- .ci-operator.yaml | 6 +++--- openshift-ci/build-root/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 6329ae78e..e7f67fa08 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: - project_image: - dockerfile_path: Dockerfile.custom-go-toolset - context_dir: openshift-ci/build-root \ No newline at end of file + name: openshift-gitops-go-toolset + namespace: ci + tag: 1.24.6 \ No newline at end of file diff --git a/openshift-ci/build-root/Dockerfile b/openshift-ci/build-root/Dockerfile index bd6953ed4..bd422192d 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.access.redhat.com/ubi8/go-toolset:latest +FROM quay.io/devtools_gitops/go-toolset:1.24.6 USER root ARG KUBECTL_KUTTL_VERSION=0.12.1