Merge pull request #203 from couchbase-partners/GCP-Custom-Network

Gcp custom network
couchbase-partners · Jun 18, 2024 · b5b0084 · b5b0084
2 parents 238de8f + 5e70450
commit b5b0084
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 8 deletions.
diff --git a/gcp/couchbase-server/couchbase.py b/gcp/couchbase-server/couchbase.py
@@ -49,17 +49,21 @@ def generate_config(context):
         'type': './resources/firewall_rule.py',
         'properties': {
             'nameSuffix': suffix,
-            'accessCIDR': context.properties['accessCIDR']
+            'accessCIDR': context.properties['accessCIDR'],
+            'network': context.properties['network']
         }
     }
     resources.append(firewallRule)
+    subnetwork = None
+    if 'subnetwork' in context.properties:
+        subnetwork = context.properties['subnetwork']
     bootDiskImage = 'projects/couchbase-public/global/images/' + context.properties['imageName']
     instanceTemplate = {
         'name': 'cb-server-instance-template-{}'.format(suffix),
         'type': './resources/instance_template.py',
         'properties': {
             'nameSuffix': suffix,
-            'network': 'default',
+            'network': context.properties['network'],
             'serverVersion': context.properties['serverVersion'],
             'runtimeConfigName': '$(ref.{}.runtimeConfigName)'.format(config['name']),
             'networkTag': '$(ref.{}.ruleTag)'.format(firewallRule['name']),
@@ -72,6 +76,8 @@ def generate_config(context):
             "dependsOn": [ ]
         }
     }
+    if subnetwork != None:
+        instanceTemplate['properties']['subnetwork'] = subnetwork
     resources.append(instanceTemplate)
     managedInstanceGroup = {
         'name': 'cb-server-instance-group-{}'.format(suffix),

diff --git a/gcp/couchbase-server/resources/firewall_rule.py b/gcp/couchbase-server/resources/firewall_rule.py
@@ -3,6 +3,8 @@ def generate_config(context):
     # All required parameters defined in the schema will be present on the context object.  This must return a
     # python dict with a structure that matches the API items found
     network = context.properties['network']
+    if isinstance(network, list):
+        network = network[0]
     suffix = context.properties['nameSuffix']
     project = context.env['project']
     sourceCidr = context.properties['accessCIDR']

diff --git a/gcp/couchbase-server/resources/firewall_rule.py.schema b/gcp/couchbase-server/resources/firewall_rule.py.schema
@@ -5,8 +5,15 @@ properties:
   nameSuffix:
     type: string
   network:
-    type: string
-    default: default
+    type: array
+    default: [default]
+    minItems: 1
+    maxItems: 8
+    x-googleProperty:
+      type: GCE_NETWORK
+      gceNetwork:
+        allowSharedVpcs: True
+        machineTypeProperty: serverNodeType
   accessCIDR:
     type: string
     default: 0.0.0.0/0

diff --git a/gcp/couchbase-server/resources/instance_template.py b/gcp/couchbase-server/resources/instance_template.py
@@ -6,7 +6,13 @@ def generate_config(context):
     outputs = []
     project = context.env['project']
     network = context.properties['network']
-    network = 'projects/{}/global/networks/{}'.format(project, network)
+    if isinstance(network, list):
+         network = network[0]
+    if network == "default":
+            network = 'projects/{}/global/networks/{}'.format(project, network)
+    subnetwork = None
+    if 'subnetwork' in context.properties:
+        subnetwork = context.properties['subnetwork']
     networkTag = context.properties['networkTag']
     suffix = context.properties['nameSuffix']
     serverInstanceType = context.properties['serverInstanceType']
@@ -83,7 +89,8 @@ def generate_config(context):
         }
     }
 
-
+    if subnetwork != None:
+        instanceTemplate['properties']['properties']['networkInterfaces'][0]['subnetwork'] = subnetwork
 
     resources.append(instanceTemplate)
     outputs.append({

diff --git a/gcp/couchbase-server/resources/instance_template.py.schema b/gcp/couchbase-server/resources/instance_template.py.schema
@@ -5,8 +5,24 @@ properties:
   nameSuffix:
     type: string
   network:
-    type: string
-    default: default
+    type: array
+    default: [default]
+    minItems: 1
+    maxItems: 8
+    x-googleProperty:
+      type: GCE_NETWORK
+      gceNetwork:
+        allowSharedVpcs: True
+        machineTypeProperty: serverNodeType
+  subnetwork:
+    type: array
+    minItems: 1
+    maxItems: 8
+    x-googleProperty:
+      type: GCE_SUBNETWORK
+      zoneProperty: defaultZone
+      gceSubnetwork:
+        networkProperty: network
   serverVersion:
     type: string
     default: 7.6.0