modified: modules/oke/data.tf

	modified:   modules/oke/main.tf
	modified:   modules/oke/variables.tf
	modified:   schema.yaml
	modified:   userdata/scripts/install_kubectl.sh

Author: mprestin77

modules/oke/data.tf

@@ -2,3 +2,9 @@
 data "oci_identity_availability_domains" "ads" {
   compartment_id = var.tenancy_ocid
 }
+data "oci_containerengine_cluster_option" "oke" {
+  cluster_option_id = "all"
+}
+data "oci_containerengine_node_pool_option" "oke" {
+  node_pool_option_id = "all"
+}

modules/oke/main.tf

@@ -1,6 +1,6 @@
 resource "oci_containerengine_cluster" "oke_cluster" {
   compartment_id     = var.compartment_ocid
-  kubernetes_version = var.kubernetes_version
+  kubernetes_version = (var.kubernetes_version == "Latest") ? local.cluster_k8s_latest_version : var.kubernetes_version
   name               = var.cluster_name
   vcn_id             = var.vcn_id
 
@@ -27,7 +27,7 @@ resource "oci_containerengine_cluster" "oke_cluster" {
 resource "oci_containerengine_node_pool" "oke_node_pool" {
   cluster_id         = var.create_new_oke_cluster ? oci_containerengine_cluster.oke_cluster[0].id : var.existing_oke_cluster_id
   compartment_id     = var.compartment_ocid
-  kubernetes_version = var.kubernetes_version
+  kubernetes_version = (var.kubernetes_version == "Latest") ? local.node_pool_k8s_latest_version : var.kubernetes_version
   name               = var.oke_nodepool_name
   node_shape         = var.oke_nodepool_shape
   ssh_public_key     = var.ssh_public_key

modules/oke/variables.tf

@@ -17,3 +17,7 @@ variable "ssh_public_key" {}
 variable "create_new_oke_cluster" {}
 variable "existing_oke_cluster_id" {}
 variable "cluster_endpoint_config_is_public_ip_enabled" {}
+locals {
+  cluster_k8s_latest_version   = reverse(sort(data.oci_containerengine_cluster_option.oke.kubernetes_versions))[0]
+  node_pool_k8s_latest_version = reverse(sort(data.oci_containerengine_node_pool_option.oke.kubernetes_versions))[0]
+  }

schema.yaml

@@ -146,16 +146,11 @@ variables:
     visible: create_new_oke_cluster
 
   kubernetes_version:
-    type: enum
-    enum:
-    - "v1.20.8"
-    - "v1.19.7"
-    - "v1.19.2"
-    - "v1.18.10"
+    type: string
     title: "Kubernetes Version"
     description: "Choose the version of Kubernetes to deploy"
     required: true
-    default: "v1.20.8"
+    default: "Latest"
     visible: create_new_oke_cluster
 
   cluster_name:

userdata/scripts/install_kubectl.sh

@@ -6,10 +6,10 @@
 
 #sudo yum-config-manager --enable ol7_olcne
 
-#sudo yum install -y kubectl git
+sudo yum install -y kubectl git
 
-curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${cpu_arch}/kubectl"
-sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
+#curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${cpu_arch}/kubectl"
+#sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
 
 mkdir -p ~/.kube