fix(kubernetes): add param to KubernetesAtomicOperationDescription to…

… prevent having to cast credentials
spinnaker · Oct 17, 2019 · f62b3e0 · f62b3e0
1 parent e076eba
commit f62b3e0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/...louddriver/kubernetes/v2/description/manifest/KubernetesManifestOperationDescription.java b/...louddriver/kubernetes/v2/description/manifest/KubernetesManifestOperationDescription.java
@@ -20,13 +20,15 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.netflix.spinnaker.clouddriver.kubernetes.description.KubernetesAtomicOperationDescription;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesCoordinates;
+import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.tuple.Pair;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class KubernetesManifestOperationDescription extends KubernetesAtomicOperationDescription {
+public class KubernetesManifestOperationDescription
+    extends KubernetesAtomicOperationDescription<KubernetesV2Credentials> {
   private String manifestName;
   private String location;
 

diff --git a/...aker/clouddriver/kubernetes/v2/op/manifest/KubernetesRollingRestartManifestOperation.java b/...aker/clouddriver/kubernetes/v2/op/manifest/KubernetesRollingRestartManifestOperation.java
@@ -35,7 +35,7 @@ public class KubernetesRollingRestartManifestOperation implements AtomicOperatio
   public KubernetesRollingRestartManifestOperation(
       KubernetesRollingRestartManifestDescription description) {
     this.description = description;
-    this.credentials = (KubernetesV2Credentials) description.getCredentials().getCredentials();
+    this.credentials = description.getCredentials().getCredentials();
   }
 
   private static Task getTask() {

diff --git a/...ix/spinnaker/clouddriver/kubernetes/description/KubernetesAtomicOperationDescription.java b/...ix/spinnaker/clouddriver/kubernetes/description/KubernetesAtomicOperationDescription.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.netflix.spinnaker.clouddriver.deploy.DeployDescription;
+import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesCredentials;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials;
 import com.netflix.spinnaker.clouddriver.security.resources.CredentialsNameable;
 import lombok.AllArgsConstructor;
@@ -28,10 +29,10 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class KubernetesAtomicOperationDescription
+public class KubernetesAtomicOperationDescription<C extends KubernetesCredentials>
     implements DeployDescription, CredentialsNameable {
   @JsonProperty("account")
   String account;
 
-  KubernetesNamedAccountCredentials credentials;
+  KubernetesNamedAccountCredentials<C> credentials;
 }