From 6334e4bd84b03d144fb273151e2d8ca928d3eaa5 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Thu, 18 Feb 2021 14:35:07 +0100
Subject: [PATCH] Set Kubernetes default version to 1.20.4

---
 Dockerfile                                              | 2 +-
 README.md                                               | 2 +-
 inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml | 2 +-
 roles/kubespray-defaults/defaults/main.yaml             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cc706a7f9..3ac614ea9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Use imutable image tags rather than mutable tags (like ubuntu:18.04)
 FROM ubuntu:bionic-20200807
 
-ENV KUBE_VERSION=v1.20.2
+ENV KUBE_VERSION=v1.20.4
 
 RUN mkdir /kubespray
 WORKDIR /kubespray
diff --git a/README.md b/README.md
index d9b2068c0..1b97412c1 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,7 @@ Note: Upstart/SysV init based OS types are not supported.
 ## Supported Components
 
 - Core
-  - [kubernetes](https://github.com/kubernetes/kubernetes) v1.20.2
+  - [kubernetes](https://github.com/kubernetes/kubernetes) v1.20.4
   - [etcd](https://github.com/coreos/etcd) v3.4.13
   - [docker](https://www.docker.com/) v19.03 (see note)
   - [containerd](https://containerd.io/) v1.3.9
diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
index c0b118649..24a3e650c 100644
--- a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
@@ -17,7 +17,7 @@ kube_token_dir: "{{ kube_config_dir }}/tokens"
 kube_api_anonymous_auth: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.20.2
+kube_version: v1.20.4
 
 # Where the binaries will be downloaded.
 # Note: ensure that you've enough disk space (about 1G)
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index b63b7e892..61e713858 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -15,7 +15,7 @@ is_fedora_coreos: false
 disable_swap: true
 
 ## Change this to use another Kubernetes version, e.g. a current beta release
-kube_version: v1.20.2
+kube_version: v1.20.4
 
 ## The minimum version working
 kube_version_min_required: v1.18.0