Merge pull request #11 from dataiku/task/named-secondary-ranges

add ability to use named secondary ranges

Author: FChataigner

python-clusters/create-gke-cluster/cluster.json

@@ -64,15 +64,15 @@
         {
             "name": "podIpRange",
             "label": "Pod IP range",
-            "description": "Use CIDR block/mask notation, e.g. 10.0.0.0/21 or /21",
+            "description": "Range name or CIDR block/mask notation, e.g. 10.0.0.0/21 or /21. If using a named range, ensure it is larger than /21.",
             "type": "STRING",
             "mandatory": false,
             "visibilityCondition": "model.isVpcNative"
         },
         {
             "name": "svcIpRange",
             "label": "Service IP range",
-            "description": "Use CIDR block/mask notation, e.g. 10.0.0.0/24 or /24. MUST be different from pod IP range.",
+            "description": "Range name or CIDR block/mask notation, e.g. 10.0.0.0/24 or /24. MUST be different from pod IP range.",
             "type": "STRING",
             "mandatory": false,
             "visibilityCondition": "model.isVpcNative"

python-lib/dku_google/clusters.py

@@ -220,6 +220,8 @@ def with_labels(self, labels={}):
     def with_vpc_native_settings(self, is_vpc_native, pod_ip_range, svc_ip_range):
         if is_vpc_native:
             self.is_vpc_native = is_vpc_native
+            if pod_ip_range is not None and len(pod_ip_range) > 0 and pod_ip_range == svc_ip_range:
+                raise Exception("Service IP range must be different from pod IP range")
             self.pod_ip_range = pod_ip_range
             self.svc_ip_range = svc_ip_range
         return self
@@ -269,10 +271,18 @@ def build(self):
         if self.is_vpc_native:
             ip_allocation_policy = {
                 "createSubnetwork": False,
-                "useIpAliases": True,
-                "servicesIpv4CidrBlock": cluster_svc_ip_range,
-                "clusterIpv4CidrBlock": cluster_pod_ip_range,
+                "useIpAliases": True
             }
+            if re.match('[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/[0-9]+', cluster_svc_ip_range):
+                ip_allocation_policy["servicesIpv4CidrBlock"] = cluster_svc_ip_range
+            elif cluster_svc_ip_range is not None and len(cluster_svc_ip_range) > 0:
+                # assume it's an existing range name (shared VPC case)
+                ip_allocation_policy["servicesSecondaryRangeName"] = cluster_svc_ip_range
+            if re.match('[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/[0-9]+', cluster_pod_ip_range):
+                ip_allocation_policy["clusterIpv4CidrBlock"] = cluster_pod_ip_range
+            elif cluster_pod_ip_range is not None and len(cluster_pod_ip_range) > 0:
+                # assume it's an existing range name (shared VPC case)
+                ip_allocation_policy["clusterSecondaryRangeName"] = cluster_pod_ip_range
             create_cluster_request_body["cluster"]["ipAllocationPolicy"] = ip_allocation_policy
 
         if self.legacy_auth: