From 202362ffc8d73e24951029130b0faecc65d043b4 Mon Sep 17 00:00:00 2001
From: Jakub Scholz <www@scholzj.com>
Date: Sat, 20 Jun 2020 21:12:57 +0200
Subject: [PATCH] Update to Kubernetes 1.18.4, Update Kubernetes Dashboard to
 2.0.2

---
 README.md                             | 1 +
 addons/dashboard.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 9d7367a..0ca6b2a 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ AWS Kubernetes is a Kubernetes cluster deployed using [Kubeadm](https://kubernet
 
 ## Updates
 
+* *20.6.2020* Update to Kubernetes 1.18.4, Update Kubernetes Dashboard to 2.0.2
 * *26.4.2020* Update to Kubernetes 1.18.2, Update Kubernetes Dashboard to 2.0.0
 * *12.4.2020* Update to Kubernetes 1.18.1
 * *29.3.2020* Update to Kubernetes 1.18.0, update Dashboard and External DNS addons
diff --git a/addons/dashboard.yaml b/addons/dashboard.yaml
index cb868bb..f7ad9f4 100644
--- a/addons/dashboard.yaml
+++ b/addons/dashboard.yaml
@@ -119,7 +119,7 @@ spec:
     spec:
       containers:
         - name: kubernetes-dashboard
-          image: kubernetesui/dashboard:v2.0.0
+          image: kubernetesui/dashboard:v2.0.2
           imagePullPolicy: Always
           ports:
             - containerPort: 8443
diff --git a/scripts/init-aws-kubernetes-master.sh b/scripts/init-aws-kubernetes-master.sh
index 3d45ff4..32dcfa0 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.18.2"
+export KUBERNETES_VERSION="1.18.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 0807dba..c7de832 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.18.2"
+export KUBERNETES_VERSION="1.18.4"
 
 # Set this only after setting the defaults
 set -o nounset