diff --git a/script/install-cni.sh b/script/install-cni.sh index 18f7abe4f..4c63cd064 100755 --- a/script/install-cni.sh +++ b/script/install-cni.sh @@ -20,7 +20,6 @@ WHEREABOUTS_RECONCILER_CRON=${WHEREABOUTS_RECONCILER_CRON:-30 4 * * *} mkdir -p $CNI_CONF_DIR/whereabouts.d WHEREABOUTS_KUBECONFIG=$CNI_CONF_DIR/whereabouts.d/whereabouts.kubeconfig WHEREABOUTS_FLATFILE=$CNI_CONF_DIR/whereabouts.d/whereabouts.conf # Yuki~ Nikhil's note: imo we should remove "flatfile" from whereabouts vocabulary and call this "WHEREABOUTS_CONF_FILE" instead. Flatfile may be the format but it's confusing naming. -WHEREABOUTS_KUBECONFIG_LITERAL=$(echo "$WHEREABOUTS_KUBECONFIG" | sed -e s'|/host||') # ------------------------------- Generate a "kube-config" SERVICE_ACCOUNT_PATH=/var/run/secrets/kubernetes.io/serviceaccount @@ -102,7 +101,7 @@ EOF { "datastore": "kubernetes", "kubernetes": { - "kubeconfig": "${WHEREABOUTS_KUBECONFIG_LITERAL}" + "kubeconfig": "${WHEREABOUTS_KUBECONFIG_FILE_HOST}" }, "reconciler_cron_expression": "${WHEREABOUTS_RECONCILER_CRON}" }