Pull CA_CERTS from core18 (canonical#2046)

DnPlas · Feb 24, 2021 · 5c36496 · 5c36496
1 parent b8e6ab9
commit 5c36496
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/microk8s-resources/actions/enable.cilium.sh b/microk8s-resources/actions/enable.cilium.sh
@@ -4,7 +4,7 @@ set -e
 
 source $SNAP/actions/common/utils.sh
 
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 ARCH=$(arch)
 if ! [ "${ARCH}" = "amd64" ]; then

diff --git a/microk8s-resources/actions/enable.helm.sh b/microk8s-resources/actions/enable.helm.sh
@@ -3,7 +3,7 @@
 set -e
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 echo "Enabling Helm"
 

diff --git a/microk8s-resources/actions/enable.helm3.sh b/microk8s-resources/actions/enable.helm3.sh
@@ -3,7 +3,7 @@
 set -e
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 echo "Enabling Helm 3"
 

diff --git a/microk8s-resources/actions/enable.istio.sh b/microk8s-resources/actions/enable.istio.sh
@@ -3,7 +3,7 @@
 set -e
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 echo "Enabling Istio"
 

diff --git a/microk8s-resources/actions/enable.keda.sh b/microk8s-resources/actions/enable.keda.sh
@@ -3,7 +3,7 @@
 set -e
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 KUBECTL="$SNAP/kubectl --kubeconfig=${SNAP_DATA}/credentials/client.config"
 

diff --git a/microk8s-resources/actions/enable.linkerd.sh b/microk8s-resources/actions/enable.linkerd.sh
@@ -3,7 +3,7 @@
 set -e
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 read -ra ARGUMENTS <<< "$1"
 argz=("${ARGUMENTS[@]/#/--}")

diff --git a/microk8s-resources/actions/enable.prometheus.sh b/microk8s-resources/actions/enable.prometheus.sh
@@ -3,7 +3,7 @@
 set -e
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 KUBECTL="$SNAP/kubectl --kubeconfig=${SNAP_DATA}/credentials/client.config"
 

diff --git a/microk8s-resources/wrappers/run-flanneld-with-args b/microk8s-resources/wrappers/run-flanneld-with-args
@@ -44,6 +44,6 @@ fi
 
 # This is really the only way I could find to get the args passed in correctly.
 declare -a args="($(cat $SNAP_DATA/args/flanneld))"
-export CORE_LD_LIBRARY_PATH="$SNAP/../../core/current/lib/$ARCH-linux-gnu"
+export CORE_LD_LIBRARY_PATH="$SNAP/../../core18/current/lib/$ARCH-linux-gnu"
 export LD_LIBRARY_PATH="$CORE_LD_LIBRARY_PATH:$LD_LIBRARY_PATH"
 exec "$SNAP_DATA/opt/cni/bin/flanneld" "${args[@]}"
diff --git a/scripts/inspect.sh b/scripts/inspect.sh
@@ -140,7 +140,7 @@ function suggest_fixes {
     printf -- 'The change can be made persistent with: sudo apt-get install iptables-persistent\n'
   fi
 
-  if /snap/core/current/usr/bin/which ufw &> /dev/null
+  if /snap/core18/current/usr/bin/which ufw &> /dev/null
   then
     ufw=$(ufw status)
     if echo $ufw | grep "Status: active" &> /dev/null && ! echo $ufw | grep vxlan.calico &> /dev/null

diff --git a/upgrade-scripts/000-switch-to-calico/commit-master.sh b/upgrade-scripts/000-switch-to-calico/commit-master.sh
@@ -4,7 +4,7 @@ set -ex
 echo "Switching master to calico"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 RESOURCES="$SNAP/upgrade-scripts/000-switch-to-calico/resources"
 BACKUP_DIR="$SNAP_DATA/var/tmp/upgrades/000-switch-to-calico"

diff --git a/upgrade-scripts/000-switch-to-calico/commit-node.sh b/upgrade-scripts/000-switch-to-calico/commit-node.sh
@@ -5,7 +5,7 @@ set -ex
 echo "Switching master to calico"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 RESOURCES="$SNAP/upgrade-scripts/000-switch-to-calico/resources"
 BACKUP_DIR="$SNAP_DATA/var/tmp/upgrades/000-switch-to-calico"

diff --git a/upgrade-scripts/000-switch-to-calico/rollback-master.sh b/upgrade-scripts/000-switch-to-calico/rollback-master.sh
@@ -4,7 +4,7 @@ set -ex
 echo "Rolling back calico upgrade on master"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 
 if [ -e "$SNAP_DATA/args/cni-network/cni.yaml" ]; then

diff --git a/upgrade-scripts/000-switch-to-calico/rollback-node.sh b/upgrade-scripts/000-switch-to-calico/rollback-node.sh
@@ -4,7 +4,7 @@ set -ex
 echo "Rolling back calico upgrade on a node"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 BACKUP_DIR="$SNAP_DATA/var/tmp/upgrades/000-switch-to-calico"
 

diff --git a/upgrade-scripts/001-switch-to-dqlite/commit-master.sh b/upgrade-scripts/001-switch-to-dqlite/commit-master.sh
@@ -4,7 +4,7 @@ set -ex
 echo "Switching master to dqlite"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 BACKUP_DIR="$SNAP_DATA/var/tmp/upgrades/001-switch-to-dqlite"
 DB_DIR="$BACKUP_DIR/db"

diff --git a/upgrade-scripts/001-switch-to-dqlite/commit-node.sh b/upgrade-scripts/001-switch-to-dqlite/commit-node.sh
@@ -5,7 +5,7 @@ set -ex
 echo "Switching node to dqlite"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 BACKUP_DIR="$SNAP_DATA/var/tmp/upgrades/001-switch-to-dqlite"
 

diff --git a/upgrade-scripts/001-switch-to-dqlite/rollback-master.sh b/upgrade-scripts/001-switch-to-dqlite/rollback-master.sh
@@ -4,7 +4,7 @@ set -ex
 echo "Rolling back dqlite upgrade on master"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 BACKUP_DIR="$SNAP_DATA/var/tmp/upgrades/001-switch-to-dqlite"
 
 echo "Restarting etcd"

diff --git a/upgrade-scripts/001-switch-to-dqlite/rollback-node.sh b/upgrade-scripts/001-switch-to-dqlite/rollback-node.sh
@@ -4,7 +4,7 @@ set -ex
 echo "Rolling back dqlite upgrade on master"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 BACKUP_DIR="$SNAP_DATA/var/tmp/upgrades/001-switch-to-dqlite"
 
 echo "Restarting etcd"

diff --git a/upgrade-scripts/002-switch-to-flannel-etcd/commit-master.sh b/upgrade-scripts/002-switch-to-flannel-etcd/commit-master.sh
@@ -4,7 +4,7 @@ set -ex
 echo "Switching master to flannel-etcd"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 
 BACKUP_DIR="$SNAP_DATA/var/tmp/upgrades/002-switch-to-flannel-etcd"
 DB_DIR="$BACKUP_DIR/db"

diff --git a/upgrade-scripts/002-switch-to-flannel-etcd/rollback-master.sh b/upgrade-scripts/002-switch-to-flannel-etcd/rollback-master.sh
@@ -4,7 +4,7 @@ set -ex
 echo "Rolling back flannel-etcd upgrade on master"
 
 source $SNAP/actions/common/utils.sh
-CA_CERT=/snap/core/current/etc/ssl/certs/ca-certificates.crt
+CA_CERT=/snap/core18/current/etc/ssl/certs/ca-certificates.crt
 BACKUP_DIR="$SNAP_DATA/var/tmp/upgrades/002-switch-to-flannel-etcd"
 
 ${SNAP}/microk8s-stop.wrapper