From 66d87698fd4d4a06660cc9f765eada4bb68a218f Mon Sep 17 00:00:00 2001
From: Chris Kim <oats87g@gmail.com>
Date: Mon, 16 Nov 2020 13:57:07 -0800
Subject: [PATCH 1/2] Enhance install.sh to help with k3s upgrade and uninstall
 scenarios for k3s-selinux

Signed-off-by: Chris Kim <oats87g@gmail.com>
---
 install.sh | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/install.sh b/install.sh
index 54b1474d53..622d7f65cb 100755
--- a/install.sh
+++ b/install.sh
@@ -432,15 +432,26 @@ setup_binary() {
 
 # --- setup selinux policy ---
 setup_selinux() {
+    case ${INSTALL_K3S_CHANNEL} in 
+        *testing)
+            rpm_channel=testing
+            ;;
+        *latest)
+            rpm_channel=latest
+            ;;
+        *)
+            rpm_channel=stable
+            ;;
+    esac
 
     rpm_site="rpm.rancher.io"
-    if [ "${INSTALL_K3S_CHANNEL}" = "testing" ]; then
-        rpm_site="rpm-${INSTALL_K3S_CHANNEL}.rancher.io"
+    if [ "${rpm_channel}" = "testing" ]; then
+        rpm_site="rpm-testing.rancher.io"
     fi
 
     policy_hint="please install:
     yum install -y container-selinux selinux-policy-base
-    yum install -y https://${rpm_site}/k3s/${INSTALL_K3S_CHANNEL}/common/centos/7/noarch/k3s-selinux-0.2-1.el7_8.noarch.rpm
+    yum install -y https://${rpm_site}/k3s/${rpm_channel}/common/centos/7/noarch/k3s-selinux-0.2-1.el7_8.noarch.rpm
 "
     policy_error=fatal
     if [ "$INSTALL_K3S_SELINUX_WARN" = true ]; then
@@ -450,7 +461,7 @@ setup_selinux() {
     if [ "$INSTALL_K3S_SKIP_SELINUX_RPM" = true ] || can_skip_download; then
         info "Skipping installation of SELinux RPM"
     else
-        install_selinux_rpm ${rpm_site}
+        install_selinux_rpm ${rpm_site} ${rpm_channel}
     fi
 
     if ! $SUDO chcon -u system_u -r object_r -t container_runtime_exec_t ${BIN_DIR}/k3s >/dev/null 2>&1; then
@@ -483,10 +494,11 @@ install_selinux_rpm() {
                     ;;
             esac
         fi
-        $SUDO tee /etc/yum.repos.d/rancher-k3s-common-${INSTALL_K3S_CHANNEL}.repo >/dev/null << EOF
-[rancher-k3s-common-${INSTALL_K3S_CHANNEL}]
-name=Rancher K3s Common (${INSTALL_K3S_CHANNEL})
-baseurl=https://${1}/k3s/${INSTALL_K3S_CHANNEL}/common/centos/${maj_ver}/noarch
+        $SUDO rm -f /etc/yum.repos.d/rancher-k3s-common*.repo
+        $SUDO tee /etc/yum.repos.d/rancher-k3s-common.repo >/dev/null << EOF
+[rancher-k3s-common-${2}]
+name=Rancher K3s Common (${2})
+baseurl=https://${1}/k3s/${2}/common/centos/${maj_ver}/noarch
 enabled=1
 gpgcheck=1
 gpgkey=https://${1}/public.key
@@ -661,6 +673,11 @@ rm -rf /var/lib/rancher/k3s
 rm -rf /var/lib/kubelet
 rm -f ${BIN_DIR}/k3s
 rm -f ${KILLALL_K3S_SH}
+
+if [ -r /etc/redhat-release ] || [ -r /etc/centos-release ] || [ -r /etc/oracle-release ]; then
+    yum remove -y k3s-selinux
+    rm -f /etc/yum.repos.d/rancher-k3s-common*.repo
+fi
 EOF
     $SUDO chmod 755 ${UNINSTALL_K3S_SH}
     $SUDO chown root:root ${UNINSTALL_K3S_SH}

From 25d2ce435bb846e67c340d59e035953af0aee395 Mon Sep 17 00:00:00 2001
From: Chris Kim <30601846+Oats87@users.noreply.github.com>
Date: Tue, 17 Nov 2020 09:08:38 -0800
Subject: [PATCH 2/2] Update install.sh

Change from file check to yum check for uninstall script

Co-authored-by: Jacob Blain Christen <dweomer5@gmail.com>
---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 622d7f65cb..4605d3fb3a 100755
--- a/install.sh
+++ b/install.sh
@@ -674,7 +674,7 @@ rm -rf /var/lib/kubelet
 rm -f ${BIN_DIR}/k3s
 rm -f ${KILLALL_K3S_SH}
 
-if [ -r /etc/redhat-release ] || [ -r /etc/centos-release ] || [ -r /etc/oracle-release ]; then
+if type yum >/dev/null 2>&1; then
     yum remove -y k3s-selinux
     rm -f /etc/yum.repos.d/rancher-k3s-common*.repo
 fi