From 2c93427d4956ae3e7844d9ece3802f3e3dfe25b2 Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Mon, 9 Nov 2020 11:07:48 +0000 Subject: [PATCH] k8s-fcos: Source bashrc for clusterconfig During the reshuffling of bash fragments, we missed sourcing bashrc which contains the location of kubeconfig. Fix addition of /srv/magnum/bin to PATH. story: 2007591 task: 39938 Change-Id: I238f7e2a1cbcb696a51880fb6ea75ea0a7ce6288 Signed-off-by: Spyros Trigazis --- .../common/templates/kubernetes/fragments/install-clients.sh | 3 ++- magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh b/magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh index 21117a602c..f9447cea05 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/install-clients.sh @@ -31,6 +31,7 @@ do done echo "INFO Installed kubectl." -echo "PATH=/srv/magnum/bin:\$PATH" >> /etc/bashrc +echo "export PATH=/srv/magnum/bin:\$PATH" >> /etc/bashrc +export PATH=/srv/magnum/bin:$PATH printf "Finished running ${step}\n" diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml index 490688e827..16dfc9cc3e 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml @@ -1308,6 +1308,7 @@ resources: - "\n" - - "#!/bin/bash" + - "source /etc/bashrc" - get_file: ../../common/templates/kubernetes/fragments/kube-apiserver-to-kubelet-role.sh - get_file: ../../common/templates/kubernetes/fragments/core-dns-service.sh - if: