Skip to content

Commit

Permalink
updated base module to temporarily disable osms so kubectl and helm c…
Browse files Browse the repository at this point in the history
…an be installed (#228)
  • Loading branch information
hyder authored Oct 29, 2020
1 parent fe54d9e commit 5ea7278
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docs/terraformoptions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion terraform.tfvars.example
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 5ea7278

Please sign in to comment.