fix: Change default Kubernetes version to v1.21.5 (#453)

Author: karthicgit

docs/terraformoptions.adoc

@@ -566,8 +566,8 @@ EOT
 
 |`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.18.10, v1.19.7, v1.19.12, v1.20.8, v1.20.11
-|v1.20.11
+|v1.19.7, v1.19.12, v1.20.8, v1.20.11,v1.21.5
+|v1.21.5
 
 |pods_cidr
 |The CIDR for the Kubernetes POD network for flannel networking. CIDR blocks for pods must not overlap with the CIDR blocks for workers and load balancer subnets (calculated using vcn_cidr, newbits and subnets parameters).

docs/upgrade.adoc

@@ -42,13 +42,13 @@ NOTE: The out-of-place method is currently the _only_ supported method of upgrad
 
 +
 ----
-kubernetes_version = "v1.20.8" 
+kubernetes_version = "v1.20.11" 
 ----
 to 
 
 +
 ----
-kubernetes_version = "v1.20.11"
+kubernetes_version = "v1.21.5"
 ----
 
 . Run terraform:
@@ -94,7 +94,7 @@ node_pools = {
 
 and run `terraform apply` again. (See note above about targeted apply). If you are using Kubernetes labels for your existing applications, you will need to ensure the new node pools also have the same labels. Refer to the `terraform.tfvars.example` file for the format to specify the labels.
 
-When node pools 3 and 4 are created, they will be created with the newer cluster version of Kubernetes. Since you have already upgrade your cluster to `v1.20.11`, node pools 3 and 4 will be running Kubernetes v1.20.11.
+When node pools 3 and 4 are created, they will be created with the newer cluster version of Kubernetes. Since you have already upgrade your cluster to `v1.21.5`, node pools 3 and 4 will be running Kubernetes v1.21.5.
 
 === Drain older nodepools
 . Set `upgrade_nodepool=true`. This will instruct the OKE cluster that some node pools will be drained.

examples/verrazzano/oke.tf

@@ -37,7 +37,7 @@ module "oke" {
   cluster_name                = "v8o"
   control_plane_type          = "private"
   control_plane_allowed_cidrs = ["0.0.0.0/0"]
-  kubernetes_version          = "v1.20.11"
+  kubernetes_version          = "v1.21.5"
   pods_cidr                   = "10.244.0.0/16"
   services_cidr               = "10.96.0.0/16"
 

terraform.tfvars.example

@@ -128,7 +128,7 @@ control_plane_type         = "private"
 control_plane_allowed_cidrs  = ["0.0.0.0/0"]
 control_plane_nsgs           = []
 dashboard_enabled            = false
-kubernetes_version           = "v1.20.11"
+kubernetes_version           = "v1.21.5"
 pods_cidr                    = "10.244.0.0/16"
 services_cidr                = "10.96.0.0/16"
 

variables.tf

@@ -446,7 +446,7 @@ variable "dashboard_enabled" {
 }
 
 variable "kubernetes_version" {
-  default     = "v1.20.11"
+  default     = "v1.21.5"
   description = "The version of kubernetes to use when provisioning OKE or to upgrade an existing OKE cluster to."
   type        = string
 }
@@ -660,35 +660,36 @@ variable "ocir_urls" {
   # Region and region codes: https://docs.cloud.oracle.com/iaas/Content/General/Concepts/regions.htm#ServiceAvailabilityAcrossRegions
   description = "The urls of ocir in the respective regions."
   default = {
-    ap-melbourne-1  = "mel.ocir.io"
-    ap-hyderabad-1  = "hyd.ocir.io"
-    ap-mumbai-1     = "bom.ocir.io"
-    ap-osaka-1      = "kix.ocir.io"
-    ap-singapore-1  = "sin.ocir.io"
-    ap-seoul-1      = "icn.ocir.io"
-    ap-chuncheon-1  = "yny.ocir.io"
-    ap-sydney-1     = "syd.ocir.io"
-    ap-tokyo-1      = "nrt.ocir.io"
-    ca-montreal-1   = "yul.ocir.io"
-    ca-toronto-1    = "yyz.ocir.io"
-    eu-amsterdam-1  = "ams.ocir.io"
-    eu-frankfurt-1  = "fra.ocir.io"
-    eu-marseille-1  = "mrs.ocir.io"
-    eu-milan-1      = "lin.ocir.io"
-    eu-stockholm-1  = "arn.ocir.io"
-    eu-zurich-1     = "zrh.ocir.io"
-    il-jerusalem-1  = "mtz.ocir.io"
-    me-abudhabi-1   = "auh.ocir.io"
-    me-dubai-1      = "dxb.ocir.io"
-    me-jeddah-1     = "jed.ocir.io"
-    sa-santiago-1   = "scl.ocir.io"
-    sa-saopaulo-1   = "gru.ocir.io"
-    sa-vinhedo-1    = "vcp.ocir.io"
-    uk-london-1     = "lhr.ocir.io"
-    uk-cardiff-1    = "cwl.ocir.io"
-    us-ashburn-1    = "iad.ocir.io"
-    us-phoenix-1    = "phx.ocir.io"
-    us-sanjose-1    = "sjc.ocir.io"
+    af-johannesburg-1 = "jnb.ocir.io"
+    ap-melbourne-1    = "mel.ocir.io"
+    ap-hyderabad-1    = "hyd.ocir.io"
+    ap-mumbai-1       = "bom.ocir.io"
+    ap-osaka-1        = "kix.ocir.io"
+    ap-singapore-1    = "sin.ocir.io"
+    ap-seoul-1        = "icn.ocir.io"
+    ap-chuncheon-1    = "yny.ocir.io"
+    ap-sydney-1       = "syd.ocir.io"
+    ap-tokyo-1        = "nrt.ocir.io"
+    ca-montreal-1     = "yul.ocir.io"
+    ca-toronto-1      = "yyz.ocir.io"
+    eu-amsterdam-1    = "ams.ocir.io"
+    eu-frankfurt-1    = "fra.ocir.io"
+    eu-marseille-1    = "mrs.ocir.io"
+    eu-milan-1        = "lin.ocir.io"
+    eu-stockholm-1    = "arn.ocir.io"
+    eu-zurich-1       = "zrh.ocir.io"
+    il-jerusalem-1    = "mtz.ocir.io"
+    me-abudhabi-1     = "auh.ocir.io"
+    me-dubai-1        = "dxb.ocir.io"
+    me-jeddah-1       = "jed.ocir.io"
+    sa-santiago-1     = "scl.ocir.io"
+    sa-saopaulo-1     = "gru.ocir.io"
+    sa-vinhedo-1      = "vcp.ocir.io"
+    uk-london-1       = "lhr.ocir.io"
+    uk-cardiff-1      = "cwl.ocir.io"
+    us-ashburn-1      = "iad.ocir.io"
+    us-phoenix-1      = "phx.ocir.io"
+    us-sanjose-1      = "sjc.ocir.io"
   }
   type = map(string)
 }