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 19fd0626bd5..414ab9caf24 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 @@ -87,20 +87,21 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { // These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix expected_kustomizeVersion := "v5.8.1" expected_helmVersion := "v3.19.4" - expected_argocdVersion := "v3.4.4" var expected_dexVersion string var expected_redisVersion string + var expected_argocdVersion string if os.Getenv("CI") == "prow" { // when running against openshift-ci expected_dexVersion = "v2.45.0" expected_redisVersion = "8.2.3" - + expected_argocdVersion = "v3.4.4" } else { // when running against RC/ released version of gitops expected_dexVersion = "v2.45.0" expected_redisVersion = "7.2.11" + expected_argocdVersion = "v3.4.5" } By("locating pods containing toolchain in openshift-gitops") diff --git a/test/openshift/e2e/ginkgo/parallel/1-090_validate_permissions_test.go b/test/openshift/e2e/ginkgo/parallel/1-090_validate_permissions_test.go index ad253f2564c..3d3f4609782 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-090_validate_permissions_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-090_validate_permissions_test.go @@ -65,8 +65,8 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion metadata: - name: openshift-gitops-operator.v1.16.0 - namespace: openshift-operators + name: openshift-gitops-operator.v1.21.2 + namespace: openshift-gitops-operator spec: install: spec: @@ -79,25 +79,6 @@ spec: - endpoints - events - namespaces - - pods - - secrets - - serviceaccounts - - services - - services/finalizers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - "" - resources: - - configmaps - - endpoints - - events - persistentvolumeclaims - pods - secrets @@ -116,26 +97,16 @@ spec: - "" resources: - deployments + - podtemplates verbs: - get - list - watch - - apiGroups: - - "" - resources: - - namespaces - - resourcequotas - verbs: - - create - - delete - - get - - list - - update - - watch - apiGroups: - "" resources: - pods/eviction + - serviceaccounts/token verbs: - create - apiGroups: @@ -147,10 +118,13 @@ spec: - apiGroups: - "" resources: - - podtemplates + - resourcequotas verbs: + - create + - delete - get - list + - update - watch - apiGroups: - apiextensions.k8s.io @@ -191,6 +165,7 @@ spec: resources: - daemonsets - deployments + - podtemplates - replicasets - statefulsets verbs: @@ -204,29 +179,15 @@ spec: - apiGroups: - apps resources: - - deployments - - podtemplates - - replicasets + - deployments/finalizers verbs: - - create - - delete - - get - - list - - patch - update - - watch - apiGroups: - apps resources: - deployments/finalizers - verbs: - - update - - apiGroups: - - apps resourceNames: - gitops-operator - resources: - - deployments/finalizers verbs: - update - apiGroups: @@ -246,21 +207,16 @@ spec: resources: - analysisruns - analysisruns/finalizers + - analysistemplates + - clusteranalysistemplates - experiments - experiments/finalizers - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch - - apiGroups: - - argoproj.io - resources: - - analysistemplates + - namespacemanagements + - namespacemanagements/status + - rollouts + - rollouts/finalizers + - rollouts/scale + - rollouts/status verbs: - create - delete @@ -278,6 +234,7 @@ spec: - argocds - argocds/finalizers - argocds/status + - rolloutmanagers verbs: - create - delete @@ -286,19 +243,6 @@ spec: - patch - update - watch - - apiGroups: - - argoproj.io - resources: - - clusteranalysistemplates - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch - apiGroups: - argoproj.io resources: @@ -306,18 +250,6 @@ spec: - notificationsconfigurations/finalizers verbs: - '*' - - apiGroups: - - argoproj.io - resources: - - rolloutmanagers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - apiGroups: - argoproj.io resources: @@ -332,22 +264,6 @@ spec: - get - patch - update - - apiGroups: - - argoproj.io - resources: - - rollouts - - rollouts/finalizers - - rollouts/scale - - rollouts/status - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch - apiGroups: - autoscaling resources: @@ -373,22 +289,12 @@ spec: - patch - update - watch - - apiGroups: - - batch - resources: - - jobs - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - apiGroups: - config.openshift.io resources: + - authentications - clusterversions + - ingresses verbs: - get - list @@ -408,6 +314,7 @@ spec: - console.openshift.io resources: - consolelinks + - consoleplugins verbs: - create - delete @@ -417,33 +324,21 @@ spec: - update - watch - apiGroups: - - console.openshift.io + - coordination.k8s.io resources: - - consoleplugins + - leases verbs: - create - - delete - get - - list - - patch - update - - watch - - apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - create - - get - - update - apiGroups: - eks.amazonaws.com - elbv2.k8s.aws resources: - - targetgroupbindings + - targetgroupbindings verbs: - - get - - list + - get + - list - apiGroups: - extensions resources: @@ -456,6 +351,7 @@ spec: - watch - apiGroups: - getambassador.io + - x.getambassador.io resources: - ambassadormappings - mappings @@ -492,18 +388,7 @@ spec: - update - watch - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - create - - get - - list - - patch - - update - - watch - - apiGroups: - - networking.k8s.io + - networking.k8s.io resources: - ingresses - networkpolicies @@ -542,17 +427,6 @@ spec: - pipelines.openshift.io resources: - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - pipelines.openshift.io - resources: - gitopsservices verbs: - create @@ -580,20 +454,6 @@ spec: - rbac.authorization.k8s.io resources: - '*' - verbs: - - bind - - create - - delete - - deletecollection - - escalate - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - clusterrolebindings - clusterroles verbs: @@ -624,17 +484,6 @@ spec: - route.openshift.io resources: - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - route.openshift.io - resources: - routes - routes/custom-host verbs: @@ -677,18 +526,10 @@ spec: - get - update - watch - - apiGroups: - - x.getambassador.io - resources: - - ambassadormappings - - mappings + - nonResourceURLs: + - /metrics verbs: - - create - - delete - get - - list - - update - - watch - apiGroups: - authentication.k8s.io resources: @@ -706,10 +547,10 @@ spec: Expect(yaml.UnmarshalStrict([]byte(csvString), expectedCsv)).To(Succeed()) - By("looking for a ClusterServiceVersion for openshift-gitops across all namespaces") + By("looking for a ClusterServiceVersion for openshift-gitops in openshift-gitops-operator namespace") gitopsCSVsFound := []olmv1alpha1.ClusterServiceVersion{} var csvList olmv1alpha1.ClusterServiceVersionList - Expect(k8sClient.List(ctx, &csvList)).To(Succeed()) + Expect(k8sClient.List(ctx, &csvList, client.InNamespace("openshift-gitops-operator"))).To(Succeed()) for index := range csvList.Items { csv := csvList.Items[index] if strings.Contains(csv.Name, "openshift-gitops-operator") { @@ -717,7 +558,11 @@ spec: } } By("if more than one possible CSV is found, we will fail.") - Expect(gitopsCSVsFound).To(HaveLen(1), fmt.Sprintf("Exactly one CSV should found: %v", gitopsCSVsFound)) + csvNames := []string{} + for _, csv := range gitopsCSVsFound { + csvNames = append(csvNames, fmt.Sprintf("%s/%s", csv.Namespace, csv.Name)) + } + Expect(gitopsCSVsFound).To(HaveLen(1), fmt.Sprintf("Exactly one CSV should be found: %v", csvNames)) actualCsv := &olmv1alpha1.ClusterServiceVersion{ ObjectMeta: metav1.ObjectMeta{ diff --git a/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go b/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go index 6af261cbe11..24c1d0fad1a 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-051_validate_argocd_agent_principal_test.go @@ -363,8 +363,12 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentPrincipalName, *principalDeployment) Expect(container).ToNot(BeNil()) - Expect(container.Image).To(Equal(common.ArgoCDAgentPrincipalDefaultImageName)) + if fixture.EnvCI() || fixture.EnvLocalRun() || fixture.EnvNonOLM() { + Expect(container.Image).To(Equal(common.ArgoCDAgentPrincipalDefaultImageName)) + } else { + Expect(container.Image).To(HavePrefix("registry.redhat.io/openshift-gitops-1/argocd-agent-rhel9")) + } By("Create required secrets and certificates for principal pod to start properly") createRequiredSecrets(ns) diff --git a/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go b/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go index 4f09dd428ee..aaee6fee75b 100644 --- a/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-052_validate_argocd_agent_agent_test.go @@ -339,7 +339,12 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() { container := deploymentFixture.GetTemplateSpecContainerByName(argoCDAgentAgentName, *agentDeployment) Expect(container).ToNot(BeNil()) - Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName)) + + if fixture.EnvCI() || fixture.EnvLocalRun() || fixture.EnvNonOLM() { + Expect(container.Image).To(Equal(common.ArgoCDAgentAgentDefaultImageName)) + } else { + Expect(container.Image).To(HavePrefix("registry.redhat.io/openshift-gitops-1/argocd-agent-rhel9")) + } By("Verify environment variables are set correctly")