From 630329a73731b060db63e4d60180a05e659cc0a5 Mon Sep 17 00:00:00 2001
From: Konstantinos Tsakalozos <kos.tsakalozos@canonical.com>
Date: Tue, 3 Sep 2019 12:59:16 +0300
Subject: [PATCH] Re-enable cilium when upgrading (#625)

---
 microk8s-resources/actions/enable.cilium.sh | 2 +-
 snap/hooks/configure                        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/microk8s-resources/actions/enable.cilium.sh b/microk8s-resources/actions/enable.cilium.sh
index 8775375d56..2aaa006746 100755
--- 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
index bc755c6704..3aeea31bff 100755
--- 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