From 5ea7278b82fb922c28d159df99323247b13c4bf6 Mon Sep 17 00:00:00 2001 From: Ali Mukadam Date: Fri, 30 Oct 2020 10:32:24 +1100 Subject: [PATCH] updated base module to temporarily disable osms so kubectl and helm can be installed (#228) --- docs/terraformoptions.adoc | 4 ++-- main.tf | 2 +- terraform.tfvars.example | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/terraformoptions.adoc b/docs/terraformoptions.adoc index dea3e5c9..20b36710 100644 --- a/docs/terraformoptions.adoc +++ b/docs/terraformoptions.adoc @@ -452,8 +452,8 @@ admission_controller_options = { |`kubernetes_version` |The version of Kubernetes to provision. This is based on the available versions in OKE. By default, the latest version is selected. The use of 'LATEST' is no longer permitted in order to facilitate upgrades. -|v1.14.8,v1.15.7, v1.16.8 -|v1.16.8 +|v1.14.8,v1.15.7, v1.16.8, v1.17.9 +|v1.17.9 |`node_pools` |The number, shape and quantities per subnets of node pools to create. Each key and tuple pair corresponds to 1 node pool. The first parameter in the tuple sets the shape of the worker node and the 2nd parameter sets the size of the node pool. A minimum of 3 worker worker nodes per node pool will be created. Refer to {uri-topology}[topology] for more thorough examples. diff --git a/main.tf b/main.tf index 6688f83b..9885e699 100644 --- a/main.tf +++ b/main.tf @@ -7,7 +7,7 @@ terraform { module "base" { source = "oracle-terraform-modules/base/oci" - version = "1.3.1" + version = "1.3.3" # general oci parameters oci_base_general = local.oci_base_general diff --git a/terraform.tfvars.example b/terraform.tfvars.example index 01e018f3..9af346dd 100644 --- a/terraform.tfvars.example +++ b/terraform.tfvars.example @@ -130,7 +130,7 @@ check_node_active = "none" dashboard_enabled = false -kubernetes_version = "v.16.8" +kubernetes_version = "v.17.9" node_pools = { np1 = ["VM.Standard.E2.2", 1]