Skip to content

Commit

Permalink
Updated default Kubernetes version to v1.20.11
Browse files Browse the repository at this point in the history
Signed-off-by: Ali Mukadam <[email protected]>
  • Loading branch information
hyder committed Oct 25, 2021
1 parent eba9108 commit 248054f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
14 changes: 7 additions & 7 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ All notable changes to this project are documented in this file.

The format is based on {uri-changelog}[Keep a Changelog].

= 4.0.0
== 4.0.0
=== Breaking changes
* Set minimum version to Terraform 1.0.0
* Removed base module and use vcn, bastion and operator modules directly
Expand All @@ -23,7 +23,7 @@ The format is based on {uri-changelog}[Keep a Changelog].
* Changed from security list to NSGs for better flexibility and security (#398)

=== Changes
* Changed default Kubernetes version to v1.20.8 and removed v1.16.8, v1.17.9 from docs.
* Changed default Kubernetes version to v1.20.11 and removed v1.16.8, v1.17.9 from docs.
* Added support for GPU and ARM shapes (#302)
* VCN module upgraded to VCN 3.0.0. This allows supporting multiple cidr blocks (#360)
* Bastion and operator sub-modules upgraded to 3.0.0 (#183)
Expand Down Expand Up @@ -53,7 +53,7 @@ The format is based on {uri-changelog}[Keep a Changelog].
** Create the cluster along with the VCN and other resources without WAF enabled by setting `enable_waf=false`
** Subsequently enable WAF by setting `enable_waf=true`

= 3.3.0
== 3.3.0

=== Additions
* Support for using reserved public IP address for NAT Gateway (#311) with new parameter nat_gateway_public_ip_id
Expand All @@ -66,7 +66,7 @@ The format is based on {uri-changelog}[Keep a Changelog].
=== Bug fixes
* Use correct manifest to install Calico as policy (#306)

= 3.2.0 (May 12, 2021)
== 3.2.0 (May 12, 2021)

=== Additions
* Added faster kubectl script (Thanks @joelezell-conga, @rgmccaw, Richard Exley)
Expand Down Expand Up @@ -96,7 +96,7 @@ The format is based on {uri-changelog}[Keep a Changelog].
=== Deletions
Removed hardcoded WAF CIDRs and used data source instead.

= 3.1.0 (April 6, 2021)
== 3.1.0 (April 6, 2021)

=== Additions

Expand All @@ -119,7 +119,7 @@ Removed hardcoded WAF CIDRs and used data source instead.
* Removed deprecated helm repos
* Removed tenancy_name

= 3.0.0 (January 14, 2021)
== 3.0.0 (January 14, 2021)

=== Additions

Expand All @@ -141,7 +141,7 @@ Removed hardcoded WAF CIDRs and used data source instead.
* Updated default Kubernetes module to 1.18.10
* Updated and simplified Calico installation (#253)

= 2.3.3 (October 30, 2020)
== 2.3.3 (October 30, 2020)
* Upgraded base module to 1.3.3 to temporarily disable OSMS as fix for #225

== 2.3.2 (August 19, 2020)
Expand Down
4 changes: 2 additions & 2 deletions docs/terraformoptions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,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.8
|v1.18.10, v1.19.7, v1.19.12, v1.20.8, v1.20.11
|v1.20.11

|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).
Expand Down
8 changes: 4 additions & 4 deletions docs/upgrade.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ NOTE: The out-of-place method is currently the _only_ supported method of upgrad

== Upgrading the control plane nodes

. Locate your `kubernetes_version` in your terraform variable file and change:
. Locate your `kubernetes_version` in your Terraform variable file and change:

+
----
kubernetes_version = "v1.19.12"
kubernetes_version = "v1.20.8"
----
to

+
----
kubernetes_version = "v1.20.8"
kubernetes_version = "v1.20.11"
----

. Run terraform:
Expand Down Expand Up @@ -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.8`, node pools 3 and 4 will be running Kubernetes v1.20.8
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.

=== Drain older nodepools
. Set `upgrade_nodepool=true`. This will instruct the OKE cluster that some node pools will be drained.
Expand Down
2 changes: 1 addition & 1 deletion terraform.tfvars.example
Original file line number Diff line number Diff line change
Expand Up @@ -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.8"
kubernetes_version = "v1.20.11"
pods_cidr = "10.244.0.0/16"
services_cidr = "10.96.0.0/16"

Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ variable "dashboard_enabled" {
}

variable "kubernetes_version" {
default = "v1.20.8"
default = "v1.20.11"
description = "The version of kubernetes to use when provisioning OKE or to upgrade an existing OKE cluster to."
type = string
}
Expand Down

0 comments on commit 248054f

Please sign in to comment.