feat(kubernetes): Add ServiceAccount provisioning support

spinnaker · Dec 4, 2019 · e7af183 · e7af183
1 parent d35767d
commit e7af183
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 6 deletions.
diff --git a/...loy/src/main/java/com/netflix/spinnaker/halyard/deploy/deployment/v1/KubectlDeployer.java b/...loy/src/main/java/com/netflix/spinnaker/halyard/deploy/deployment/v1/KubectlDeployer.java
@@ -87,6 +87,8 @@ public RemoteAction deploy(
                         String namespaceDefinition =
                             service.getNamespaceYaml(resolvedConfiguration);
                         String serviceDefinition = service.getServiceYaml(resolvedConfiguration);
+                        String serviceAccountDefinition =
+                            service.getServiceAccountYaml(resolvedConfiguration);
 
                         if (!executor.exists(namespaceDefinition)) {
                           executor.apply(namespaceDefinition);
@@ -96,6 +98,10 @@ public RemoteAction deploy(
                           executor.apply(serviceDefinition);
                         }
 
+                        if (!executor.exists(serviceAccountDefinition)) {
+                          executor.apply(serviceAccountDefinition);
+                        }
+
                         String resourceDefinition =
                             service.getResourceYaml(
                                 executor, deploymentDetails, resolvedConfiguration);

diff --git a/...in/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/KubernetesSettings.java b/...in/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/service/KubernetesSettings.java
@@ -31,8 +31,8 @@ public class KubernetesSettings {
   Map<String, String> podAnnotations = new HashMap<>();
   Map<String, String> podLabels = new HashMap<>();
   Map<String, String> serviceLabels = new HashMap<>();
+  Map<String, String> serviceAccountAnnotations = new HashMap<>();
   List<ConfigSource> volumes = new ArrayList<>();
-  String serviceAccountName = null;
   String serviceType = "ClusterIP";
   String nodePort = null;
   Boolean useExecHealthCheck = true;

diff --git a/...er/halyard/deploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2Service.java b/...er/halyard/deploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2Service.java
@@ -193,6 +193,18 @@ default String getResourceYaml(
         .toString();
   }
 
+  default String getServiceAccountYaml(
+      GenerateService.ResolvedConfiguration resolvedConfiguration) {
+    ServiceSettings settings = resolvedConfiguration.getServiceSettings(getService());
+    String namespace = getNamespace(settings);
+    return new JinjaJarResource("/kubernetes/manifests/serviceAccount.yml")
+        .addBinding("name", getService().getCanonicalName())
+        .addBinding("namespace", getNamespace(settings))
+        .addBinding(
+            "serviceAccountAnnotations", settings.getKubernetes().getServiceAccountAnnotations())
+        .toString();
+  }
+
   default String getPodSpecYaml(
       KubernetesV2Executor executor,
       AccountDeploymentDetails<KubernetesAccount> details,
@@ -250,7 +262,7 @@ default String getPodSpecYaml(
         .addBinding("initContainers", getInitContainers(details))
         .addBinding("hostAliases", getHostAliases(details))
         .addBinding("imagePullSecrets", settings.getKubernetes().getImagePullSecrets())
-        .addBinding("serviceAccountName", settings.getKubernetes().getServiceAccountName())
+        .addBinding("serviceAccountName", getService().getCanonicalName())
         .addBinding("terminationGracePeriodSeconds", terminationGracePeriodSeconds())
         .addBinding("nodeSelector", settings.getKubernetes().getNodeSelector())
         .addBinding("affinity", getAffinity(details))

diff --git a/halyard-deploy/src/main/resources/kubernetes/manifests/serviceAccount.yml b/halyard-deploy/src/main/resources/kubernetes/manifests/serviceAccount.yml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: spin-{{ name }}
+  namespace: {{ namespace }}
+  labels:
+    app: spin
+    cluster: spin-{{ name }}
+  annotations: {
+  {% for key, value in serviceAccountAnnotations.items() %}
+    "{{ key }}": "{{ value }}"{% if not loop.last %}, {% endif %}
+  {% endfor %}}
diff --git a/...yard/deploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2ServiceTest.groovy b/...yard/deploy/spinnaker/v1/service/distributed/kubernetes/v2/KubernetesV2ServiceTest.groovy
@@ -395,15 +395,27 @@ class KubernetesV2ServiceTest extends Specification {
         yaml.contains('"tolerations": [{"key":"test","operator":"Equal","value":"a","effect":"NoSchedule"}]')
     }
 
-    def "Can we set ServiceAccountNames"() {
+    def "Does the serviceAccountName get set correctly?"() {
         setup:
         def executor = Mock(KubernetesV2Executor)
-        serviceSettings.getKubernetes().serviceAccountName = "customServiceAccount"
 
         when:
         String podSpecYaml = testService.getPodSpecYaml(executor, details, config)
 
         then:
-        podSpecYaml.contains('"serviceAccountName": customServiceAccount')
+        podSpecYaml.contains('"serviceAccountName": orca')
     }
-}
+
+    def "Can we set ServiceAccount.serviceAccountAnnotations?"() {
+        setup:
+        serviceSettings.getKubernetes().serviceAccountAnnotations = [
+            "example-service-account-annotation": "test"
+        ]
+
+        when:
+        String yaml = testService.getServiceAccountYaml(config)
+
+        then:
+        yaml.matches(/(?ms).+annotations: \{.+"example-service-account-annotation": "test".+\}.*/)
+    }
+}