From 04008f3205cbd6f9c855b663ba19c898e927f5e9 Mon Sep 17 00:00:00 2001
From: peng9808 <peng.lai@daocloud.io>
Date: Thu, 11 Jan 2024 19:39:27 +0800
Subject: [PATCH] add auto push image

---
 .github/workflows/release-drbd9-images.yml   | 1 +
 .github/workflows/release-shipper-images.yml | 1 +
 docker-drbd9/entry.sh                        | 2 +-
 docker-shipper/entrypoint.adapter.sh         | 4 ++++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-drbd9-images.yml b/.github/workflows/release-drbd9-images.yml
index 1661379..c22a121 100644
--- a/.github/workflows/release-drbd9-images.yml
+++ b/.github/workflows/release-drbd9-images.yml
@@ -5,6 +5,7 @@ on:
     branches: [ "main" ]
     paths:
     - 'docker-drbd9/**'
+    - "helm/drbd-adapter/Chart.yaml"
     - '.github/workflow/release-drbd9-images.yml'
 
 jobs:
diff --git a/.github/workflows/release-shipper-images.yml b/.github/workflows/release-shipper-images.yml
index 6702b34..93df8ad 100644
--- a/.github/workflows/release-shipper-images.yml
+++ b/.github/workflows/release-shipper-images.yml
@@ -5,6 +5,7 @@ on:
     branches: [ "main" ]
     paths:
     - 'docker-shipper/*'
+    - "helm/drbd-adapter/Chart.yaml"
     - '.github/workflow/release-shipper-images.yml'
 
 jobs:
diff --git a/docker-drbd9/entry.sh b/docker-drbd9/entry.sh
index 8ee5b5f..d47499e 100644
--- a/docker-drbd9/entry.sh
+++ b/docker-drbd9/entry.sh
@@ -233,7 +233,7 @@ if grep -q '^drbd ' /proc/modules; then
 
 	[[ $LB_FAIL_IF_USERMODE_HELPER_NOT_DISABLED == yes ]] && ! grep -qw disabled /sys/module/drbd/parameters/usermode_helper &&
 		die "- load the drbd module on the host with the module parameter 'usermode_helper=disabled' OR\n- let this container handle that for you by not already loading the drbd module on the host"
-
+  export DRBD_EXIST='yes'
 	exit 0
 fi
 
diff --git a/docker-shipper/entrypoint.adapter.sh b/docker-shipper/entrypoint.adapter.sh
index c5297ff..617e791 100755
--- a/docker-shipper/entrypoint.adapter.sh
+++ b/docker-shipper/entrypoint.adapter.sh
@@ -52,6 +52,8 @@ fi
 
 ## Main Logic
 # If no shipped module is found, then compile from source
+export DRBD_EXIST='no'
+echo "OS_KERNEL:$1"
 export OS_KERNEL=$1
 if LB_HOW=shipped_modules bash -x /entry.sh ; then
    echo "Successfully loaded shipped module"
@@ -59,6 +61,8 @@ elif LB_HOW=compile bash -x /entry.sh ; then
    echo "Successfully loaded compiled module"
 fi
 
+echo "DRBD_EXIST:$DRBD_EXIST"
+echo "DRBD_RMP_INSTALL:$DRBD_RMP_INSTALL"
 if [[ $DRBD_RMP_INSTALL == 'yes' ]];then
   echo "Successfully installed rbd using rpm package"
   exit 0