Skip to content

Enable 'Validate granting permissions by label' test #401

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
openshift-merge-robot merged 8 commits into from
Dec 8, 2022
Merged

Enable 'Validate granting permissions by label' test #401

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9bd1513
Skip test based on condition
varshab1210 Nov 22, 2022
b169c52
chore: pick up latest argocd-operator commit
ishitasequeira Nov 21, 2022
54ca305
Add reconcile plugin condition (#402)
ciiay Nov 23, 2022
62600c5
increase timeout and skip condition
varshab1210 Dec 7, 2022
c7dc092
Merge branch 'master' into conditional_skip
varshab1210 Dec 7, 2022
d835c0e
Removing additional variable
varshab1210 Dec 7, 2022
bdbc41f
lowering timeout
varshab1210 Dec 8, 2022
b938f3b
Enable test
varshab1210 Dec 8, 2022
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
212 changes: 106 additions & 106 deletions test/e2e/gitopsservice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,112 +381,112 @@ var _ = Describe("GitOpsServiceController", func() {
})
})

// Context("Validate granting permissions by label", func() {
// sourceNS := "source-ns"
// argocdInstance := "argocd-label"
// targetNS := "target-ns"

// It("Create source and target namespaces", func() {
// // create a new source namespace
// sourceNamespaceObj := &corev1.Namespace{
// ObjectMeta: metav1.ObjectMeta{
// Name: sourceNS,
// },
// }
// err := k8sClient.Create(context.TODO(), sourceNamespaceObj)
// if !kubeerrors.IsAlreadyExists(err) {
// Expect(err).NotTo(HaveOccurred())
// }

// // create an ArgoCD instance in the source namespace
// argoCDInstanceObj, err := argocd.NewCR(argocdInstance, sourceNS)
// Expect(err).NotTo(HaveOccurred())
// err = k8sClient.Create(context.TODO(), argoCDInstanceObj)
// if !kubeerrors.IsAlreadyExists(err) {
// Expect(err).NotTo(HaveOccurred())
// }

// // Wait for the default project to exist; this avoids a race condition where the Application
// // can be created before the Project that it targets.
// Eventually(func() error {
// _, err := helper.ProjectExists("default", sourceNS)
// if err != nil {
// return err
// }
// 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{
// ObjectMeta: metav1.ObjectMeta{
// Name: targetNS,
// Labels: map[string]string{
// "argocd.argoproj.io/managed-by": sourceNS,
// },
// },
// }
// err = k8sClient.Create(context.TODO(), targetNamespaceObj)
// if !kubeerrors.IsAlreadyExists(err) {
// Expect(err).NotTo(HaveOccurred())
// }
// })

// It("Required RBAC resources are created in the target namespace", func() {
// resourceList := []helper.ResourceList{
// {
// Resource: &rbacv1.Role{},
// ExpectedResources: []string{
// argocdInstance + "-argocd-application-controller",
// argocdInstance + "-argocd-server",
// },
// },
// {
// Resource: &rbacv1.RoleBinding{},
// ExpectedResources: []string{
// argocdInstance + "-argocd-application-controller",
// argocdInstance + "-argocd-server",
// },
// },
// }
// err := helper.WaitForResourcesByName(k8sClient, resourceList, targetNS, time.Second*180)
// Expect(err).NotTo(HaveOccurred())
// })

// It("Check if an application could be deployed in target namespace", func() {
// nginxAppCr := filepath.Join("..", "appcrs", "nginx_appcr.yaml")
// ocPath, err := exec.LookPath("oc")
// Expect(err).NotTo(HaveOccurred())
// cmd := exec.Command(ocPath, "apply", "-f", nginxAppCr)
// err = cmd.Run()
// Expect(err).NotTo(HaveOccurred())

// Eventually(func() error {
// err := helper.ApplicationHealthStatus("nginx", sourceNS)
// if err != nil {
// return err
// }
// err = helper.ApplicationSyncStatus("nginx", sourceNS)
// if err != nil {
// return err
// }
// return nil
// }, time.Second*300, interval).ShouldNot(HaveOccurred())
// })

// It("Clean up resources", func() {
// Expect(helper.DeleteNamespace(k8sClient, sourceNS)).NotTo(HaveOccurred())
// Expect(helper.DeleteNamespace(k8sClient, targetNS)).NotTo(HaveOccurred())
// })
// })
Context("Validate granting permissions by label", func() {
sourceNS := "source-ns"
argocdInstance := "argocd-label"
targetNS := "target-ns"

It("Create source and target namespaces", func() {
// create a new source namespace
sourceNamespaceObj := &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: sourceNS,
},
}
err := k8sClient.Create(context.TODO(), sourceNamespaceObj)
if !kubeerrors.IsAlreadyExists(err) {
Expect(err).NotTo(HaveOccurred())
}

// create an ArgoCD instance in the source namespace
argoCDInstanceObj, err := argocd.NewCR(argocdInstance, sourceNS)
Expect(err).NotTo(HaveOccurred())
err = k8sClient.Create(context.TODO(), argoCDInstanceObj)
if !kubeerrors.IsAlreadyExists(err) {
Expect(err).NotTo(HaveOccurred())
}

// Wait for the default project to exist; this avoids a race condition where the Application
// can be created before the Project that it targets.
Eventually(func() error {
_, err := helper.ProjectExists("default", sourceNS)
if err != nil {
return err
}
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{
ObjectMeta: metav1.ObjectMeta{
Name: targetNS,
Labels: map[string]string{
"argocd.argoproj.io/managed-by": sourceNS,
},
},
}
err = k8sClient.Create(context.TODO(), targetNamespaceObj)
if !kubeerrors.IsAlreadyExists(err) {
Expect(err).NotTo(HaveOccurred())
}
})

It("Required RBAC resources are created in the target namespace", func() {
resourceList := []helper.ResourceList{
{
Resource: &rbacv1.Role{},
ExpectedResources: []string{
argocdInstance + "-argocd-application-controller",
argocdInstance + "-argocd-server",
},
},
{
Resource: &rbacv1.RoleBinding{},
ExpectedResources: []string{
argocdInstance + "-argocd-application-controller",
argocdInstance + "-argocd-server",
},
},
}
err := helper.WaitForResourcesByName(k8sClient, resourceList, targetNS, time.Second*180)
Expect(err).NotTo(HaveOccurred())
})

It("Check if an application could be deployed in target namespace", func() {
nginxAppCr := filepath.Join("..", "appcrs", "nginx_appcr.yaml")
ocPath, err := exec.LookPath("oc")
Expect(err).NotTo(HaveOccurred())
cmd := exec.Command(ocPath, "apply", "-f", nginxAppCr)
err = cmd.Run()
Expect(err).NotTo(HaveOccurred())

Eventually(func() error {
err := helper.ApplicationHealthStatus("nginx", sourceNS)
if err != nil {
return err
}
err = helper.ApplicationSyncStatus("nginx", sourceNS)
if err != nil {
return err
}
return nil
}, time.Second*600, interval).ShouldNot(HaveOccurred())
})

It("Clean up resources", func() {
Expect(helper.DeleteNamespace(k8sClient, sourceNS)).NotTo(HaveOccurred())
Expect(helper.DeleteNamespace(k8sClient, targetNS)).NotTo(HaveOccurred())
})
})

Context("Validate permission label feature for OOTB Argo CD instance", func() {
argocdTargetNamespace := "argocd-target"
Expand Down