Merge branch 'master' into joakimr-axis_comparison

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,10 @@ assignees: ''
 <!-- Thanks for helping us to improve k3s! We welcome all bug reports. Please fill out each area of the template so we can better help you.  ***You can delete this message portion of the bug report.*** -->
 
 **Version:**
-<!-- Provide the output from `k3s -v` and provide the flags used to install or run k3s server. -->
+<!-- Provide the output from `k3s -v` -->
+
+**K3s arguments:**
+<!-- Provide the flags used to install or run k3s server. -->
 
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
@@ -24,5 +27,5 @@ assignees: ''
 **Actual behavior**
 <!-- A clear and concise description of what actually happened. -->
 
-**Additional context**
-<!-- Add any other context about the problem here. -->
+**Additional context / logs**
+<!-- Add any other context and/or logs about the problem here. -->

install.sh

@@ -279,15 +279,6 @@ verify_downloader() {
     return 0
 }
 
-# --- verify existence of semanage when SELinux is enabled ---
-verify_semanage() {
-    if [ -x "$(which getenforce)" ]; then
-        if [ "Disabled" != $(getenforce) ] && [ ! -x "$(which semanage)" ]; then
-            fatal 'SELinux is enabled but semanage is not found'
-        fi
-    fi
-}
-
 # --- create tempory directory and cleanup when done ---
 setup_tmp() {
     TMP_DIR=$(mktemp -d -t k3s-install.XXXXXXXXXX)
@@ -399,13 +390,9 @@ setup_binary() {
     $SUDO chown root:root ${TMP_BIN}
     $SUDO mv -f ${TMP_BIN} ${BIN_DIR}/k3s
 
-    if command -v getenforce >/dev/null 2>&1; then
-        if [ "Disabled" != $(getenforce) ]; then
-	    info 'SELinux is enabled, setting permissions'
-	    if ! $SUDO semanage fcontext -l | grep "${BIN_DIR}/k3s" > /dev/null 2>&1; then
-	        $SUDO semanage fcontext -a -t bin_t "${BIN_DIR}/k3s"
-	    fi
-	    $SUDO restorecon -v ${BIN_DIR}/k3s > /dev/null
+    if ! $SUDO chcon -u system_u -r object_r -t container_runtime_exec_t ${BIN_DIR}/k3s 2>/dev/null 2>&1; then
+        if $SUDO grep SELINUX=enforcing /etc/selinux/config >/dev/null 2>&1; then
+            fatal "Failed to apply container_runtime_exec_t to ${BIN_DIR}/k3s, please install k3s-selinux RPM"
         fi
     fi
 }
@@ -420,7 +407,6 @@ download_and_verify() {
 
     setup_verify_arch
     verify_downloader curl || verify_downloader wget || fatal 'Can not find curl or wget for downloading files'
-    verify_semanage
     setup_tmp
     get_release_version
     download_hash