Skip to content

chore(e2e): sync DefaultClusterScopedRoleDisabled tests for principal/agent #1211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cjcocokrisp wants to merge 2 commits into
base: master
Choose a base branch
from
+90 −54
Open

chore(e2e): sync DefaultClusterScopedRoleDisabled tests for principal/agent #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d93ce9
chore(e2e): sync DefaultClusterScopedRoleDisabled tests for principal…
cjcocokrisp Jul 10, 2026
c68ec9e
fix: coderabbit comment
cjcocokrisp Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 46 additions & 33 deletions test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,15 @@ import (
argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
"github.com/argoproj-labs/argocd-operator/common"
"github.com/argoproj-labs/argocd-operator/controllers/argocdagent"
"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
agentFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/agent"
argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd"
deploymentFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/deployment"
k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s"
fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
"github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture"
agentFixture "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/agent"
argocdFixture "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/argocd"
deploymentFixture "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/deployment"
k8sFixture "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/k8s"
fixtureUtils "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/utils"
)

var _ = Describe("GitOps Operator Sequential E2E Tests", func() {

const (
argoCDName = "example"
argoCDAgentPrincipalName = "example-agent-principal" // argoCDName + "-agent-principal"
Expand All @@ -54,7 +53,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
)

Context("1-051_validate_argocd_agent_principal", func() {

var (
k8sClient client.Client
ctx context.Context
Expand All @@ -71,16 +69,14 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
principalDeployment *appsv1.Deployment
expectedEnvVariables map[string]string
secretNames agentFixture.AgentSecretNames
principalNetworkPolicy *networkingv1.NetworkPolicy
principalRoute *routev1.Route
principalNetworkPolicy *networkingv1.NetworkPolicy
resourceProxyServiceName string
principalResources agentFixture.PrincipalResources
)

BeforeEach(func() {
fixture.EnsureSequentialCleanSlate()
fixture.SetEnvInOperatorSubscriptionOrDeployment("ARGOCD_CLUSTER_CONFIG_NAMESPACES", "openshift-gitops, argocd-agent-principal-1-051")

k8sClient, _ = fixtureUtils.GetE2ETestKubeClient()
ctx = context.Background()
ns, cleanupFunc = fixture.CreateNamespaceWithCleanupFunc("argocd-agent-principal-1-051")
Expand Down Expand Up @@ -192,12 +188,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
Namespace: ns.Name,
},
}
principalNetworkPolicy = &networkingv1.NetworkPolicy{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-agent-principal-network-policy", argoCDName),
Namespace: ns.Name,
},
}

principalNetworkPolicy = &networkingv1.NetworkPolicy{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -293,9 +283,9 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
ClusterRoleBinding: clusterRoleBinding,
PrincipalDeployment: principalDeployment,
PrincipalRoute: principalRoute,
PrincipalNetworkPolicy: principalNetworkPolicy,
SecretNames: secretNames,
ServiceNames: serviceNames,
PrincipalNetworkPolicy: principalNetworkPolicy,
DeploymentNames: deploymentNames,
ExpectRoute: expectRoutePtr,
})
Expand Down Expand Up @@ -347,7 +337,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should create argocd agent principal resources, and pod should start successfully with default image", func() {

// Add a custom environment variable to the principal server
argoCD.Spec.ArgoCDAgent.Principal.Env = []corev1.EnvVar{{Name: "TEST_ENV", Value: "test_value"}}

Expand Down Expand Up @@ -409,7 +398,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("Should reflect configuration changes from ArgoCD CR to the principal deployment", func() {

By("Create ArgoCD instance")

argoCD.Spec.ArgoCDAgent.Principal.Image = common.ArgoCDAgentPrincipalDefaultImageName
Expand Down Expand Up @@ -437,12 +425,11 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
Expect(k8sClient.Get(ctx, client.ObjectKey{Name: argoCDName, Namespace: ns.Name}, argoCD)).To(Succeed())

argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {

ac.Spec.ArgoCDAgent.Principal.LogLevel = "trace"
ac.Spec.ArgoCDAgent.Principal.LogFormat = "json"
ac.Spec.ArgoCDAgent.Principal.Server.KeepAliveMinInterval = "60s"
ac.Spec.ArgoCDAgent.Principal.Server.EnableWebSocket = ptr.To(true)
ac.Spec.ArgoCDAgent.Principal.Image = "quay.io/argoprojlabs/argocd-agent:v0.8.1"
ac.Spec.ArgoCDAgent.Principal.Image = "quay.io/argoprojlabs/argocd-agent:v0.5.1"

ac.Spec.ArgoCDAgent.Principal.Namespace.AllowedNamespaces = []string{"agent-managed", "agent-autonomous"}
ac.Spec.ArgoCDAgent.Principal.Namespace.EnableNamespaceCreate = ptr.To(true)
Expand All @@ -460,7 +447,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
SecretName: "argocd-agent-resource-proxy-tls-v2",
CASecretName: "argocd-agent-ca-v2",
}

})

By("Create required secrets and certificates for principal pod to start properly")
Expand Down Expand Up @@ -489,7 +475,7 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
if container == nil {
return false
}
return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.8.1"
return container.Image == "quay.io/argoprojlabs/argocd-agent:v0.5.1"
}, "120s", "5s").Should(BeTrue(), "Principal deployment should have the updated image")

By("verify that deployment is in Ready state")
Expand Down Expand Up @@ -520,7 +506,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should handle route disabled configuration correctly", func() {

By("Create ArgoCD instance with route disabled")

argoCD.Spec.ArgoCDAgent.Principal.Server.Route = argov1beta1api.ArgoCDAgentPrincipalRouteSpec{
Expand All @@ -540,7 +525,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should handle route enabled configuration correctly", func() {

By("Create ArgoCD instance with route enabled")

argoCD.Spec.ArgoCDAgent.Principal.Server.Route = argov1beta1api.ArgoCDAgentPrincipalRouteSpec{
Expand All @@ -560,7 +544,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should handle route toggle from enabled to disabled correctly", func() {

By("Create ArgoCD instance with route enabled")

argoCD.Spec.ArgoCDAgent.Principal.Server.Route = argov1beta1api.ArgoCDAgentPrincipalRouteSpec{
Expand Down Expand Up @@ -626,7 +609,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should handle service type ClusterIP configuration correctly", func() {

By("Create ArgoCD instance with service type ClusterIP")

argoCD.Spec.ArgoCDAgent.Principal.Server.Service = argov1beta1api.ArgoCDAgentPrincipalServiceSpec{
Expand All @@ -651,7 +633,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should handle service type LoadBalancer configuration correctly", func() {

By("Create ArgoCD instance with service type LoadBalancer")

argoCD.Spec.ArgoCDAgent.Principal.Server.Service = argov1beta1api.ArgoCDAgentPrincipalServiceSpec{
Expand All @@ -676,7 +657,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should handle service type updates correctly", func() {

By("Create ArgoCD instance with service type ClusterIP")

argoCD.Spec.ArgoCDAgent.Principal.Server.Service = argov1beta1api.ArgoCDAgentPrincipalServiceSpec{
Expand Down Expand Up @@ -718,7 +698,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should deploy principal via namespace-scoped ArgoCD instance and verify cluster role and cluster role binding are not created", func() {

By("Create namespace-scoped ArgoCD instance")

// Create namespace for hosting namespace-scoped ArgoCD instance with principal
Expand Down Expand Up @@ -772,7 +751,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should delete existing cluster role and cluster role binding if ArgoCD instance is namespace-scoped", func() {

By("Create namespace-scoped ArgoCD instance namespace")

// Create namespace for hosting namespace-scoped ArgoCD instance with principal
Expand Down Expand Up @@ -916,7 +894,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
})

It("should create and delete principal ServiceMonitor based on prometheus enabled flag", func() {

By("Create ArgoCD instance with principal enabled and prometheus enabled")

argoCD.Spec.Prometheus.Enabled = true
Expand Down Expand Up @@ -963,5 +940,41 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {

Eventually(principalServiceMonitor, "2m", "2s").Should(k8sFixture.NotExistByName())
})

It("shouldn't create ClusterRole and ClusterRoleBinding for principal if spec.DefaultClusterScopedRoleDisabled is set", func() {
By("Create ArgoCD instance with principal enabled and DefaultClusterScopedRoleDisabled is true")
argoCD.Spec.DefaultClusterScopedRoleDisabled = true
Expect(k8sClient.Create(ctx, argoCD)).To(Succeed())

By("Verify Argo CD CR is reconciled")
Eventually(principalDeployment).Should(k8sFixture.ExistByName())

By("Verify ClusterRole and ClusterRoleBinding do not exist")
Eventually(clusterRole, "60s", "2s").Should(k8sFixture.NotExistByName())
Eventually(clusterRoleBinding, "60s", "2s").Should(k8sFixture.NotExistByName())

Consistently(clusterRole, "15s", "2s").Should(k8sFixture.NotExistByName())
Consistently(clusterRoleBinding, "15s", "2s").Should(k8sFixture.NotExistByName())

By("Namespaced RBAC objects should still exist")
Eventually(role, "60s", "2s").Should(k8sFixture.ExistByName())
Eventually(roleBinding, "60s", "2s").Should(k8sFixture.ExistByName())

By("Unset DefaultClusterScopedRoleDisabled and make sure cluster scoped RBAC objects are created")
argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {
ac.Spec.DefaultClusterScopedRoleDisabled = false
})
Eventually(clusterRole, "60s", "2s").Should(k8sFixture.ExistByName())
Eventually(clusterRoleBinding, "60s", "2s").Should(k8sFixture.ExistByName())

By("Setting DefaultClusterScopedRoleDisabled again deletes clusterRole and clusterRoleBinding")
argocdFixture.Update(argoCD, func(ac *argov1beta1api.ArgoCD) {
ac.Spec.DefaultClusterScopedRoleDisabled = true
})
Eventually(clusterRole, "60s", "2s").Should(k8sFixture.NotExistByName())
Eventually(clusterRoleBinding, "60s", "2s").Should(k8sFixture.NotExistByName())
Consistently(clusterRole, "10s", "2s").Should(k8sFixture.NotExistByName())
Consistently(clusterRoleBinding, "10s", "2s").Should(k8sFixture.NotExistByName())
})
})
})
Loading