Skip to content

Remove workaround from e2e tests for cluster config change related to issue #148 #689

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

Merged
merged 1 commit into from
May 9, 2024
Merged

Remove workaround from e2e tests for cluster config change related to issue #148 #689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 1 addition & 26 deletions test/e2e/gitopsservice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,6 @@ var _ = Describe("GitOpsServiceController", func() {
ocPath, err := exec.LookPath("oc")
Expect(err).NotTo(HaveOccurred())

// 'When GitOps operator is run locally (not installed via OLM), it does not correctly setup
// the 'argoproj.io' Role rules for the 'argocd-application-controller'
// Thus, applying missing rules for 'argocd-application-controller'
// TODO: Remove once https://github.com/redhat-developer/gitops-operator/issues/148 is fixed
err = applyMissingPermissions("openshift-gitops", "openshift-gitops")
Expect(err).NotTo(HaveOccurred())

cmd := exec.Command(ocPath, "apply", "-f", imageYAML)
err = cmd.Run()
Expect(err).NotTo(HaveOccurred())
Expand Down Expand Up @@ -341,9 +334,6 @@ var _ = Describe("GitOpsServiceController", func() {
// 'When GitOps operator is run locally (not installed via OLM), it does not correctly setup
// the 'argoproj.io' Role rules for the 'argocd-application-controller'
// Thus, applying missing rules for 'argocd-application-controller'
// TODO: Remove once https://github.com/redhat-developer/gitops-operator/issues/148 is fixed
err := applyMissingPermissions("openshift-gitops", "openshift-gitops")
Expect(err).NotTo(HaveOccurred())

Eventually(func() error {
_, err := helper.ProjectExists("default", "openshift-gitops")
Expand Down Expand Up @@ -416,14 +406,6 @@ var _ = Describe("GitOpsServiceController", func() {
return nil
}, time.Minute*10, interval).ShouldNot(HaveOccurred())

// 'When GitOps operator is run locally (not installed via OLM), it does not correctly setup
// the 'argoproj.io' Role rules for the 'argocd-application-controller'
// Thus, applying missing rules for 'argocd-application-controller'
// TODO: Remove once https://github.com/redhat-developer/gitops-operator/issues/148 is fixed
if err := applyMissingPermissions(argocdInstance, sourceNS); err != nil {
Expect(err).NotTo(HaveOccurred())
}

// create a target namespace to deploy resources
// allow argocd to create resources in the target namespace by adding managed-by label
targetNamespaceObj := &corev1.Namespace{
Expand Down Expand Up @@ -491,13 +473,6 @@ var _ = Describe("GitOpsServiceController", func() {
Context("Validate permission label feature for OOTB Argo CD instance", func() {
argocdTargetNamespace := "argocd-target"
It("Create target namespace", func() {
// 'When GitOps operator is run locally (not installed via OLM), it does not correctly setup
// the 'argoproj.io' Role rules for the 'argocd-application-controller'
// Thus, applying missing rules for 'argocd-application-controller'
// TODO: Remove once https://github.com/redhat-developer/gitops-operator/issues/148 is fixed
err := applyMissingPermissions(argoCDInstanceName, argoCDNamespace)
Expect(err).NotTo(HaveOccurred())

// create a target namespace to deploy resources
// allow argocd to create resources in the target namespace by adding managed-by label
targetNamespaceObj := &corev1.Namespace{
Expand All @@ -508,7 +483,7 @@ var _ = Describe("GitOpsServiceController", func() {
},
},
}
err = k8sClient.Create(context.TODO(), targetNamespaceObj)
err := k8sClient.Create(context.TODO(), targetNamespaceObj)
if !kubeerrors.IsAlreadyExists(err) {
Expect(err).NotTo(HaveOccurred())
}
Expand Down