From 0652a9bec78bfc31777280bf9aff8f230ffd2b08 Mon Sep 17 00:00:00 2001
From: Jakub Scholz <www@scholzj.com>
Date: Sun, 21 Feb 2021 18:31:35 +0100
Subject: [PATCH] Update to Kubernetes 1.20.4

---
 README.md                             | 1 +
 addons/ingress.yaml                   | 2 +-
 scripts/init-aws-kubernetes-master.sh | 2 +-
 scripts/init-aws-kubernetes-node.sh   | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 43371e9..df220a9 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ AWS Kubernetes is a Kubernetes cluster deployed using [Kubeadm](https://kubernet
 
 ## Updates
 
+* *21.2.2021* Update to Kubernetes 1.20.4
 * *17.1.2021* Update to Kubernetes 1.20.2
 * *19.12.2020* Update to Kubernetes 1.20.1
 * *18.12.2020* Update to Kubernetes 1.20.0, update add-ons, move to Containerd runtime
diff --git a/addons/ingress.yaml b/addons/ingress.yaml
index 9f710d2..d911e89 100644
--- a/addons/ingress.yaml
+++ b/addons/ingress.yaml
@@ -279,7 +279,7 @@ spec:
       serviceAccountName: nginx-ingress-serviceaccount
       containers:
         - name: nginx-ingress-controller
-          image: k8s.gcr.io/ingress-nginx/controller:v0.35.0
+          image: k8s.gcr.io/ingress-nginx/controller:v0.44.0
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
diff --git a/scripts/init-aws-kubernetes-master.sh b/scripts/init-aws-kubernetes-master.sh
index 1a31874..b27f0d1 100755
--- a/scripts/init-aws-kubernetes-master.sh
+++ b/scripts/init-aws-kubernetes-master.sh
@@ -16,7 +16,7 @@ export ASG_MAX_NODES="${asg_max_nodes}"
 export AWS_REGION=${aws_region}
 export AWS_SUBNETS="${aws_subnets}"
 export ADDONS="${addons}"
-export KUBERNETES_VERSION="1.20.2"
+export KUBERNETES_VERSION="1.20.4"
 
 # Set this only after setting the defaults
 set -o nounset
diff --git a/scripts/init-aws-kubernetes-node.sh b/scripts/init-aws-kubernetes-node.sh
index 4c7dcc2..ac81302 100755
--- a/scripts/init-aws-kubernetes-node.sh
+++ b/scripts/init-aws-kubernetes-node.sh
@@ -9,7 +9,7 @@ set -o pipefail
 export KUBEADM_TOKEN=${kubeadm_token}
 export MASTER_IP=${master_private_ip}
 export DNS_NAME=${dns_name}
-export KUBERNETES_VERSION="1.20.2"
+export KUBERNETES_VERSION="1.20.4"
 
 # Set this only after setting the defaults
 set -o nounset