From f86d279dcbc36ff996b75c21770fc559442c4761 Mon Sep 17 00:00:00 2001 From: Thomas Ferrandiz Date: Wed, 23 Apr 2025 13:01:19 +0000 Subject: [PATCH 1/3] Align chart with daemonset manifest --- deployment/whereabouts-chart/templates/daemonset.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment/whereabouts-chart/templates/daemonset.yaml b/deployment/whereabouts-chart/templates/daemonset.yaml index aad36087..92cfadbc 100644 --- a/deployment/whereabouts-chart/templates/daemonset.yaml +++ b/deployment/whereabouts-chart/templates/daemonset.yaml @@ -39,8 +39,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 From 3977939bffcb483731018b2c188f7aecbbee9648 Mon Sep 17 00:00:00 2001 From: Thomas Ferrandiz Date: Wed, 23 Apr 2025 13:59:00 +0000 Subject: [PATCH 2/3] Fix source command in scripts In busybox-based images, source does not look in the current directory so an absolute path is needed. --- script/install-cni.sh | 2 +- script/token-watcher.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/install-cni.sh b/script/install-cni.sh index c6a14ed1..901c3ba2 100755 --- a/script/install-cni.sh +++ b/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 diff --git a/script/token-watcher.sh b/script/token-watcher.sh index 15ec5c79..b33cb575 100755 --- a/script/token-watcher.sh +++ b/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 From a636b2e50cd35a5818f5e2370b087519bfe96f5a Mon Sep 17 00:00:00 2001 From: Thomas Ferrandiz Date: Thu, 24 Apr 2025 13:29:31 +0000 Subject: [PATCH 3/3] Add reminder to update chart files along with manifest files --- deployment/whereabouts-chart/templates/daemonset.yaml | 1 + .../whereabouts-chart/templates/node-slice-controller.yaml | 1 + doc/crds/daemonset-install.yaml | 1 + doc/crds/node-slice-controller.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/deployment/whereabouts-chart/templates/daemonset.yaml b/deployment/whereabouts-chart/templates/daemonset.yaml index 92cfadbc..afd1a7c6 100644 --- a/deployment/whereabouts-chart/templates/daemonset.yaml +++ b/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: diff --git a/deployment/whereabouts-chart/templates/node-slice-controller.yaml b/deployment/whereabouts-chart/templates/node-slice-controller.yaml index 303b6cef..5585d77b 100644 --- a/deployment/whereabouts-chart/templates/node-slice-controller.yaml +++ b/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 diff --git a/doc/crds/daemonset-install.yaml b/doc/crds/daemonset-install.yaml index 14e06e36..cedc22bb 100644 --- a/doc/crds/daemonset-install.yaml +++ b/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: diff --git a/doc/crds/node-slice-controller.yaml b/doc/crds/node-slice-controller.yaml index 4671db1a..d99b4a66 100644 --- a/doc/crds/node-slice-controller.yaml +++ b/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: