fixes #506 (#511)

Co-authored-by: mservidio <[email protected]>
GoogleCloudPlatform · Jun 7, 2021 · 0f5737a · 0f5737a
1 parent 400c1eb
commit 0f5737a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/marketplace/releases/RELEASE_NOTES_VM_SOLUTION.md b/marketplace/releases/RELEASE_NOTES_VM_SOLUTION.md
@@ -1,5 +1,15 @@
 # Google Cloud Platform Release Notes for Marketplace VM Solution
 
+## 0.7.0 Release Notes
+* Build - 6/3/2021
+
+### Datashare
+* Kubernetes cluster version is 1.18 
+  * https://cloud.google.com/kubernetes-engine/docs/release-notes
+
+### Updates  
+* N/A
+
 ## 0.6.8 Release Notes
 * Build - 4/19/2021
 

diff --git a/marketplace/releases/datashare-marketplace-vm-solution-v0.7.0.zip b/marketplace/releases/datashare-marketplace-vm-solution-v0.7.0.zip
diff --git a/marketplace/vm-solution/cluster.py b/marketplace/vm-solution/cluster.py
@@ -23,7 +23,8 @@ def GenerateConfig(context):
   cluster_name = 'datashare-cluster-resource'
   acutal_cluster_name = 'datashare'
   # type_name = name_prefix + '-type'
-  cluster_version = '1.16'
+  cluster_version_num = context.properties['clusterVersion']
+  cluster_version = '' + str(cluster_version_num) + ''
   workload_pool = context.env['project'] + '.svc.id.goog'
   machine_type = 'e2-standard-2'
 
@@ -38,7 +39,7 @@ def GenerateConfig(context):
               'zone': context.properties['zone'],
               'cluster': {
                   'name': acutal_cluster_name,
-                  'initialClusterVersion': cluster_version,
+                  'initialClusterVersion': '' + cluster_version + '',
                   'initialNodeCount': 3,
                   'ipAllocationPolicy': {
                       'useIpAliases': True,

diff --git a/marketplace/vm-solution/cluster.py.schema b/marketplace/vm-solution/cluster.py.schema
@@ -31,7 +31,7 @@ properties:
   clusterVersion:
     type: string
     description: Initial number of nodes desired in the cluster.
-    default: "1.16"
+    default: "1.18"
   initialNodeCount:
     type: integer
     description: Initial number of nodes desired in the cluster.

diff --git a/marketplace/vm-solution/datashare-vm.jinja b/marketplace/vm-solution/datashare-vm.jinja
@@ -35,7 +35,7 @@ imports:
 {% set useRuntimeConfigWaiterValue = properties["useRuntimeConfigWaiter"] %}
 {% set deployApiToGkeValue = properties["deployApiToGke"] %}
 {% set gkeZone = properties["input_gkeZone"] %}
-{% set clusterVersion = "1.16" %}
+{% set clusterVersion = "1.18" + "" %}
 {% set gkeClusterName = "datashare" %}
 {% set waiterName = env["deployment"] + "-startup-waiter" %}
 {% set configName = env["deployment"] + "-startup-config" %}