diff --git a/bundle/manifests/argoproj.io_argocds.yaml b/bundle/manifests/argoproj.io_argocds.yaml index da1cf638ff0..b134587af4e 100644 --- a/bundle/manifests/argoproj.io_argocds.yaml +++ b/bundle/manifests/argoproj.io_argocds.yaml @@ -30364,6 +30364,12 @@ spec: config: description: Config is the dex connector configuration. type: string + enableSATokenRenewal: + description: |- + EnableSATokenRenewal enables the short-lived Dex token renewal feature. + When true, the operator uses TokenRequest API for time-limited tokens. + When false (default), the operator uses the legacy non-expiring token approach. + type: boolean env: description: Env lets you specify environment variables for Dex. diff --git a/bundle/manifests/gitops-operator.clusterserviceversion.yaml b/bundle/manifests/gitops-operator.clusterserviceversion.yaml index 40f5356c1b2..ca00aa9b8b4 100644 --- a/bundle/manifests/gitops-operator.clusterserviceversion.yaml +++ b/bundle/manifests/gitops-operator.clusterserviceversion.yaml @@ -190,7 +190,7 @@ metadata: capabilities: Deep Insights console.openshift.io/plugins: '["gitops-plugin"]' containerImage: quay.io/redhat-developer/gitops-operator - createdAt: "2026-06-30T06:15:57Z" + createdAt: "2026-07-28T06:33:30Z" 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/config/crd/bases/argoproj.io_argocds.yaml b/config/crd/bases/argoproj.io_argocds.yaml index 09c6829ba7d..08f4336ddcc 100644 --- a/config/crd/bases/argoproj.io_argocds.yaml +++ b/config/crd/bases/argoproj.io_argocds.yaml @@ -30353,6 +30353,12 @@ spec: config: description: Config is the dex connector configuration. type: string + enableSATokenRenewal: + description: |- + EnableSATokenRenewal enables the short-lived Dex token renewal feature. + When true, the operator uses TokenRequest API for time-limited tokens. + When false (default), the operator uses the legacy non-expiring token approach. + type: boolean env: description: Env lets you specify environment variables for Dex. diff --git a/go.mod b/go.mod index d0da0151296..7c857830f50 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.26.2 require ( github.com/argoproj-labs/argo-rollouts-manager v0.0.9-0.20260505092152-3e07addcb2cb github.com/argoproj-labs/argocd-image-updater v1.2.2 - github.com/argoproj-labs/argocd-operator v0.19.0-rc2.0.20260630041249-888474273eba + github.com/argoproj-labs/argocd-operator v0.19.0-rc2.0.20260728114051-d327761135c8 github.com/argoproj/argo-cd/gitops-engine v0.7.1-0.20250908182407-97ad5b59a627 github.com/argoproj/argo-cd/v3 v3.4.4 github.com/go-logr/logr v1.4.3 diff --git a/go.sum b/go.sum index 39fbd404aed..7942c1b304c 100644 --- a/go.sum +++ b/go.sum @@ -43,8 +43,8 @@ github.com/argoproj-labs/argo-rollouts-manager v0.0.9-0.20260505092152-3e07addcb github.com/argoproj-labs/argo-rollouts-manager v0.0.9-0.20260505092152-3e07addcb2cb/go.mod h1:Ouqjtkj48SPJhW6r00CYqJ4uM7QDy3D4tinKIK9Y69Q= github.com/argoproj-labs/argocd-image-updater v1.2.2 h1:5g7OJclZG03gQrbF5rbKlKdK0sL9CzS9tv4e8ljO7cs= github.com/argoproj-labs/argocd-image-updater v1.2.2/go.mod h1:QZni7rexzlsmYa5hGu2+iWV42igUpJ0hfLP3+36ulVY= -github.com/argoproj-labs/argocd-operator v0.19.0-rc2.0.20260630041249-888474273eba h1:94jBZvH9MVJdP5A2ROeMGSGS4EbR+GrC7qXv5uVrHFI= -github.com/argoproj-labs/argocd-operator v0.19.0-rc2.0.20260630041249-888474273eba/go.mod h1:eVZ1BMn0y/wnRiQpXL/gwimZq2G0Q7QyW1C7/uSijc4= +github.com/argoproj-labs/argocd-operator v0.19.0-rc2.0.20260728114051-d327761135c8 h1:jbz78SeI3Lu11bbSDiJbjHnIlGwkZ3sUKRmCq2VXBW0= +github.com/argoproj-labs/argocd-operator v0.19.0-rc2.0.20260728114051-d327761135c8/go.mod h1:PY9eHeSeYKdgskdfk4URjcIZgdRrgr1pVle2qpevjMM= github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260618084203-443415b5527a h1:SJc7T9iblzEkvl9Ori/OZL6gZgDFxMnC5icqGg0rvWc= github.com/argoproj/argo-cd/gitops-engine v0.0.0-20260618084203-443415b5527a/go.mod h1:6Q1KZzkeKlnCpzzZ1Fu72+WPMAt+ZeMD9KOO6aMjW68= github.com/argoproj/argo-cd/v3 v3.4.4 h1:PmYfvrLRecuOXjoUjBVx0nRwtJv/Wc9a3jaWs37EyyI= 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 9708e7507e4..50909430222 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 @@ -25,6 +25,7 @@ import ( "github.com/argoproj-labs/argocd-operator/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/redhat-developer/gitops-operator/controllers/util" "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd" k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s" @@ -44,7 +45,8 @@ func newArgoCDForDexOpenShiftOAuthE2E(namespace string) *argov1beta1api.ArgoCD { SSO: &argov1beta1api.ArgoCDSSOSpec{ Provider: argov1beta1api.SSOProviderTypeDex, Dex: &argov1beta1api.ArgoCDDexSpec{ - OpenShiftOAuth: true, + OpenShiftOAuth: true, + EnableSATokenRenewal: util.BoolPtr(true), }, }, Server: argov1beta1api.ArgoCDServerSpec{ 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 2eaa3c002c7..db1cfa7f35f 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 @@ -23,6 +23,7 @@ import ( argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + "github.com/redhat-developer/gitops-operator/controllers/util" "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture" argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd" k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s" @@ -64,7 +65,8 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { SSO: &argov1beta1api.ArgoCDSSOSpec{ Provider: argov1beta1api.SSOProviderTypeDex, Dex: &argov1beta1api.ArgoCDDexSpec{ - OpenShiftOAuth: true, + OpenShiftOAuth: true, + EnableSATokenRenewal: util.BoolPtr(true), }, }, },