feat(provider/kubernetes): Specify termination grace period seconds (#…

…1572) Adds clouddriver support for spinnaker/spinnaker#1107
spinnaker · Apr 17, 2017 · 56d47c2 · 56d47c2
1 parent c611b6e
commit 56d47c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/...ain/groovy/com/netflix/spinnaker/clouddriver/kubernetes/api/KubernetesApiConverter.groovy b/...ain/groovy/com/netflix/spinnaker/clouddriver/kubernetes/api/KubernetesApiConverter.groovy
@@ -617,6 +617,8 @@ class KubernetesApiConverter {
       fromContainer(it)
     } ?: []
 
+    deployDescription.terminationGracePeriodSeconds = replicaSet?.spec?.template?.spec?.terminationGracePeriodSeconds
+
     return deployDescription
   }
 
@@ -669,6 +671,8 @@ class KubernetesApiConverter {
       fromContainer(it)
     } ?: []
 
+    deployDescription.terminationGracePeriodSeconds = replicationController?.spec?.template?.spec?.terminationGracePeriodSeconds
+
     return deployDescription
   }
 
@@ -885,6 +889,10 @@ class KubernetesApiConverter {
       podTemplateSpecBuilder.withRestartPolicy(description.restartPolicy)
     }
 
+    if (description.terminationGracePeriodSeconds) {
+      podTemplateSpecBuilder.withTerminationGracePeriodSeconds(description.terminationGracePeriodSeconds)
+    }
+
     podTemplateSpecBuilder = podTemplateSpecBuilder.withImagePullSecrets()
 
     for (def imagePullSecret : description.imagePullSecrets) {

diff --git a/...bernetes/deploy/description/servergroup/DeployKubernetesAtomicOperationDescription.groovy b/...bernetes/deploy/description/servergroup/DeployKubernetesAtomicOperationDescription.groovy
@@ -44,6 +44,7 @@ class DeployKubernetesAtomicOperationDescription extends KubernetesAtomicOperati
   Map<String, String> nodeSelector
   KubernetesSecurityContext securityContext
   KubernetesDeployment deployment
+  Long terminationGracePeriodSeconds
 
   @JsonIgnore
   Set<String> imagePullSecrets