Merge branch 'master' into master

spinnaker · Nov 16, 2017 · 98aa7d2 · 98aa7d2
2 parents ec77d45 + ee77911
commit 98aa7d2
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/...y/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2SearchProvider.java b/...y/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2SearchProvider.java
@@ -61,10 +61,10 @@ public class KubernetesV2SearchProvider implements SearchProvider {
   @Autowired
   public KubernetesV2SearchProvider(KubernetesCacheUtils cacheUtils,
       KubernetesSpinnakerKindMap kindMap,
-      ObjectMapper mapper,
+      ObjectMapper objectMapper,
       KubernetesResourcePropertyRegistry registry) {
     this.cacheUtils = cacheUtils;
-    this.mapper = mapper;
+    this.mapper = objectMapper;
     this.kindMap = kindMap;
     this.registry = registry;
 

diff --git a/.../com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKind.java b/.../com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKind.java
@@ -39,7 +39,7 @@ public class KubernetesKind {
 
   private static List<KubernetesKind> values;
 
-  private KubernetesKind(String name, String alias) {
+  protected KubernetesKind(String name, String alias) {
     if (values == null) {
       values = new ArrayList<>();
     }
@@ -49,7 +49,7 @@ private KubernetesKind(String name, String alias) {
     values.add(this);
   }
 
-  private KubernetesKind(String name) {
+  protected KubernetesKind(String name) {
     this(name, null);
   }
 

diff --git a/.../netflix/spinnaker/clouddriver/kubernetes/v2/op/deployer/KubernetesDeploymentHandler.java b/.../netflix/spinnaker/clouddriver/kubernetes/v2/op/deployer/KubernetesDeploymentHandler.java
@@ -33,7 +33,14 @@
 import org.springframework.stereotype.Component;
 
 @Component
-public class KubernetesDeploymentHandler extends KubernetesHandler implements CanResize, CanDelete, CanPauseRollout, CanUndoRollout {
+public class KubernetesDeploymentHandler extends KubernetesHandler implements
+    CanResize,
+    CanDelete,
+    CanScale,
+    CanPauseRollout,
+    CanResumeRollout,
+    CanUndoRollout {
+
   @Override
   public KubernetesKind kind() {
     return KubernetesKind.DEPLOYMENT;

diff --git a/.../netflix/spinnaker/clouddriver/kubernetes/v2/op/deployer/KubernetesReplicaSetHandler.java b/.../netflix/spinnaker/clouddriver/kubernetes/v2/op/deployer/KubernetesReplicaSetHandler.java
@@ -37,7 +37,11 @@
 import java.util.Map;
 
 @Component
-public class KubernetesReplicaSetHandler extends KubernetesHandler implements CanResize, CanDelete {
+public class KubernetesReplicaSetHandler extends KubernetesHandler implements
+    CanResize,
+    CanDelete,
+    CanScale {
+
   public KubernetesReplicaSetHandler() {
     registerReplacer(
         Replacer.builder()

diff --git a/...netflix/spinnaker/clouddriver/kubernetes/v2/op/deployer/KubernetesStatefulSetHandler.java b/...netflix/spinnaker/clouddriver/kubernetes/v2/op/deployer/KubernetesStatefulSetHandler.java
@@ -30,7 +30,14 @@
 import java.util.Map;
 
 @Component
-public class KubernetesStatefulSetHandler extends KubernetesHandler implements CanResize, CanDelete, CanPauseRollout, CanUndoRollout {
+public class KubernetesStatefulSetHandler extends KubernetesHandler implements
+    CanResize,
+    CanDelete,
+    CanScale,
+    CanPauseRollout,
+    CanResumeRollout,
+    CanUndoRollout {
+
   @Override
   public KubernetesKind kind() {
     return KubernetesKind.STATEFUL_SET;