Skip to content

Commit bccf0ba

Browse files
authored
Merge pull request #605 from thomasferrandiz/fix-chart-and-source
Fix chart and source command in scripts
2 parents 42b1df7 + a636b2e commit bccf0ba

File tree

6 files changed

+9
-4
lines changed

6 files changed

+9
-4
lines changed

deployment/whereabouts-chart/templates/daemonset.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Dont'forget to update doc/crds/daemonset-install.yaml as well
12
apiVersion: apps/v1
23
kind: DaemonSet
34
metadata:
@@ -39,8 +40,9 @@ spec:
3940
command: [ "/bin/sh" ]
4041
args:
4142
- -c
42-
- >
43-
SLEEP=false /install-cni.sh &&
43+
- |
44+
SLEEP=false source /install-cni.sh
45+
/token-watcher.sh &
4446
/ip-control-loop -log-level debug
4547
env:
4648
- name: NODENAME

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Dont'forget to update doc/crds/node-slice-controller.yaml as well
12
{{- if .Values.nodeSliceController.enabled }}
23
apiVersion: apps/v1
34
kind: Deployment

doc/crds/daemonset-install.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Dont'forget to update deployment/whereabouts-chart/templates/daemonset.yaml as well
12
apiVersion: v1
23
kind: ServiceAccount
34
metadata:

doc/crds/node-slice-controller.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Dont'forget to update deployment/whereabouts-chart/templates/node-slice-controller.yaml as well
12
apiVersion: apps/v1
23
kind: Deployment
34
metadata:

script/install-cni.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -u -e
1010
#
1111
#SPDX-License-Identifier: Apache-2.0
1212

13-
source lib.sh
13+
source /lib.sh
1414

1515
# Setup our logging routines
1616

script/token-watcher.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -u -e
44

5-
source lib.sh
5+
source /lib.sh
66

77
echo "Sleep and Watching for service account token and CA file changes..."
88
# enter sleep/watch loop

0 commit comments

Comments
 (0)