Remove .kube/config in k8s cluster setup
In some newer systems, we're seeing .kube/config as an existing file
that is linked to /var/lib/kubelet/kubeconfig, which presents issues
when trying to write a new config to that path. Since this is intended
to fully overwrite what's there, it's safe to remove it first,
whether it's a file or a symlink.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I8edb3897f3f7649ac085528541b053b557526792
diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index df4ad02..aa7712a 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -442,7 +442,7 @@
script : """
echo -e "\n** make testTarget=[${testTarget}]"
mkdir -p ${logsDir}
-export ROBOT_MISC_ARGS="-d ${logsDir} ${params.extraRobotArgs} "
+export ROBOT_MISC_ARGS="-d ${logsDir} ${params.extraRobotArgs}"
ROBOT_MISC_ARGS+="-v ONOS_SSH_PORT:30115 -v ONOS_REST_PORT:30120 -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace} -v container_log_dir:${logsDir} -v logging:${testLogging}"
export KVSTOREPREFIX=voltha/voltha_voltha
diff --git a/vars/createKubernetesCluster.groovy b/vars/createKubernetesCluster.groovy
index ee05317..7ea398e 100644
--- a/vars/createKubernetesCluster.groovy
+++ b/vars/createKubernetesCluster.groovy
@@ -152,6 +152,8 @@
echo "** Generate $HOME/.kube/config"
mkdir -p "$HOME/.kube"
chmod u=rwx "$HOME/.kube"
+ # Remove current config, if it exists
+ rm -f "$HOME/.kube/config"
kind get kubeconfig --name ${cfg.name} > "$HOME/.kube/config"
chmod -R u+w,go-rwx "$HOME/.kube"