Improve the Swarm template

 + Improve the firewall configuration
   + Give better names to the rules
   + Open internal UDP traffic
   + Simplify the http rule configuration
 + Automatically create subnetworks
 + Support Different machine types for workers/manager
 + Support Preemptible workers

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

gcp/README.md

@@ -29,7 +29,6 @@ make revoke
  + Monitoring
  + Configure project
  + Multiple managers
- + Different machine types for workers and managers
  + SSH keys
  + Additional swarm properties
  + Publish the templates
@@ -40,4 +39,3 @@ make revoke
  + Have each worker increment a counter to be able to wait from outside
  + Manager pool
  + Diagnostics
- + Option to use preemptible VMs

gcp/configuration/templates/firewall.py

@@ -6,38 +6,39 @@ def GenerateConfig(context):
   network = '$(ref.' + context.properties['network'] + '.selfLink)'
 
   resources = [{
-      'name': 'ssh',
+      'name': 'allow-ssh',
       'type': 'compute.v1.firewall',
       'properties': {
           'network': network,
           'sourceRanges': ['0.0.0.0/0'],
           'allowed': [{
-              'IPProtocol': 'TCP',
-              'ports': [22]
+              'IPProtocol': 'tcp',
+              'ports': ['22']
           }]
       }
   },{
-      'name': 'http',
+      'name': 'allow-http',
       'type': 'compute.v1.firewall',
       'properties': {
           'network': network,
           'sourceRanges': ['0.0.0.0/0'],
           'allowed': [{
-              'IPProtocol': 'TCP',
-              'ports': [80]
-          },{
-              'IPProtocol': 'TCP',
-              'ports': [443]
+              'IPProtocol': 'tcp',
+              'ports': ['80', '443']
           }]
       }
   },{
-      'name': 'internal',
+      'name': 'allow-internal',
       'type': 'compute.v1.firewall',
       'properties': {
           'network': network,
-          'sourceTags': ['swarm'],
+          'sourceRanges': ['10.128.0.0/9'],
           'allowed': [{
-              'IPProtocol': 'TCP'
+              'IPProtocol': 'tcp',
+              "ports": ['0-65535']
+          },{
+              'IPProtocol': 'udp',
+              "ports": ['0-65535']
           }]
       }
   }]

gcp/configuration/templates/network.py

@@ -7,7 +7,7 @@ def GenerateConfig(context):
       'name': context.env['name'],
       'type': 'compute.v1.network',
       'properties': {
-          'IPv4Range': '10.0.0.1/16'
+          'autoCreateSubnetworks': True
       }
   }]
   return {'resources': resources}

gcp/configuration/templates/swarm.py

@@ -4,7 +4,9 @@
 
 def GenerateConfig(context):
   zone = context.properties['zone']
-  machineType = context.properties['machineType']
+  managerMachineType = context.properties['managerMachineType']
+  workerMachineType = context.properties['workerMachineType']
+  preemptible = context.properties['preemptible']
   size = context.properties['size']
 
   resources = [{
@@ -15,7 +17,7 @@ def GenerateConfig(context):
       'type': 'templates/manager.py',
       'properties': {
           'zone': zone,
-          'machineType': machineType,
+          'machineType': managerMachineType,
           'image': '$(ref.docker.selfLink)',
           'network': 'swarm-network'
       }
@@ -24,7 +26,8 @@ def GenerateConfig(context):
       'type': 'templates/worker.py',
       'properties': {
           'zone': zone,
-          'machineType': machineType,
+          'machineType': workerMachineType,
+          'preemptible': preemptible,
           'image': '$(ref.docker.selfLink)',
           'network': 'swarm-network',
           'managerIP': '$(ref.manager.internalIP)'

gcp/configuration/templates/swarm.py.schema

@@ -16,7 +16,17 @@ properties:
     default: europe-west1-d
     description: Zone
 
-  machineType:
+  managerMachineType:
+    type: string
+    default: g1-small
+    description: Manager machine type
+
+  workerMachineType:
     type: string
     default: g1-small
     description: Worker machine type
+
+  preemptible:
+    type: boolean
+    default: False
+    description: Are workers preemptible?

gcp/configuration/templates/worker.py

@@ -8,6 +8,7 @@ def GenerateConfig(context):
   project = context.env['project']
   zone = context.properties['zone']
   machineType = context.properties['machineType']
+  preemptible = context.properties['preemptible']
   image = context.properties['image']
   managerIP = context.properties['managerIP']
   network = '$(ref.' + context.properties['network'] + '.selfLink)'
@@ -65,7 +66,7 @@ def GenerateConfig(context):
                   }]
               },
               'scheduling': {
-                  'preemptible': False,
+                  'preemptible': preemptible,
                   'onHostMaintenance': 'TERMINATE',
                   'automaticRestart': False
               },