Skip to content

Commit 248054f

Browse files
committed
Updated default Kubernetes version to v1.20.11
Signed-off-by: Ali Mukadam <[email protected]>
1 parent eba9108 commit 248054f

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

CHANGELOG.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ All notable changes to this project are documented in this file.
77

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

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

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

56-
= 3.3.0
56+
== 3.3.0
5757

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

69-
= 3.2.0 (May 12, 2021)
69+
== 3.2.0 (May 12, 2021)
7070

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

99-
= 3.1.0 (April 6, 2021)
99+
== 3.1.0 (April 6, 2021)
100100

101101
=== Additions
102102

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

122-
= 3.0.0 (January 14, 2021)
122+
== 3.0.0 (January 14, 2021)
123123

124124
=== Additions
125125

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

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

147147
== 2.3.2 (August 19, 2020)

docs/terraformoptions.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,8 +565,8 @@ EOT
565565

566566
|`kubernetes_version`
567567
|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.
568-
|v1.18.10, v1.19.7, v1.19.12, v1.20.8
569-
|v1.20.8
568+
|v1.18.10, v1.19.7, v1.19.12, v1.20.8, v1.20.11
569+
|v1.20.11
570570

571571
|pods_cidr
572572
|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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ NOTE: The out-of-place method is currently the _only_ supported method of upgrad
3838

3939
== Upgrading the control plane nodes
4040

41-
. Locate your `kubernetes_version` in your terraform variable file and change:
41+
. Locate your `kubernetes_version` in your Terraform variable file and change:
4242

4343
+
4444
----
45-
kubernetes_version = "v1.19.12"
45+
kubernetes_version = "v1.20.8"
4646
----
4747
to
4848

4949
+
5050
----
51-
kubernetes_version = "v1.20.8"
51+
kubernetes_version = "v1.20.11"
5252
----
5353

5454
. Run terraform:
@@ -94,7 +94,7 @@ node_pools = {
9494

9595
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.
9696

97-
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
97+
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.
9898

9999
=== Drain older nodepools
100100
. Set `upgrade_nodepool=true`. This will instruct the OKE cluster that some node pools will be drained.

terraform.tfvars.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ control_plane_type = "private"
128128
control_plane_allowed_cidrs = ["0.0.0.0/0"]
129129
control_plane_nsgs = []
130130
dashboard_enabled = false
131-
kubernetes_version = "v1.20.8"
131+
kubernetes_version = "v1.20.11"
132132
pods_cidr = "10.244.0.0/16"
133133
services_cidr = "10.96.0.0/16"
134134

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ variable "dashboard_enabled" {
446446
}
447447

448448
variable "kubernetes_version" {
449-
default = "v1.20.8"
449+
default = "v1.20.11"
450450
description = "The version of kubernetes to use when provisioning OKE or to upgrade an existing OKE cluster to."
451451
type = string
452452
}

0 commit comments

Comments
 (0)