From ddb03c153e68c4dbf3d47cc8e6886cef4162bafe Mon Sep 17 00:00:00 2001
From: Adrien <adrien@reslinger.net>
Date: Sat, 12 Dec 2020 00:54:16 +0100
Subject: [PATCH] Update to lastest version 2.1.0

---
 bin/update.sh                              |  5 ++--
 files/kubernetes-dashboard-Deployment.yaml |  2 +-
 tasks/main.yml                             | 31 +++++++++++-----------
 vars/dashboard-files.yaml                  | 16 +++++++++++
 4 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 vars/dashboard-files.yaml

diff --git a/bin/update.sh b/bin/update.sh
index 11738bf..15b2337 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
-wget https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.5/aio/deploy/recommended.yaml
+wget https://raw.githubusercontent.com/kubernetes/dashboard/v2.1.0/aio/deploy/recommended.yaml
 kubernetes-split-yaml recommended.yaml > generated.log
 mv generated/*.yaml files/
-cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)|      - "\2"|'
+echo -e "---\ndashboard_files_list:" > vars/dashboard-files.yaml
+cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)|  - "\2"|' >> vars/dashboard-files.yaml
 rm -fr generated generated.log recommended.yaml
 
diff --git a/files/kubernetes-dashboard-Deployment.yaml b/files/kubernetes-dashboard-Deployment.yaml
index f6e0af0..f346bb9 100644
--- a/files/kubernetes-dashboard-Deployment.yaml
+++ b/files/kubernetes-dashboard-Deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: kubernetes-dashboard
-          image: kubernetesui/dashboard:v2.0.5
+          image: kubernetesui/dashboard:v2.1.0
           imagePullPolicy: Always
           ports:
             - containerPort: 8443
diff --git a/tasks/main.yml b/tasks/main.yml
index eaffa2f..98fdb79 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,20 @@
 - name: Dashboard setup
   block:
+  - name: Include file list
+    include_vars: "dashboard-files.yaml"
+
+  - name: namespace
+    k8s:
+      state: present
+      context: "{{ my_context }}"
+      merge_type: merge
+      definition:
+        api_version: v1
+        kind: Namespace
+        metadata:
+          name: kubernetes-dashboard
+          labels:
+            namespace: 'kubernetes-dashboard'
   - name: dashboard install
     k8s:
       state: present
@@ -7,25 +22,11 @@
       merge_type: merge
       resource_definition: "{{ lookup('file', item) | from_yaml }}"
     with_items:
-      - "kubernetes-dashboard-Namespace.yaml"
       - NetworkPolicies/default-deny-ingress.yaml
       - NetworkPolicies/allow-from-namespace.yaml
-      - "kubernetes-dashboard-ServiceAccount.yaml"
-      - "kubernetes-dashboard-Service.yaml"
-      - "kubernetes-dashboard-certs-Secret.yaml"
-      - "kubernetes-dashboard-csrf-Secret.yaml"
-      - "kubernetes-dashboard-key-holder-Secret.yaml"
-      - "kubernetes-dashboard-settings-ConfigMap.yaml"
-      - "kubernetes-dashboard-Role.yaml"
-      - "kubernetes-dashboard-ClusterRole.yaml"
-      - "kubernetes-dashboard-RoleBinding.yaml"
-      - "kubernetes-dashboard-ClusterRoleBinding.yaml"
-      - "kubernetes-dashboard-Deployment.yaml"
-      - "dashboard-metrics-scraper-Service.yaml"
-      - "dashboard-metrics-scraper-Deployment.yaml"
       - traefik/dashboard-traefik-auth-sa.yaml
       - traefik/dashboard-traefik-auth-crb.yaml
-
+      - "{{ dashboard_files_list }}"
   - name: get the dashboard-token secret name
     command: kubectl --context {{ my_context }} get sa kubernetes-dashboard-traefik -n kubernetes-dashboard -o jsonpath='{.secrets[0].name}'
     register: secret_name
diff --git a/vars/dashboard-files.yaml b/vars/dashboard-files.yaml
new file mode 100644
index 0000000..8cb41f7
--- /dev/null
+++ b/vars/dashboard-files.yaml
@@ -0,0 +1,16 @@
+---
+dashboard_files_list:
+  - "kubernetes-dashboard-Namespace.yaml"
+  - "kubernetes-dashboard-ServiceAccount.yaml"
+  - "kubernetes-dashboard-Service.yaml"
+  - "kubernetes-dashboard-certs-Secret.yaml"
+  - "kubernetes-dashboard-csrf-Secret.yaml"
+  - "kubernetes-dashboard-key-holder-Secret.yaml"
+  - "kubernetes-dashboard-settings-ConfigMap.yaml"
+  - "kubernetes-dashboard-Role.yaml"
+  - "kubernetes-dashboard-ClusterRole.yaml"
+  - "kubernetes-dashboard-RoleBinding.yaml"
+  - "kubernetes-dashboard-ClusterRoleBinding.yaml"
+  - "kubernetes-dashboard-Deployment.yaml"
+  - "dashboard-metrics-scraper-Service.yaml"
+  - "dashboard-metrics-scraper-Deployment.yaml"