More comments

Author: lubronzhan

doc/crds/daemonset-install.yaml

@@ -119,7 +119,7 @@ spec:
         args:
           - -c
           - |
-            SLEEP=false /install-cni.sh
+            SLEEP=false source /install-cni.sh
             /token-watcher.sh &
             /ip-control-loop -log-level debug
         image: ghcr.io/k8snetworkplumbingwg/whereabouts:latest

script/lib.sh

@@ -16,12 +16,10 @@ SERVICE_ACCOUNT_TOKEN=$(cat $SERVICE_ACCOUNT_PATH/token)
 SERVICE_ACCOUNT_TOKEN_PATH=$SERVICE_ACCOUNT_PATH/token
 SKIP_TLS_VERIFY=${SKIP_TLS_VERIFY:-false}
 
-LAST_SERVICEACCOUNT_MD5SUM=""
-LAST_KUBE_CA_FILE_MD5SUM=""
 
 function log()
 {
-    echo "$(date --iso-8601=seconds) ${1}"
+    echo "$(date -Iseconds) ${1}"
 }
 
 function error()

script/token-watcher.sh

@@ -9,9 +9,7 @@ echo "Sleep and Watching for service account token and CA file changes..."
 while true; do
   # Check the md5sum of the service account token and ca.
   svcaccountsum="$(get_token_md5sum)"
-  if [ -f "$KUBE_CA_FILE" ]; then
-    casum="$(get_ca_file_md5sum)"
-  fi
+  casum="$(get_ca_file_md5sum)"
   if [ "$svcaccountsum" != "$LAST_SERVICEACCOUNT_MD5SUM" ] || ! [ "$SKIP_TLS_VERIFY" == "true" ] && [ "$casum" != "$LAST_KUBE_CA_FILE_MD5SUM" ]; then
     log "Detected service account or CA file change, regenerating kubeconfig..."
     generateKubeConfig