From f18604123fbebce35263ad220f8c4b2c730f6002 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 8 Feb 2020 04:24:09 +0100
Subject: kubernetes: added workaround for encryption config

---
 roles/kubernetes/kubeadm/master/tasks/main.yml     | 22 +++++++++++-----------
 .../kubeadm/master/templates/encryption-config.j2  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'roles/kubernetes/kubeadm/master')

diff --git a/roles/kubernetes/kubeadm/master/tasks/main.yml b/roles/kubernetes/kubeadm/master/tasks/main.yml
index 9af041b2..bc238c0a 100644
--- a/roles/kubernetes/kubeadm/master/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/master/tasks/main.yml
@@ -1,15 +1,15 @@
 ---
-# - name: create direcotry for encryption config
-#   file:
-#     name: /etc/kubernetes/encryption
-#     state: directory
-#     mode: 0700
-
-# - name: install encryption config
-#   template:
-#     src: encryption-config.j2
-#     dest: /etc/kubernetes/encryption/config
-#     mode: 0600
+- name: create direcotry for encryption config
+  file:
+    name: /etc/kubernetes/encryption
+    state: directory
+    mode: 0700
+
+- name: install encryption config
+  template:
+    src: encryption-config.j2
+    dest: /etc/kubernetes/encryption/config
+    mode: 0600
 
 
 - name: install primary master
diff --git a/roles/kubernetes/kubeadm/master/templates/encryption-config.j2 b/roles/kubernetes/kubeadm/master/templates/encryption-config.j2
index 345c9bf9..b0e700b2 100644
--- a/roles/kubernetes/kubeadm/master/templates/encryption-config.j2
+++ b/roles/kubernetes/kubeadm/master/templates/encryption-config.j2
@@ -6,7 +6,7 @@ resources:
     providers:
     - secretbox:
         keys:
-{% for key in kubernetes_secrets.encryption_config_keys %}
+{% for key in kubernetes_secrets_cooked.encryption_config_keys %}
         - name: key{{ loop.index }}
           secret: {{ key }}
 {% endfor %}
-- 
cgit v1.2.3