Skip to content

Commit 1a65b6c

Browse files
committed
Update token lifetime and update variable once token rotated
1 parent 4156cf3 commit 1a65b6c

File tree

3 files changed

+26
-4
lines changed

3 files changed

+26
-4
lines changed

script/install-cni.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ source lib.sh
1717

1818
# -------------------Generate a "kube-config"
1919
generateKubeConfig
20+
export LAST_SERVICEACCOUNT_MD5SUM="$(get_token_md5sum)"
21+
if ! [ "$SKIP_TLS_VERIFY" == "true" ]; then
22+
export LAST_KUBE_CA_FILE_MD5SUM="$(get_ca_file_md5sum)"
23+
fi
2024
# ------------------ end Generate a "kube-config"
2125

2226
# ----------------- Generate a whereabouts conf

script/lib.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,15 @@ function generateWhereaboutsConf {
107107
EOF
108108

109109
}
110+
111+
function get_token_md5sum {
112+
md5sum "$SERVICE_ACCOUNT_TOKEN_PATH" | awk '{print $1}'
113+
}
114+
115+
function get_ca_file_md5sum {
116+
if [ ! -f "$KUBE_CA_FILE" ]; then
117+
echo ""
118+
return
119+
fi
120+
md5sum "$KUBE_CA_FILE" | awk '{print $1}'
121+
}

script/token-watcher.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@ echo "Sleep and Watching for service account token and CA file changes..."
99
while true; do
1010
# Check the md5sum of the service account token and ca.
1111
svcaccountsum=$(md5sum $SERVICE_ACCOUNT_TOKEN_PATH | awk '{print $1}')
12-
casum=$(md5sum $KUBE_CA_FILE | awk '{print $1}')
13-
if [ "$svcaccountsum" != "$LAST_SERVICEACCOUNT_MD5SUM" ] || [ "$casum" != "$LAST_KUBE_CA_FILE_MD5SUM" ]; then
14-
# log "Detected service account or CA file change, regenerating kubeconfig..."
12+
if [ -f "$KUBE_CA_FILE" ]; then
13+
casum=$(md5sum $KUBE_CA_FILE | awk '{print $1}')
14+
fi
15+
if [ "$svcaccountsum" != "$LAST_SERVICEACCOUNT_MD5SUM" ] || ! [ "$SKIP_TLS_VERIFY" == "true" ] && [ "$casum" != "$LAST_KUBE_CA_FILE_MD5SUM" ]; then
16+
log "Detected service account or CA file change, regenerating kubeconfig..."
1517
generateKubeConfig
18+
LAST_SERVICEACCOUNT_MD5SUM="$(get_token_md5sum)"
19+
if [ -f "$KUBE_CA_FILE" ]; then
20+
LAST_KUBE_CA_FILE_MD5SUM="$(get_ca_file_md5sum)"
21+
fi
1622
fi
1723

18-
sleep 1h
24+
sleep 1s
1925
done

0 commit comments

Comments
 (0)