Re-enable cilium when upgrading (canonical#625)

ianbibby · Jan 10, 2020 · 630329a · 630329a
1 parent 38b975d
commit 630329a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/microk8s-resources/actions/enable.cilium.sh b/microk8s-resources/actions/enable.cilium.sh
@@ -74,7 +74,7 @@ else
   sudo cp "$SNAP_DATA/tmp/cilium/$CILIUM_DIR/install/kubernetes/cilium.yaml" "$SNAP_DATA/actions/cilium.yaml"
   sudo sed -i 's;path: \(/var/run/cilium\);path: '"$SNAP_DATA"'\1;g' "$SNAP_DATA/actions/cilium.yaml"
 
-  microk8s.status --wait-ready >/dev/null
+  ${SNAP}/microk8s-status.wrapper --wait-ready >/dev/null
   echo "Deploying $SNAP_DATA/actions/cilium.yaml. This may take several minutes."
   "$SNAP/kubectl" "--kubeconfig=$SNAP_DATA/credentials/client.config" apply -f "$SNAP_DATA/actions/cilium.yaml"
   "$SNAP/kubectl" "--kubeconfig=$SNAP_DATA/credentials/client.config" -n $NAMESPACE rollout status ds/cilium

diff --git a/snap/hooks/configure b/snap/hooks/configure
@@ -302,3 +302,9 @@ then
   systemctl restart snap.${SNAP_NAME}.daemon-apiserver
 fi
 
+if [ -L "${SNAP_DATA}/bin/cilium" ]
+then
+  echo "Cilium is enabled we need to reconfigure it."
+  sudo rm -rf $SNAP_DATA/bin/cilium*
+  ${SNAP}/microk8s-enable.wrapper cilium
+fi