Merge pull request #1104 from kinvolk/iaguis/fix-gangway

gangway: add a serviceaccount
kinvolk · Oct 21, 2020 · f767846 · f767846
2 parents 5b9b2de + a4f0888
commit f767846
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/assets/charts/components/gangway/templates/deployment.yaml b/assets/charts/components/gangway/templates/deployment.yaml
@@ -20,6 +20,7 @@ spec:
         runAsNonRoot: true
         runAsUser: 65534
         runAsGroup: 65534
+      serviceAccountName: gangway
       initContainers:
       - name: download-theme
         image: alpine/git:1.0.7

diff --git a/assets/charts/components/gangway/templates/serviceaccount.yaml b/assets/charts/components/gangway/templates/serviceaccount.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: gangway
+  name: gangway
diff --git a/pkg/assets/generated_assets.go b/pkg/assets/generated_assets.go
diff --git a/test/components/gangway/gangway_test.go b/test/components/gangway/gangway_test.go
@@ -18,8 +18,11 @@
 package gangway
 
 import (
+	"context"
 	"testing"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	testutil "github.com/kinvolk/lokomotive/test/components/util"
 )
 
@@ -35,3 +38,24 @@ func TestGangwayDeployment(t *testing.T) {
 		testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
 	})
 }
+
+func TestGangwayServiceAccount(t *testing.T) {
+	namespace := "gangway"
+	deployment := "gangway"
+	expectedServiceAccountName := "gangway"
+
+	client := testutil.CreateKubeClient(t)
+
+	testutil.WaitForDeployment(t, client, namespace, deployment, testutil.RetryInterval, testutil.Timeout)
+
+	deploy, err := client.AppsV1().Deployments(namespace).Get(context.TODO(), deployment, metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Couldn't find gangway deployment")
+	}
+
+	if deploy.Spec.Template.Spec.ServiceAccountName != expectedServiceAccountName {
+		t.Fatalf("Expected serviceAccountName %q, got: %q",
+			deploy.Spec.Template.Spec.ServiceAccountName,
+			deploy.Spec.Template.Spec.ServiceAccountName)
+	}
+}