feat(provider/k8s): Prepare these new fileds or files for the statefu… (

#1853) * feat(provider/k8s): Prepare these new fileds or files for the statefulset. * feat(provider/k8s): Fixed change field name issue. * feat(provider/k8s): Fixed code duplication. * feat(provider/k8s): Added back replicaSetAnnotations field.
spinnaker · Aug 29, 2017 · f648c17 · f648c17
1 parent 98ec60e
commit f648c17
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 1 deletion.
diff --git a/...oovy/com/netflix/spinnaker/clouddriver/kubernetes/api/KubernetesClientApiConverter.groovy b/...oovy/com/netflix/spinnaker/clouddriver/kubernetes/api/KubernetesClientApiConverter.groovy
@@ -73,7 +73,7 @@ class KubernetesClientApiConverter {
     deployDescription.namespace = statefulSet?.metadata?.namespace
     deployDescription.targetSize = statefulSet?.spec?.replicas
     deployDescription.securityGroups = []
-    deployDescription.replicaSetAnnotations = statefulSet?.metadata?.annotations
+    deployDescription.controllerAnnotations = statefulSet?.metadata?.annotations
     deployDescription.podAnnotations = statefulSet?.spec?.template?.metadata?.annotations
     deployDescription.volumeClaims = statefulSet?.spec?.getVolumeClaimTemplates()
     deployDescription.volumeSources = statefulSet?.spec?.template?.spec?.volumes?.collect {

diff --git a/...src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/deploy/KubernetesUtil.groovy b/...src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/deploy/KubernetesUtil.groovy
@@ -34,6 +34,8 @@ class KubernetesUtil {
   static String DEPRECATED_SERVER_GROUP_KIND = "ReplicationController"
   static String SERVER_GROUP_KIND = "ReplicaSet"
   static String DEPLOYMENT_KIND = "Deployment"
+  static String CONTROLLERS_STATEFULSET_KIND = "StatefulSet"
+  static String CONTROLLERS_DAEMONSET_KIND = "DaemonSet"
   static String JOB_LABEL = "job"
   @Value("kubernetes.defaultRegistry:gcr.io")
   static String DEFAULT_REGISTRY

diff --git a/...ker/clouddriver/kubernetes/deploy/description/KubernetesAtomicOperationDescription.groovy b/...ker/clouddriver/kubernetes/deploy/description/KubernetesAtomicOperationDescription.groovy
@@ -28,4 +28,6 @@ import groovy.transform.Canonical
 class KubernetesAtomicOperationDescription implements DeployDescription, CredentialsNameable {
   String account
   KubernetesNamedAccountCredentials credentials
+  String kind
+  String apiVersion
 }
diff --git a/...bernetes/deploy/description/servergroup/DeployKubernetesAtomicOperationDescription.groovy b/...bernetes/deploy/description/servergroup/DeployKubernetesAtomicOperationDescription.groovy
@@ -40,7 +40,9 @@ class DeployKubernetesAtomicOperationDescription extends KubernetesAtomicOperati
   Capacity capacity
   KubernetesScalingPolicy scalingPolicy
   Map<String, String> replicaSetAnnotations
+  Map<String, String> controllerAnnotations
   Map<String, String> podAnnotations
+  Map<String, String> volumeAnnotations
   Map<String, String> nodeSelector
   KubernetesSecurityContext securityContext
   KubernetesDeployment deployment

diff --git a/...innaker/clouddriver/kubernetes/deploy/exception/KubernetesClientOperationException.groovy b/...innaker/clouddriver/kubernetes/deploy/exception/KubernetesClientOperationException.groovy
@@ -0,0 +1,7 @@
+package com.netflix.spinnaker.clouddriver.kubernetes.deploy.exception
+
+/**
+ * Created by chlung on 8/29/17.
+ */
+class KubernetesClientOperationException {
+}
diff --git a/...y/com/netflix/spinnaker/clouddriver/kubernetes/model/KubernetesControllerConverter.groovy b/...y/com/netflix/spinnaker/clouddriver/kubernetes/model/KubernetesControllerConverter.groovy
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2017 Cisco, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.netflix.spinnaker.clouddriver.kubernetes.model
+
+import io.fabric8.kubernetes.api.model.HasMetadata
+import io.fabric8.kubernetes.api.model.ObjectMeta
+import io.kubernetes.client.models.V1ObjectMeta
+
+class KubernetesControllerConverter implements HasMetadata {
+  String kind
+  String apiVersion
+  ObjectMeta metadata
+
+  KubernetesControllerConverter(String kind, String apiVersion, V1ObjectMeta metadata) {
+    this.kind = kind
+    this.apiVersion = apiVersion
+
+    this.metadata = new ObjectMeta()
+    this.metadata.name = metadata.name
+    this.metadata.namespace = metadata.namespace
+    setMetadata(this.metadata)
+  }
+
+  @Override
+  ObjectMeta getMetadata() {
+    return this.metadata
+  }
+
+  @Override
+  void setMetadata(ObjectMeta metadata) {
+    this.metadata = metadata
+  }
+
+  @Override
+  String getKind() {
+    return this.kind
+  }
+
+  @Override
+  String getApiVersion() {
+    return this.apiVersion
+  }
+}
+