Merge pull request #605 from thomasferrandiz/fix-chart-and-source

Fix chart and source command in scripts

deployment/whereabouts-chart/templates/daemonset.yaml

@@ -1,3 +1,4 @@
+# Dont'forget to update doc/crds/daemonset-install.yaml as well
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -39,8 +40,9 @@ spec:
           command: [ "/bin/sh" ]
           args:
             - -c
-            - >
-              SLEEP=false /install-cni.sh &&
+            - |
+              SLEEP=false source /install-cni.sh
+              /token-watcher.sh &
               /ip-control-loop -log-level debug
           env:
           - name: NODENAME

deployment/whereabouts-chart/templates/node-slice-controller.yaml

@@ -1,3 +1,4 @@
+# Dont'forget to update doc/crds/node-slice-controller.yaml as well
 {{- if .Values.nodeSliceController.enabled }}
 apiVersion: apps/v1
 kind: Deployment

doc/crds/daemonset-install.yaml

@@ -1,3 +1,4 @@
+# Dont'forget to update deployment/whereabouts-chart/templates/daemonset.yaml as well
 apiVersion: v1
 kind: ServiceAccount
 metadata:

doc/crds/node-slice-controller.yaml

@@ -1,3 +1,4 @@
+# Dont'forget to update deployment/whereabouts-chart/templates/node-slice-controller.yaml as well
 apiVersion: apps/v1
 kind: Deployment
 metadata:

script/install-cni.sh

@@ -10,7 +10,7 @@ set -u -e
 #
 #SPDX-License-Identifier: Apache-2.0
 
-source lib.sh
+source /lib.sh
 
 # Setup our logging routines
 

script/token-watcher.sh

@@ -2,7 +2,7 @@
 
 set -u -e
 
-source lib.sh
+source /lib.sh
 
 echo "Sleep and Watching for service account token and CA file changes..."
 # enter sleep/watch loop