Merge pull request #42 from peng9808/main

fix dependencies
hwameistor · Jan 15, 2024 · 458c2e4 · 458c2e4
2 parents 7656753 + 926a9dd
commit 458c2e4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/.github/workflows/release-shipper-images.yml b/.github/workflows/release-shipper-images.yml
@@ -5,6 +5,7 @@ on:
     branches: [ "main" ]
     paths:
     - 'docker-shipper/*'
+    - 'docker-shipper/*/*'
     - "helm/drbd-adapter/Chart.yaml"
     - '.github/workflow/release-shipper-images.yml'
 

diff --git a/docker-drbd9/entry.sh b/docker-drbd9/entry.sh
@@ -4,6 +4,7 @@ SIGN_KEY=https://packages.linbit.com/package-signing-pubkey.asc
 PKGS=/pkgs
 HOSTRELEASE=/etc/host-release
 RPMDIR=/pkgs/drbd-rpms/
+DEBDIR=/pkgs/drbd-debs/
 
 die() {
 	>&2 echo
@@ -237,23 +238,22 @@ if grep -q '^drbd ' /proc/modules; then
 	exit 0
 fi
 
-result=$(lbdisttool.py --os-release $HOSTRELEASE -l || echo "")
-substr="${result:0:3}"
-if [ "$substr" != "deb" ]; then
-    if [ -z "$OS_KERNEL" ]; then
+if [ -z "$OS_KERNEL" ]; then
       debug "The system parameters are obtained successfully （OS_KERNEL）"
       exit 1
     fi
-    ls "$RPMDIR"
+result=$(lbdisttool.py --os-release $HOSTRELEASE -l || echo "")
+substr="${result:0:3}"
+if [ "$substr" != "deb" ]; then
     drbd_rpm=$(find "$RPMDIR" -type f -name "*$OS_KERNEL*" -print -quit)
     utils_rpm=$(find "$RPMDIR" -type f -name "drbd-utils*" -print -quit)
     if [[ -n "$drbd_rpm"  && -n "$utils_rpm" ]]; then
-      rpm -ivh  "$utils_rpm"
-      rpm -ivh  "$drbd_rpm"
+      nsenter -t 1 -n -u -i -m --rpm -ivh  "$utils_rpm"
+      nsenter -t 1 -n -u -i -m --rpm -ivh  "$drbd_rpm"
       exit_code=$?
       if [ $exit_code -eq 0 ]; then
-        modprobe drbd
-        modprobe drbd_transport_tcp
+        nsenter -t 1 -n -u -i -m --modprobe drbd
+        nsenter -t 1 -n -u -i -m --modprobe drbd_transport_tcp
         exit_code=$?
         if [ $exit_code -eq 0 ]; then
 	  #Notify shipper that installation is complete
@@ -268,6 +268,28 @@ if [ "$substr" != "deb" ]; then
       fi
     else debug "There is no corresponding kernel version rpm package or drbd-utils rpm package"
     fi
+else
+    drbd_deb=$(find "$RPMDIR" -type f -name "*$OS_KERNEL*" -print -quit)
+    utils_deb=$(find "$RPMDIR" -type f -name "drbd-utils*" -print -quit)
+    if [[ -n "$drbd_rpm"  && -n "$utils_rpm" ]]; then
+      nsenter -t 1 -n -u -i -m --apt install -y drbd_deb
+      nsenter -t 1 -n -u -i -m --apt install -y utils_deb
+      exit_code=$?
+      if [ $exit_code -eq 0 ]; then
+        nsenter -t 1 -n -u -i -m --modprobe drbd
+        nsenter -t 1 -n -u -i -m --modprobe drbd_transport_tcp
+        exit_code=$?
+        if [ $exit_code -eq 0 ]; then
+          export DRBD_RMP_INSTALL='yes'
+          exit 0
+        else
+          debug "modprobe err_code: $exit_code"
+        fi
+      else
+        debug "apt install err_code: $exit_code"
+      fi
+    else debug "There is no corresponding kernel version deb package or drbd-utils deb package"
+    fi
 fi
 
 

diff --git a/...-deb/drbd-dkms_9.2.7-1ppa1~focal1_all.deb → ....7-1ppa1~focal1_all_5.15.0-50-generic.deb b/...-deb/drbd-dkms_9.2.7-1ppa1~focal1_all.deb → ....7-1ppa1~focal1_all_5.15.0-50-generic.deb
diff --git a/.../drbd-utils_9.27.0-1ppa1~focal1_amd64.deb → .../drbd-utils_9.27.0-1ppa1~focal1_amd64.deb b/.../drbd-utils_9.27.0-1ppa1~focal1_amd64.deb → .../drbd-utils_9.27.0-1ppa1~focal1_amd64.deb
diff --git a/helm/drbd-adapter/values.yaml b/helm/drbd-adapter/values.yaml
@@ -37,6 +37,6 @@ affinity:
 
 # only apply to "deployKind: job"
 # by default NOT deploying on masters (yes|no)
-deployOnMasters: "no"
+deployOnMasters: "yes"
 # by default NOT using Affinity (yes|no)
 useAffinity: "no"