Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit 13c91f9

Browse files
committed
Add openshift SCC zookeeper
Signed-off-by: nshankar13 <[email protected]>
1 parent c24012f commit 13c91f9

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

tests/e2e/e2e_statefulsets_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ var _ = OSMDescribe("Test traffic among Statefulset members",
5454
chart, err := loader.Load(chartPath)
5555
Expect(err).NotTo(HaveOccurred())
5656

57+
if Td.DeployOnOpenShift {
58+
err = Td.AddOpenShiftSCC("privileged", saName, testNS)
59+
}
60+
5761
// Install zookeeper
5862
_, err = install.Run(chart, map[string]interface{}{
5963
"replicaCount": replicaCount,

tests/framework/common.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1554,8 +1554,8 @@ func (td *OsmTestData) GrabLogs() error {
15541554
return nil
15551555
}
15561556

1557-
// addOpenShiftSCC adds the specified SecurityContextConstraint to the given service account
1558-
func (td *OsmTestData) addOpenShiftSCC(scc, serviceAccount, namespace string) error {
1557+
// AddOpenShiftSCC adds the specified SecurityContextConstraint to the given service account
1558+
func (td *OsmTestData) AddOpenShiftSCC(scc, serviceAccount, namespace string) error {
15591559
if !td.DeployOnOpenShift {
15601560
return errors.Errorf("Tests are not configured for OpenShift. Try again with -deployOnOpenShift=true")
15611561
}

tests/framework/common_apps.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (td *OsmTestData) CreateServiceAccount(ns string, svcAccount *corev1.Servic
7979
return nil, err
8080
}
8181
if Td.DeployOnOpenShift {
82-
err = Td.addOpenShiftSCC("privileged", svcAc.Name, svcAc.Namespace)
82+
err = Td.AddOpenShiftSCC("privileged", svcAc.Name, svcAc.Namespace)
8383
return svcAc, err
8484
}
8585
return svcAc, nil

0 commit comments

Comments
 (0)