From 2c4e6b65d7b43d787fbe1a3f628fa670b3eeae5d Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Wed, 30 Oct 2019 11:56:52 +0300
Subject: [PATCH] Raise delay and retry for rotate tokens (#5304)

Change-Id: I87844b43b9a18064e7a99567ce57c1ca1ffcc4a8
---
 roles/kubernetes-apps/rotate_tokens/tasks/main.yml  | 4 ++--
 roles/network_plugin/calico/files/make-ssl-typha.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/kubernetes-apps/rotate_tokens/tasks/main.yml b/roles/kubernetes-apps/rotate_tokens/tasks/main.yml
index 59886c0bb..347d1b4c2 100644
--- a/roles/kubernetes-apps/rotate_tokens/tasks/main.yml
+++ b/roles/kubernetes-apps/rotate_tokens/tasks/main.yml
@@ -4,8 +4,8 @@
   register: default_token
   changed_when: false
   until: default_token.rc == 0
-  delay: 1
-  retries: 5
+  delay: 4
+  retries: 10
 
 - name: Rotate Tokens | Get default token data
   command: "{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf get secrets {{ default_token.stdout }} -ojson"
diff --git a/roles/network_plugin/calico/files/make-ssl-typha.sh b/roles/network_plugin/calico/files/make-ssl-typha.sh
index 67567e9ff..783eb1816 100644
--- a/roles/network_plugin/calico/files/make-ssl-typha.sh
+++ b/roles/network_plugin/calico/files/make-ssl-typha.sh
@@ -59,7 +59,7 @@ tmpdir=$(mktemp -d /tmp/calico_typha_certs.XXXXXX)
 trap 'rm -rf "${tmpdir}"' EXIT
 cd "${tmpdir}"
 
-mkdir -p "${SSLDIR} ${CADIR}"
+mkdir -p ${SSLDIR} ${CADIR}
 
 # Root CA
 if [ -e "$CADIR/ca.key" ]; then