fix(provider/kuberentes): v1 fix scaleTargetRef apiVersion in HPA (#2249

) (#2418)
spinnaker · Mar 16, 2018 · 3eac933 · 3eac933
1 parent bb5888e
commit 3eac933
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.../groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/api/KubernetesApiConverter.groovy b/.../groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/api/KubernetesApiConverter.groovy
@@ -804,7 +804,8 @@ class KubernetesApiConverter {
   static HorizontalPodAutoscalerFluentImpl toAutoscaler(HorizontalPodAutoscalerFluentImpl autoscalerBuilder,
                                                         KubernetesAutoscalerDescription description,
                                                         String resourceName,
-                                                        String resourceKind) {
+                                                        String resourceKind,
+                                                        String apiVersion) {
     autoscalerBuilder.withNewMetadata()
       .withName(resourceName)
       .withNamespace(description.namespace)
@@ -816,6 +817,7 @@ class KubernetesApiConverter {
       .withNewScaleTargetRef()
       .withKind(resourceKind)
       .withName(resourceName)
+      .withApiVersion(apiVersion)
       .endScaleTargetRef()
       .endSpec()
   }

diff --git a/...iver/kubernetes/v1/deploy/ops/autoscaler/UpsertKubernetesAutoscalerAtomicOperation.groovy b/...iver/kubernetes/v1/deploy/ops/autoscaler/UpsertKubernetesAutoscalerAtomicOperation.groovy
@@ -61,6 +61,7 @@ class UpsertKubernetesAutoscalerAtomicOperation implements AtomicOperation<Void>
     def hasDeployment = credentials.apiAdaptor.hasDeployment(replicaSet)
     def name = hasDeployment ? parsedName.cluster : serverGroupName
     def kind = hasDeployment ? KubernetesUtil.DEPLOYMENT_KIND : KubernetesUtil.SERVER_GROUP_KIND
+    def version = hasDeployment ? credentials.apiAdaptor.getDeployment(namespace, parsedName.cluster).getApiVersion() : replicaSet.getApiVersion()
 
     task.updateStatus BASE_PHASE, "Looking up existing autoscaler..."
 
@@ -83,7 +84,7 @@ class UpsertKubernetesAutoscalerAtomicOperation implements AtomicOperation<Void>
         autoscaler.spec.targetCPUUtilizationPercentage
 
       ((DoneableHorizontalPodAutoscaler) KubernetesApiConverter.toAutoscaler(
-        credentials.apiAdaptor.editAutoscaler(namespace, name), description, name, kind
+        credentials.apiAdaptor.editAutoscaler(namespace, name), description, name, kind, version
       )).done()
     } else {
       if (!description.scalingPolicy || !description.scalingPolicy.cpuUtilization || description.scalingPolicy.cpuUtilization.target == null) {
@@ -95,7 +96,7 @@ class UpsertKubernetesAutoscalerAtomicOperation implements AtomicOperation<Void>
       }
 
       task.updateStatus BASE_PHASE, "Creating autoscaler..."
-      credentials.apiAdaptor.createAutoscaler(namespace, ((HorizontalPodAutoscalerBuilder) KubernetesApiConverter.toAutoscaler(new HorizontalPodAutoscalerBuilder(), description, name, kind)).build())
+      credentials.apiAdaptor.createAutoscaler(namespace, ((HorizontalPodAutoscalerBuilder) KubernetesApiConverter.toAutoscaler(new HorizontalPodAutoscalerBuilder(), description, name, kind, version)).build())
     }
 
     return null

diff --git a/...r/clouddriver/kubernetes/v1/deploy/ops/servergroup/DeployKubernetesAtomicOperation.groovy b/...r/clouddriver/kubernetes/v1/deploy/ops/servergroup/DeployKubernetesAtomicOperation.groovy
@@ -141,7 +141,6 @@ class DeployKubernetesAtomicOperation implements AtomicOperation<DeploymentResul
     }
 
     replicaSet = credentials.apiAdaptor.createReplicaSet(namespace, replicaSet)
-
     task.updateStatus BASE_PHASE, "Deployed replica set ${replicaSet.metadata.name}"
 
     if (hasDeployment) {
@@ -162,7 +161,8 @@ class DeployKubernetesAtomicOperation implements AtomicOperation<DeploymentResul
 
       def name = hasDeployment ? clusterName : replicaSetName
       def kind = hasDeployment ? KubernetesUtil.DEPLOYMENT_KIND : KubernetesUtil.SERVER_GROUP_KIND
-      def autoscaler = ((HorizontalPodAutoscalerBuilder) KubernetesApiConverter.toAutoscaler(new HorizontalPodAutoscalerBuilder(), new KubernetesAutoscalerDescription(replicaSetName, description), name, kind)).build()
+      def version = hasDeployment ? credentials.apiAdaptor.getDeployment(namespace, clusterName).getApiVersion() : replicaSet.getApiVersion()
+      def autoscaler = ((HorizontalPodAutoscalerBuilder) KubernetesApiConverter.toAutoscaler(new HorizontalPodAutoscalerBuilder(), new KubernetesAutoscalerDescription(replicaSetName, description), name, kind, version)).build()
 
       if (credentials.apiAdaptor.getAutoscaler(namespace, name)) {
         credentials.apiAdaptor.deleteAutoscaler(namespace, name)