Skip to content

Commit 2987fbc

Browse files
committed
addressed comments
Signed-off-by: Ran Wurmbrand <rwurmbra@redhat.com>
1 parent 0335919 commit 2987fbc

4 files changed

Lines changed: 11 additions & 6 deletions

File tree

e2e-tests/tests/tier0/mta_852_minimal_rbac_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
var _ = Describe("Cluster-level RBAC export", func() {
15-
It("[MTA-852] Should export ClusterRole and ClusterRoleBinding for linked ServiceAccount", Label("cluster-admin"), func() {
15+
It("[MTA-852] Should export ClusterRole and ClusterRoleBinding for linked ServiceAccount", Label("tier0"), func() {
1616
appName := "simple-nginx-nopv"
1717
namespace := "simple-nginx-nopv"
1818
serviceName := "my-" + appName

e2e-tests/tests/tier0/mta_853_split_apply_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
var _ = Describe("Namespace-admin cluster-level migration", func() {
15-
It("[MTA-853] Should migrate workload with split apply: namespace-admin + cluster-admin", Label("namespace-admin"), func() {
15+
It("[MTA-853] Should migrate workload with split apply: namespace-admin + cluster-admin", Label("tier0"), func() {
1616
appName := "simple-nginx-nopv"
1717
namespace := "simple-nginx-nopv"
1818
serviceName := "my-" + appName

e2e-tests/tests/tier1/mta_854_two_clusterroles_test.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
)
1111

1212
var _ = Describe("Cluster-level RBAC export", func() {
13-
It("[MTA-854] Should export two ClusterRoles and two ClusterRoleBindings for one Deployment", Label("cluster-admin"), func() {
14-
appName := "nginx-with-serviceaccount"
13+
It("[MTA-854] Should export two ClusterRoles and two ClusterRoleBindings for one Deployment", Label("tier1"), func() {
14+
appName := "simple-nginx-nopv"
1515
namespace := "simple-nginx-nopv"
1616
serviceName := "my-" + appName
1717
readClusterRole := "crane-e2e-pod-reader"
@@ -40,10 +40,12 @@ var _ = Describe("Cluster-level RBAC export", func() {
4040
readCRB := ClusterRoleBinding{Name: readClusterRoleBindingName, ClusterRoleName: readClusterRole}
4141
writeCRB := ClusterRoleBinding{Name: writeClusterRoleBindingName, ClusterRoleName: writeClusterRole}
4242
sa := ServiceAccount{Name: "nginx-sa", Namespace: namespace}
43+
4344
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
4445
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
4546
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
4647
OutputDir: paths.OutputDir}
48+
4749
DeferCleanup(func() {
4850
if err := ResourceCleanup([]KubectlRunner{kubectlSrc, kubectlTgt}, []Resource{readCR, writeCR, readCRB, writeCRB, sa}); err != nil {
4951
log.Printf("Resources cleanup: %v", err)
@@ -54,7 +56,7 @@ var _ = Describe("Cluster-level RBAC export", func() {
5456
}
5557
})
5658

57-
By("Deploying app with ServiceAccount on source cluster")
59+
By("Deploying app with on source cluster")
5860
Expect(PrepareSourceApp(srcApp, kubectlSrc)).NotTo(HaveOccurred())
5961

6062
By("Creating ClusterRole with pod read permissions")
@@ -69,6 +71,9 @@ var _ = Describe("Cluster-level RBAC export", func() {
6971
By("Creating ClusterRoleBinding for write ClusterRole")
7072
Expect(writeCRB.Create(kubectlSrc)).NotTo(HaveOccurred())
7173

74+
By("Creating Service-Account on Namespace")
75+
Expect(sa.Create(kubectlSrc)).NotTo(HaveOccurred())
76+
7277
By("Bind Relevent Service-Account to Read cluster role")
7378
Expect(readCRB.AddSubject(kubectlSrc, sa)).NotTo(HaveOccurred())
7479

e2e-tests/tests/tier1/mta_855_crd_custom_resource_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
var _ = Describe("Cluster-level RBAC export", func() {
15-
It("[MTA-855] Should export CRD to _cluster and custom resource to namespace directory", Label("cluster-admin"), func() {
15+
It("[MTA-855] Should export CRD to _cluster and custom resource to namespace directory", Label("tier1"), func() {
1616
appName := "simple-nginx-nopv"
1717
namespace := "simple-nginx-nopv"
1818
serviceName := "my-" + appName

0 commit comments

Comments
 (0)