Skip to content

Commit 0701465

Browse files
perdasilvaperdasilva
committed
Move user defined service account e2e to one namespace per spec
Signed-off-by: perdasilva <[email protected]>
1 parent 06ecbba commit 0701465

File tree

3 files changed

+36
-43
lines changed

3 files changed

+36
-43
lines changed

Diff for: ‎test/e2e/gc_e2e_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
3434
kubeClient = ctx.Ctx().KubeClient()
3535
operatorClient = ctx.Ctx().OperatorClient()
3636

37-
ns = SetupGeneratedTestNamespace(genName("gc-e2e-"), WithAllNamespaceOperatorGroup())
37+
ns = SetupGeneratedTestNamespace(genName("gc-e2e-"), WithOwnNamespaceOperatorGroup())
3838
})
3939

4040
AfterEach(func() {

Diff for: ‎test/e2e/metrics_e2e_test.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ var _ = Describe("Metrics are generated for OLM managed resources", func() {
3939
)
4040

4141
BeforeEach(func() {
42-
c = newKubeClient()
43-
crc = newCRClient()
44-
namespaceName := genName("metrics-e2e-")
45-
generatedNamespace = SetupGeneratedTestNamespace(namespaceName, namespaceName)
42+
generatedNamespace = SetupGeneratedTestNamespace(genName("metrics-e2e-"), WithOwnNamespaceOperatorGroup())
4643
})
4744

4845
AfterEach(func() {

Diff for: ‎test/e2e/user_defined_sa_test.go

+34-38
Original file line numberDiff line numberDiff line change
@@ -23,56 +23,60 @@ import (
2323
)
2424

2525
var _ = Describe("User defined service account", func() {
26+
var (
27+
generatedNamespace corev1.Namespace
28+
)
29+
30+
BeforeEach(func() {
31+
generatedNamespace = SetupGeneratedTestNamespace(genName("user-defined-sa-e2e-"))
32+
})
33+
2634
AfterEach(func() {
27-
TearDown(testNamespace)
35+
TeardownNamespace(generatedNamespace.GetName())
2836
})
2937

3038
It("with no permission", func() {
3139

3240
kubeclient := newKubeClient()
3341
crclient := newCRClient()
3442

35-
namespace := genName("scoped-ns-")
36-
_, cleanupNS := newNamespace(kubeclient, namespace)
37-
defer cleanupNS()
38-
3943
// Create a service account, but add no permission to it.
4044
saName := genName("scoped-sa-")
41-
_, cleanupSA := newServiceAccount(kubeclient, namespace, saName)
45+
_, cleanupSA := newServiceAccount(kubeclient, generatedNamespace.GetName(), saName)
4246
defer cleanupSA()
4347

4448
// Add an OperatorGroup and specify the service account.
4549
ogName := genName("scoped-og-")
46-
_, cleanupOG := newOperatorGroupWithServiceAccount(crclient, namespace, ogName, saName)
50+
_, cleanupOG := newOperatorGroupWithServiceAccount(crclient, generatedNamespace.GetName(), ogName, saName)
4751
defer cleanupOG()
4852

4953
permissions := deploymentPermissions()
50-
catsrc, subSpec, catsrcCleanup := newCatalogSource(GinkgoT(), kubeclient, crclient, "scoped", namespace, permissions)
54+
catsrc, subSpec, catsrcCleanup := newCatalogSource(GinkgoT(), kubeclient, crclient, "scoped", generatedNamespace.GetName(), permissions)
5155
defer catsrcCleanup()
5256

5357
// Ensure that the catalog source is resolved before we create a subscription.
54-
_, err := fetchCatalogSourceOnStatus(crclient, catsrc.GetName(), namespace, catalogSourceRegistryPodSynced)
58+
_, err := fetchCatalogSourceOnStatus(crclient, catsrc.GetName(), generatedNamespace.GetName(), catalogSourceRegistryPodSynced)
5559
require.NoError(GinkgoT(), err)
5660

5761
subscriptionName := genName("scoped-sub-")
58-
cleanupSubscription := createSubscriptionForCatalog(crclient, namespace, subscriptionName, catsrc.GetName(), subSpec.Package, subSpec.Channel, subSpec.StartingCSV, subSpec.InstallPlanApproval)
62+
cleanupSubscription := createSubscriptionForCatalog(crclient, generatedNamespace.GetName(), subscriptionName, catsrc.GetName(), subSpec.Package, subSpec.Channel, subSpec.StartingCSV, subSpec.InstallPlanApproval)
5963
defer cleanupSubscription()
6064

6165
// Wait until an install plan is created.
62-
subscription, err := fetchSubscription(crclient, namespace, subscriptionName, subscriptionHasInstallPlanChecker)
66+
subscription, err := fetchSubscription(crclient, generatedNamespace.GetName(), subscriptionName, subscriptionHasInstallPlanChecker)
6367
require.NoError(GinkgoT(), err)
6468
require.NotNil(GinkgoT(), subscription)
6569

6670
// We expect the InstallPlan to be in status: Failed.
6771
ipName := subscription.Status.Install.Name
6872
ipPhaseCheckerFunc := buildInstallPlanPhaseCheckFunc(v1alpha1.InstallPlanPhaseFailed)
69-
ipGot, err := fetchInstallPlanWithNamespace(GinkgoT(), crclient, ipName, namespace, ipPhaseCheckerFunc)
73+
ipGot, err := fetchInstallPlanWithNamespace(GinkgoT(), crclient, ipName, generatedNamespace.GetName(), ipPhaseCheckerFunc)
7074
require.NoError(GinkgoT(), err)
7175

7276
conditionGot := mustHaveCondition(GinkgoT(), ipGot, v1alpha1.InstallPlanInstalled)
7377
assert.Equal(GinkgoT(), corev1.ConditionFalse, conditionGot.Status)
7478
assert.Equal(GinkgoT(), v1alpha1.InstallPlanReasonComponentFailed, conditionGot.Reason)
75-
assert.Contains(GinkgoT(), conditionGot.Message, fmt.Sprintf("is forbidden: User \"system:serviceaccount:%s:%s\" cannot create resource", namespace, saName))
79+
assert.Contains(GinkgoT(), conditionGot.Message, fmt.Sprintf("is forbidden: User \"system:serviceaccount:%s:%s\" cannot create resource", generatedNamespace.GetName(), saName))
7680

7781
// Verify that all step resources are in Unknown state.
7882
for _, step := range ipGot.Status.Plan {
@@ -85,43 +89,39 @@ var _ = Describe("User defined service account", func() {
8589
kubeclient := newKubeClient()
8690
crclient := newCRClient()
8791

88-
namespace := genName("scoped-ns-")
89-
_, cleanupNS := newNamespace(kubeclient, namespace)
90-
defer cleanupNS()
91-
9292
// Create a service account, add enough permission to it so that operator install is successful.
9393
saName := genName("scoped-sa")
94-
_, cleanupSA := newServiceAccount(kubeclient, namespace, saName)
94+
_, cleanupSA := newServiceAccount(kubeclient, generatedNamespace.GetName(), saName)
9595
defer cleanupSA()
96-
cleanupPerm := grantPermission(GinkgoT(), kubeclient, namespace, saName)
96+
cleanupPerm := grantPermission(GinkgoT(), kubeclient, generatedNamespace.GetName(), saName)
9797
defer cleanupPerm()
9898

9999
// Add an OperatorGroup and specify the service account.
100100
ogName := genName("scoped-og-")
101-
_, cleanupOG := newOperatorGroupWithServiceAccount(crclient, namespace, ogName, saName)
101+
_, cleanupOG := newOperatorGroupWithServiceAccount(crclient, generatedNamespace.GetName(), ogName, saName)
102102
defer cleanupOG()
103103

104104
permissions := deploymentPermissions()
105-
catsrc, subSpec, catsrcCleanup := newCatalogSource(GinkgoT(), kubeclient, crclient, "scoped", namespace, permissions)
105+
catsrc, subSpec, catsrcCleanup := newCatalogSource(GinkgoT(), kubeclient, crclient, "scoped", generatedNamespace.GetName(), permissions)
106106
defer catsrcCleanup()
107107

108108
// Ensure that the catalog source is resolved before we create a subscription.
109-
_, err := fetchCatalogSourceOnStatus(crclient, catsrc.GetName(), namespace, catalogSourceRegistryPodSynced)
109+
_, err := fetchCatalogSourceOnStatus(crclient, catsrc.GetName(), generatedNamespace.GetName(), catalogSourceRegistryPodSynced)
110110
require.NoError(GinkgoT(), err)
111111

112112
subscriptionName := genName("scoped-sub-")
113-
cleanupSubscription := createSubscriptionForCatalog(crclient, namespace, subscriptionName, catsrc.GetName(), subSpec.Package, subSpec.Channel, subSpec.StartingCSV, subSpec.InstallPlanApproval)
113+
cleanupSubscription := createSubscriptionForCatalog(crclient, generatedNamespace.GetName(), subscriptionName, catsrc.GetName(), subSpec.Package, subSpec.Channel, subSpec.StartingCSV, subSpec.InstallPlanApproval)
114114
defer cleanupSubscription()
115115

116116
// Wait until an install plan is created.
117-
subscription, err := fetchSubscription(crclient, namespace, subscriptionName, subscriptionHasInstallPlanChecker)
117+
subscription, err := fetchSubscription(crclient, generatedNamespace.GetName(), subscriptionName, subscriptionHasInstallPlanChecker)
118118
require.NoError(GinkgoT(), err)
119119
require.NotNil(GinkgoT(), subscription)
120120

121121
// We expect the InstallPlan to be in status: Complete.
122122
ipName := subscription.Status.Install.Name
123123
ipPhaseCheckerFunc := buildInstallPlanPhaseCheckFunc(v1alpha1.InstallPlanPhaseComplete)
124-
ipGot, err := fetchInstallPlanWithNamespace(GinkgoT(), crclient, ipName, namespace, ipPhaseCheckerFunc)
124+
ipGot, err := fetchInstallPlanWithNamespace(GinkgoT(), crclient, ipName, generatedNamespace.GetName(), ipPhaseCheckerFunc)
125125
require.NoError(GinkgoT(), err)
126126

127127
conditionGot := mustHaveCondition(GinkgoT(), ipGot, v1alpha1.InstallPlanInstalled)
@@ -141,50 +141,46 @@ var _ = Describe("User defined service account", func() {
141141
kubeclient := newKubeClient()
142142
crclient := newCRClient()
143143

144-
namespace := genName("scoped-ns-")
145-
_, cleanupNS := newNamespace(kubeclient, namespace)
146-
defer cleanupNS()
147-
148144
// Create a service account, but add no permission to it.
149145
saName := genName("scoped-sa-")
150-
_, cleanupSA := newServiceAccount(kubeclient, namespace, saName)
146+
_, cleanupSA := newServiceAccount(kubeclient, generatedNamespace.GetName(), saName)
151147
defer cleanupSA()
152148

153149
// Add an OperatorGroup and specify the service account.
154150
ogName := genName("scoped-og-")
155-
_, cleanupOG := newOperatorGroupWithServiceAccount(crclient, namespace, ogName, saName)
151+
_, cleanupOG := newOperatorGroupWithServiceAccount(crclient, generatedNamespace.GetName(), ogName, saName)
156152
defer cleanupOG()
157153

158154
permissions := deploymentPermissions()
159-
catsrc, subSpec, catsrcCleanup := newCatalogSource(GinkgoT(), kubeclient, crclient, "scoped", namespace, permissions)
155+
catsrc, subSpec, catsrcCleanup := newCatalogSource(GinkgoT(), kubeclient, crclient, "scoped", generatedNamespace.GetName(), permissions)
160156
defer catsrcCleanup()
161157

162158
// Ensure that the catalog source is resolved before we create a subscription.
163-
_, err := fetchCatalogSourceOnStatus(crclient, catsrc.GetName(), namespace, catalogSourceRegistryPodSynced)
159+
_, err := fetchCatalogSourceOnStatus(crclient, catsrc.GetName(), generatedNamespace.GetName(), catalogSourceRegistryPodSynced)
164160
require.NoError(GinkgoT(), err)
165161

166162
subscriptionName := genName("scoped-sub-")
167-
cleanupSubscription := createSubscriptionForCatalog(crclient, namespace, subscriptionName, catsrc.GetName(), subSpec.Package, subSpec.Channel, subSpec.StartingCSV, subSpec.InstallPlanApproval)
163+
cleanupSubscription := createSubscriptionForCatalog(crclient, generatedNamespace.GetName(), subscriptionName, catsrc.GetName(), subSpec.Package, subSpec.Channel, subSpec.StartingCSV, subSpec.InstallPlanApproval)
168164
defer cleanupSubscription()
169165

170166
// Wait until an install plan is created.
171-
subscription, err := fetchSubscription(crclient, namespace, subscriptionName, subscriptionHasInstallPlanChecker)
167+
subscription, err := fetchSubscription(crclient, generatedNamespace.GetName(), subscriptionName, subscriptionHasInstallPlanChecker)
172168
require.NoError(GinkgoT(), err)
173169
require.NotNil(GinkgoT(), subscription)
174170

175171
// We expect the InstallPlan to be in status: Failed.
176172
ipNameOld := subscription.Status.InstallPlanRef.Name
177173
ipPhaseCheckerFunc := buildInstallPlanPhaseCheckFunc(v1alpha1.InstallPlanPhaseFailed)
178-
ipGotOld, err := fetchInstallPlanWithNamespace(GinkgoT(), crclient, ipNameOld, namespace, ipPhaseCheckerFunc)
174+
ipGotOld, err := fetchInstallPlanWithNamespace(GinkgoT(), crclient, ipNameOld, generatedNamespace.GetName(), ipPhaseCheckerFunc)
179175
require.NoError(GinkgoT(), err)
180176
require.Equal(GinkgoT(), v1alpha1.InstallPlanPhaseFailed, ipGotOld.Status.Phase)
181177

182178
// Grant permission now and this should trigger an retry of InstallPlan.
183-
cleanupPerm := grantPermission(GinkgoT(), kubeclient, namespace, saName)
179+
cleanupPerm := grantPermission(GinkgoT(), kubeclient, generatedNamespace.GetName(), saName)
184180
defer cleanupPerm()
185181

186182
ipPhaseCheckerFunc = buildInstallPlanPhaseCheckFunc(v1alpha1.InstallPlanPhaseComplete)
187-
ipGotNew, err := fetchInstallPlanWithNamespace(GinkgoT(), crclient, ipNameOld, namespace, ipPhaseCheckerFunc)
183+
ipGotNew, err := fetchInstallPlanWithNamespace(GinkgoT(), crclient, ipNameOld, generatedNamespace.GetName(), ipPhaseCheckerFunc)
188184
require.NoError(GinkgoT(), err)
189185
require.Equal(GinkgoT(), v1alpha1.InstallPlanPhaseComplete, ipGotNew.Status.Phase)
190186
})

0 commit comments

Comments
 (0)