From 17f78f93fda94e1bc2e241c7c519312f278b1731 Mon Sep 17 00:00:00 2001 From: Anand Kumar Singh Date: Fri, 30 Oct 2026 18:44:49 +0530 Subject: [PATCH 1/5] rebase Signed-off-by: Anand Kumar Singh --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index ac22eddccbf..92c2e2e00cd 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.26.5 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.10-0.20260826124203-67002e569d7f github.com/argoproj-labs/argocd-image-updater v1.3.2 - github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20261011153353-a213c171036a - github.com/argoproj-labs/gitops-promoter v0.35.0 + github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20261028070022-fbe713f7edcd + github.com/argoproj-labs/gitops-promoter v0.35.1 github.com/argoproj/argo-cd/gitops-engine v0.7.1-0.20250908182407-97ad5b59a627 github.com/argoproj/argo-cd/v3 v3.5.6 github.com/cert-manager/cert-manager v1.21.3 diff --git a/go.sum b/go.sum index 923416822f0..07473094561 100644 --- a/go.sum +++ b/go.sum @@ -43,10 +43,10 @@ github.com/argoproj-labs/argo-rollouts-manager v0.0.10-0.20260826124203-67002e56 github.com/argoproj-labs/argo-rollouts-manager v0.0.10-0.20260826124203-67002e569d7f/go.mod h1:P51MRErJxlueBd9YD/5yOxf2ygwCtMcKku7mPJfFagY= github.com/argoproj-labs/argocd-image-updater v1.3.2 h1:eVTz1miyQAr3poRWgtvdrcFYXZnkuIesmfLmM6XWD+I= github.com/argoproj-labs/argocd-image-updater v1.3.2/go.mod h1:gOhc+D61dl12CJbqIaOmRlV7S65kmHOJ+/TDyQEEjdA= -github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20261011153353-a213c171036a h1:Pawq+aq2DD4FxYIBaO5tE5sCnyQi3ZsG0GKMle3/hkI= -github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20261011153353-a213c171036a/go.mod h1:VbBtHhLKgJ9FqUk/T/WZW3M+TIraUD4VyonfKlQ1xNA= -github.com/argoproj-labs/gitops-promoter v0.35.0 h1:uma781gA0XW9Or0RuMnQFwe6ikZUAz/tmStRDSR44r4= -github.com/argoproj-labs/gitops-promoter v0.35.0/go.mod h1:t6ndi4HS6lixaYyFpNALRQd8R34jbCXsZMxWvOT4dzk= +github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20261028070022-fbe713f7edcd h1:uWalpzN+9IuoSu2fpLHfbX7inEcQU3XhtBm4u/PdbGA= +github.com/argoproj-labs/argocd-operator v0.20.0-rc1.0.20261028070022-fbe713f7edcd/go.mod h1:eJox4SKqrUB2W5TDxxn3aplvyBgENC6OkDEvRIjo0+c= +github.com/argoproj-labs/gitops-promoter v0.35.1 h1:00XmvFJ73uZM/M3NWiFd/vWUTwz6BeB7Em0rOFjmAiA= +github.com/argoproj-labs/gitops-promoter v0.35.1/go.mod h1:huDfG3PS96RrsTjXSveCSrIMB8jOcmYgPv8QKcoNcpU= github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261020182657-c2b1e3017e2c h1:7sM2hqwIetM70/Xvv4ms7zk00LA7Pe9KCtPAql0zEZE= github.com/argoproj/argo-cd/gitops-engine v0.0.0-20261020182657-c2b1e3017e2c/go.mod h1:RsOM4gdM/lsvAfIuzAhYrnHDTLA1AGooZRzVyxbVT3A= github.com/argoproj/argo-cd/v3 v3.5.6 h1:twzdsPiPufKLRtEqD1Jg3FqtuZmSHLTIxs7t6fSkjlk= From 070c5a61466a1e2d065bc3595864f553afaf9c20 Mon Sep 17 00:00:00 2001 From: Anand Kumar Singh Date: Thu, 29 Oct 2026 11:26:47 +0530 Subject: [PATCH 2/5] fix: failing test Signed-off-by: Anand Kumar Singh --- .../1-007_validate_volume_mounts_test.go | 10 ++- .../parallel/1-050_validate_sso_test.go | 12 ++- .../1-095_validate_dex_clientsecret_test.go | 2 +- ...98_validate_dex_clientsecret_deprecated.go | 10 ++- .../parallel/1-143_dex_OpenshiftOAuth_test.go | 81 +++++++++++++++++++ 5 files changed, 110 insertions(+), 5 deletions(-) create mode 100644 test/openshift/e2e/ginkgo/parallel/1-143_dex_OpenshiftOAuth_test.go diff --git a/test/openshift/e2e/ginkgo/parallel/1-007_validate_volume_mounts_test.go b/test/openshift/e2e/ginkgo/parallel/1-007_validate_volume_mounts_test.go index 75b474472c4..1f891cc4453 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-007_validate_volume_mounts_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-007_validate_volume_mounts_test.go @@ -153,7 +153,15 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { SSO: &argov1beta1api.ArgoCDSSOSpec{ Provider: argov1beta1api.SSOProviderTypeDex, Dex: &argov1beta1api.ArgoCDDexSpec{ - OpenShiftOAuth: true, + Config: `connectors: + - type: github + id: github + name: github-using-first-class + config: + clientID: first-class + clientSecret: $dex.github.clientSecret + orgs: + - name: first-class`, Volumes: []corev1.Volume{ {Name: "custom-dex-volume", VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}}}, }, diff --git a/test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go b/test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go index 86c12120dfc..6c6e53948e4 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-050_validate_sso_test.go @@ -126,7 +126,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc() - By("creating a new Argo CD instance with dex and openshift oauth enabled") + By("creating a new Argo CD instance with dex") newArgoCD := &argov1beta1api.ArgoCD{ ObjectMeta: metav1.ObjectMeta{ @@ -137,7 +137,15 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { SSO: &argov1beta1api.ArgoCDSSOSpec{ Provider: "dex", Dex: &argov1beta1api.ArgoCDDexSpec{ - OpenShiftOAuth: true, + Config: `connectors: + - type: github + id: github + name: github-using-first-class + config: + clientID: first-class + clientSecret: $dex.github.clientSecret + orgs: + - name: first-class`, }, }, }, diff --git a/test/openshift/e2e/ginkgo/parallel/1-095_validate_dex_clientsecret_test.go b/test/openshift/e2e/ginkgo/parallel/1-095_validate_dex_clientsecret_test.go index ed2a1682e8b..a61fac05d54 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-095_validate_dex_clientsecret_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-095_validate_dex_clientsecret_test.go @@ -123,7 +123,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { }) - It("verifies the operator deletes legacy non-expiring Dex kubernetes.io/service-account-token Secrets and drops them from the Dex SA", func() { + It("verifies the operator deletes legacy non-expiring Dex kubernetes.io/service-account-token Secrets and drops them from the Dex SA", Label("openshift"), func() { By("creating simple Argo CD instance with Dex and Openshift OAuth enabled") ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc() diff --git a/test/openshift/e2e/ginkgo/parallel/1-098_validate_dex_clientsecret_deprecated.go b/test/openshift/e2e/ginkgo/parallel/1-098_validate_dex_clientsecret_deprecated.go index bf36f242de6..a5dbf69ea2d 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-098_validate_dex_clientsecret_deprecated.go +++ b/test/openshift/e2e/ginkgo/parallel/1-098_validate_dex_clientsecret_deprecated.go @@ -63,7 +63,15 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { SSO: &argov1beta1api.ArgoCDSSOSpec{ Provider: argov1beta1api.SSOProviderTypeDex, Dex: &argov1beta1api.ArgoCDDexSpec{ - OpenShiftOAuth: true, + Config: `connectors: + - type: github + id: github + name: github-using-first-class + config: + clientID: first-class + clientSecret: $dex.github.clientSecret + orgs: + - name: first-class`, }, }, }, diff --git a/test/openshift/e2e/ginkgo/parallel/1-143_dex_OpenshiftOAuth_test.go b/test/openshift/e2e/ginkgo/parallel/1-143_dex_OpenshiftOAuth_test.go new file mode 100644 index 00000000000..83b22d197c0 --- /dev/null +++ b/test/openshift/e2e/ginkgo/parallel/1-143_dex_OpenshiftOAuth_test.go @@ -0,0 +1,81 @@ +/* +Copyright 2025. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package parallel + +import ( + "context" + + argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" + argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd" + fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/client" +) + +var _ = Describe("GitOps Operator Parallel E2E Tests", func() { + + Context("1-143_dex_OpenshiftOAuth_on_xKS_OpenShift", func() { + + var ( + k8sClient client.Client + ctx context.Context + ) + + BeforeEach(func() { + fixture.EnsureParallelCleanSlate() + k8sClient, _ = fixtureUtils.GetE2ETestKubeClient() + ctx = context.Background() + }) + + It("should fail reconciliation when OpenShiftOAuth is enabled on a non-OpenShift cluster", Label("xks"), func() { + + By("creating namespace for test") + ns, cleanupFunc := fixture.CreateRandomE2ETestNamespaceWithCleanupFunc() + defer cleanupFunc() + + By("creating an ArgoCD instance with OpenShiftOAuth enabled") + argoCD := &argov1beta1api.ArgoCD{ + ObjectMeta: metav1.ObjectMeta{Name: "argocd", Namespace: ns.Name}, + Spec: argov1beta1api.ArgoCDSpec{ + SSO: &argov1beta1api.ArgoCDSSOSpec{ + Provider: argov1beta1api.SSOProviderTypeDex, + Dex: &argov1beta1api.ArgoCDDexSpec{ + OpenShiftOAuth: true, + }, + }, + }, + } + Expect(k8sClient.Create(ctx, argoCD)).To(Succeed()) + + By("verifying the ArgoCD instance fails due to illegal SSO configuration for OpenShiftOAuth") + Eventually(argoCD, "2m", "5s").Should( + And(argocdFixture.HavePhase("Failed"), + argocdFixture.HaveSSOStatus("Failed"), + )) + + Eventually(argoCD, "2m", "5s").Should(argocdFixture.HaveCondition(metav1.Condition{ + Message: "illegal SSO configuration: openShiftOAuth is only supported on OpenShift clusters. Please disable the openShiftOAuth configuration.", + Reason: "ErrorOccurred", + Status: "False", + Type: "Reconciled", + })) + }) + }) +}) From 3dae226e4dc64d0f8915c3543a90db9022a02330 Mon Sep 17 00:00:00 2001 From: Anand Kumar Singh Date: Mon, 2 Nov 2026 12:27:27 +0530 Subject: [PATCH 3/5] fix: test Signed-off-by: Anand Kumar Singh --- .../parallel/1-042_restricted_pss_compliant_test.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/openshift/e2e/ginkgo/parallel/1-042_restricted_pss_compliant_test.go b/test/openshift/e2e/ginkgo/parallel/1-042_restricted_pss_compliant_test.go index c15b9b52a8a..cb0704d2d16 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-042_restricted_pss_compliant_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-042_restricted_pss_compliant_test.go @@ -94,7 +94,15 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { SSO: &argov1beta1api.ArgoCDSSOSpec{ Provider: argov1beta1api.SSOProviderTypeDex, Dex: &argov1beta1api.ArgoCDDexSpec{ - OpenShiftOAuth: true, + Config: `connectors: + - type: github + id: github + name: github-using-first-class + config: + clientID: first-class + clientSecret: $dex.github.clientSecret + orgs: + - name: first-class`, }, }, }, From 4c669c2b5e4adf965ee5971bab21a4c2c79da27b Mon Sep 17 00:00:00 2001 From: Anand Kumar Singh Date: Mon, 2 Nov 2026 23:34:46 +0530 Subject: [PATCH 4/5] fix: update argocd version in toolchain test Signed-off-by: Anand Kumar Singh --- .../e2e/ginkgo/parallel/1-031_validate_toolchain_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go index 49310010539..b03ef2a4eba 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go @@ -96,7 +96,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { if os.Getenv("CI") == "prow" { // when running against openshift-ci - expected_argocdVersion = "v3.5.4" + expected_argocdVersion = "v3.5.6" expected_dexVersion = "v2.45.1" expected_redisVersion = "8.2.3" expected_kustomizeVersion = "v5.8.1" From 5dd9467374d54c02cb2387cc8d94572eb1a02d64 Mon Sep 17 00:00:00 2001 From: Anand Kumar Singh Date: Fri, 6 Nov 2026 13:09:55 +0530 Subject: [PATCH 5/5] fix: increase timeout for sequential Signed-off-by: Anand Kumar Singh --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a36ad830b6b..e5d44697c27 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,7 @@ e2e-tests-ginkgo: e2e-tests-sequential-ginkgo e2e-tests-parallel-ginkgo ## Runs .PHONY: e2e-tests-sequential-ginkgo e2e-tests-sequential-ginkgo: ginkgo ## Runs Ginkgo e2e sequential tests @echo "Running GitOps Operator sequential Ginkgo E2E tests..." - $(GINKGO_CLI) -v --trace --label-filter=$(OCP_LABEL_FILTER) --no-color --timeout 240m -r ./test/openshift/e2e/ginkgo/sequential + $(GINKGO_CLI) -v --trace --label-filter=$(OCP_LABEL_FILTER) --no-color --timeout 260m -r ./test/openshift/e2e/ginkgo/sequential .PHONY: e2e-tests-parallel-ginkgo ## Runs Ginkgo e2e parallel tests, (Defaults to 5 runs at a time) e2e-tests-parallel-ginkgo: ginkgo