add support for specifying machine_type and cluster_version when using cluster.py to create a GKE cluster

Author: carolynhu

examples/v2/gke/README.md

@@ -18,9 +18,11 @@ When ready, deploy with the following command:
 
     NAME="your-name"
     ZONE="your-zone"
+    CLUSTER_VERSION="your-cluster-version"
+    MACHINE_TYPE="your-machine-type"
     gcloud deployment-manager deployments create ${NAME} \
     --template cluster.py \
-    --properties zone:${ZONE}
+    --properties zone:${ZONE},clusterVersion:${CLUSTER_VERSION},machineType:${MACHINE_TYPE}
 
 This will result in two resources:
 

examples/v2/gke/python/cluster.py

@@ -36,8 +36,10 @@ def GenerateConfig(context):
               'zone': context.properties['zone'],
               'cluster': {
                   'name': cluster_name,
+                  'initialClusterVersion': context.properties['clusterVersion'],
                   'initialNodeCount': context.properties['initialNodeCount'],
                   'nodeConfig': {
+                      'machineType': context.properties['machineType'],
                       'oauthScopes': [
                           'https://www.googleapis.com/auth/' + s
                           for s in [

examples/v2/gke/python/cluster.py.schema

@@ -28,6 +28,12 @@ properties:
   zone:
     type: string
     description: Zone in which the cluster should run.
+  clusterVersion:
+    type: string
+    description: The initial Kubernetes version for this cluster.
+  machineType:
+    type: string
+    description: A set of virtualized hardware resources available to VM instance.
   initialNodeCount:
     type: integer
     description: Initial number of nodes desired in the cluster.

examples/v2/gke/python/cluster.yaml

@@ -20,4 +20,6 @@ resources:
   type: cluster.py
   properties:
     zone: ZONE_TO_RUN
+    clusterVersion: CLUSTER_VERSION
+    machineType: MACHINE_TYPE