Merge pull request #11 from Aryan-sharma11/releasev0.5

add object file for sys_monitor to archive
Aryan-sharma11 · Apr 5, 2024 · 1e26b01 · 1e26b01
2 parents 94f2ab6 + aff03d7
commit 1e26b01
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/KubeArmor/.goreleaser.yaml b/KubeArmor/.goreleaser.yaml
@@ -67,18 +67,18 @@ nfpms:
       postinstall: packaging/post-install.sh
     overrides:
       deb:
-        dependencies:
+        recommends:
           - make
           - libelf-dev
           - clang
           - llvm
           - linux-headers-generic
       rpm:
-        dependencies:
+        recommends:
           - make
           - elfutils-libelf-devel
           - clang
           - llvm
           - kernel-devel
           - policycoreutils-devel
-          - setools-console
+          - setools-console
diff --git a/KubeArmor/packaging/post-install.sh b/KubeArmor/packaging/post-install.sh
@@ -4,16 +4,23 @@
 
 set -e
 
-# compile BPF programs
-make -C /opt/kubearmor/BPF/
+if [ ! -e "/sys/kernel/btf/vmlinux" ]; then
+    # compile BPF programs
+    make -C /opt/kubearmor/BPF/
+fi
+
+# update karmor SELinux module if BPFLSM is not present 
+lsm_file="/sys/kernel/security/lsm"
+bpf="bpf"
+if ! grep -q "$bpf" "$lsm_file"; then
+    if [ -x "$(command -v semanage)" ]; then
+        # old karmor SELinux module
+        /opt/kubearmor/templates/uninstall.sh
 
-# update karmor SELinux module
-if [ -x "$(command -v semanage)" ]; then
-    # old karmor SELinux module
-    /opt/kubearmor/templates/uninstall.sh
+        # new karmor SELinux module
+        /opt/kubearmor/templates/install.sh
 
-    # new karmor SELinux module
-    /opt/kubearmor/templates/install.sh
+    fi
 fi
 
 # start kubearmor.service

diff --git a/getting-started/kubearmor_vm.md b/getting-started/kubearmor_vm.md
@@ -9,11 +9,10 @@ The recipe installs `kubearmor` as systemd process and `karmor` cli tool to mana
 1. Download the [latest release](https://github.com/kubearmor/KubeArmor/releases) or KubeArmor.
 2. Install KubeArmor (VER is the kubearmor release version)
   ```
-  sudo apt install ./kubearmor_${VER}_linux-amd64.deb
+  sudo apt --no-install-recommends install ./kubearmor_${VER}_linux-amd64.deb
   ```
-
-  > Note that the above automatically installs `bpfcc-tools` with our package, but your distribution might have an older version of BCC. In case of errors, consider installing `bcc` from [source](https://github.com/iovisor/bcc/blob/master/INSTALL.md#source).
-
+  > Note that the above command doesn't installs the recommended packages, as we ship object files along with the package file. In case you don't have BTF, consider removing `--no-install-recommends` flag.
+  
 <details><summary>For distributions other than Ubuntu/Debian</summary>
 <p>