Skip to content

Commit 276a62f

Browse files
committed
commands/.../test/cluster.go: add flag for service account
1 parent 8d0f071 commit 276a62f

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

commands/operator-sdk/cmd/test/cluster.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ var (
3333
testNamespace string
3434
kubeconfigCluster string
3535
imagePullPolicy string
36+
serviceAccount string
3637
pendingTimeout int
3738
)
3839

@@ -50,7 +51,8 @@ func NewTestClusterCmd() *cobra.Command {
5051
testCmd.Flags().StringVarP(&testNamespace, "namespace", "n", "default", "Namespace to run tests in")
5152
testCmd.Flags().StringVarP(&kubeconfigCluster, "kubeconfig", "k", defaultKubeConfig, "Kubeconfig path")
5253
testCmd.Flags().StringVarP(&imagePullPolicy, "imagePullPolicy", "i", "Always", "Set test pod image pull policy. Allowed values: Always, Never")
53-
testCmd.Flags().IntVarP(&pendingTimeout, "pendingTimout", "p", 60, "Timeout for testing pod in pending state")
54+
testCmd.Flags().StringVarP(&serviceAccount, "serviceAccount", "s", "default", "Service account to run tests on")
55+
testCmd.Flags().IntVarP(&pendingTimeout, "pendingTimeout", "p", 60, "Timeout for testing pod in pending state")
5456

5557
return testCmd
5658
}
@@ -77,7 +79,8 @@ func testClusterFunc(cmd *cobra.Command, args []string) error {
7779
Name: "operator-test",
7880
},
7981
Spec: v1.PodSpec{
80-
RestartPolicy: v1.RestartPolicyNever,
82+
ServiceAccountName: serviceAccount,
83+
RestartPolicy: v1.RestartPolicyNever,
8184
Containers: []v1.Container{{
8285
Name: "operator-test",
8386
Image: args[0],

test/e2e/memcached_test.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,17 @@ func MemcachedClusterTest(t *testing.T) {
327327
ctx := f.NewTestCtx(t)
328328
defer ctx.Cleanup(t)
329329

330+
// create sa
331+
saYAML, err := ioutil.ReadFile("deploy/sa.yaml")
332+
if err != nil {
333+
t.Fatal(err)
334+
}
335+
err = ctx.CreateFromYAML(saYAML)
336+
if err != nil {
337+
t.Fatal(err)
338+
}
339+
t.Log("Created sa")
340+
330341
// create rbac
331342
rbacYAML, err := ioutil.ReadFile("deploy/rbac.yaml")
332343
err = ctx.CreateFromYAML(rbacYAML)
@@ -339,7 +350,7 @@ func MemcachedClusterTest(t *testing.T) {
339350
if err != nil {
340351
t.Fatalf("could not get namespace: %v", err)
341352
}
342-
cmdOut, err := exec.Command("operator-sdk", "test", "cluster", *f.ImageName, "-n", namespace, "-i", "Never").CombinedOutput()
353+
cmdOut, err := exec.Command("operator-sdk", "test", "cluster", *f.ImageName, "-n", namespace, "-i", "Never", "-s", "memcached-operator").CombinedOutput()
343354
if err != nil {
344355
t.Fatalf("in-cluster test failed: %v\nCommand Output:\n%s", err, string(cmdOut))
345356
}

0 commit comments

Comments
 (0)