kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Raise delay and retry for rotate tokens (#5304) 

Change-Id: I87844b43b9a18064e7a99567ce57c1ca1ffcc4a8
pull/5310/head
Matthew Mosesohn 2019-10-30 11:56:52 +03:00 committed by Kubernetes Prow Robot
parent 108a6297e9
commit 2c4e6b65d7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes-apps/rotate_tokens/tasks/main.yml
View File

@ -4,8 +4,8 @@
register: default_token register: default_token
changed_when: false changed_when: false
until: default_token.rc == 0 until: default_token.rc == 0
delay: 1 delay: 4
retries: 5 retries: 10
- name: Rotate Tokens | Get default token data - name: Rotate Tokens | Get default token data
command: "{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf get secrets {{ default_token.stdout }} -ojson" command: "{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf get secrets {{ default_token.stdout }} -ojson"

2
roles/network_plugin/calico/files/make-ssl-typha.sh
View File

@ -59,7 +59,7 @@ tmpdir=$(mktemp -d /tmp/calico_typha_certs.XXXXXX)
trap 'rm -rf "${tmpdir}"' EXIT trap 'rm -rf "${tmpdir}"' EXIT
cd "${tmpdir}" cd "${tmpdir}"
mkdir -p "${SSLDIR} ${CADIR}" mkdir -p ${SSLDIR} ${CADIR}
# Root CA # Root CA
if [ -e "$CADIR/ca.key" ]; then if [ -e "$CADIR/ca.key" ]; then