WIP2

scripts/e2e-k3s-start

@@ -6,6 +6,7 @@ K3S_VERSION=v1.28.8+k3s1
 # RANCHER_IMG_VERSION=v2.9-c9be13b09329bbee60a5f6419d500198f83c44d1-head
 RANCHER_IMG_VERSION=v2.9-head
 DASHBOARD_URL=127.0.0.1.sslip.io
+NAMESPACE=cattle-system
 
 DIR=$(cd $(dirname $0)/..; pwd)
 
@@ -44,7 +45,7 @@ helm repo update
 # TODO: RC wire in host name to e2e tests
 
 echo "Installing Rancher....."
-kubectl create ns cattle-system
+kubectl create ns $NAMESPACE
 helm install rancher rancher-latest/rancher \
   --namespace cattle-system \
   --set "hostname=$DASHBOARD_URL" \
@@ -91,15 +92,25 @@ if [ "$STATUS" != "302" ]; then
 fi
 
 echo "Updating UI within Rancher container"
-POD_NAME=$(kubectl get pods --selector=app=rancher -n cattle-system | tail -n 1 | cut -d ' ' -f1)
+# Note - these will pick the first container within the pod, so replicas=1 above is important
+POD_NAME=$(kubectl get pods --selector=app=rancher -n $NAMESPACE | tail -n 1 | cut -d ' ' -f1)
 echo "POD NAME: $POD_NAME"
 if [ "$POD_NAME" == "" ]; then
   echo "Failed to find rancher pod"
   exit 1
 fi
-# Note - these will pick the first container within the pod, so replicas=1 above is important
-kubectl cp $DASHBOARD_DIST $POD_NAME:/usr/share/rancher/ui-dashboard/dashboard # TODO: RC probably copies folder INTO target folder
-kubectl cp $EMBER_DIST $POD_NAME:/usr/share/rancher/ui # TODO: RC probably copies folder INTO target folder
+
+kubectl exec $POD_NAME -n $NAMESPACE -- sh -c 'rm -rf /usr/share/rancher/ui-dashboard'
+kubectl exec $POD_NAME -n $NAMESPACE -- sh -c 'rm -rf /usr/share/rancher/ui'
+
+mv $DASHBOARD_DIST dashboard
+mv $EMBER_DIST ui
+
+ls -la dashboard
+ls -la ui
+
+kubectl cp dashboard $POD_NAME:/usr/share/rancher/ui-dashboard -n $NAMESPACE
+kubectl cp ui $POD_NAME:/usr/share/rancher -n $NAMESPACE
   # -v ${DASHBOARD_DIST}:/usr/share/rancher/ui-dashboard/dashboard \
   # -v ${EMBER_DIST}:/usr/share/rancher/ui \