Merge pull request #1724 from k8s-infra-cherrypick-robot/cherry-pick-…

…1723-to-release-1.25 [release-1.25] fix: always start blobfuse-proxy as long as it's enabled
kubernetes-sigs · Nov 29, 2024 · 96e582a · 96e582a
2 parents 29ae1a6 + 9c0d9bd
commit 96e582a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/pkg/blobfuse-proxy/install-proxy-rhcos.sh b/pkg/blobfuse-proxy/install-proxy-rhcos.sh
@@ -73,10 +73,13 @@ if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
     cp /blobfuse-proxy/blobfuse-proxy.service /host/etc/systemd/system/blobfuse-proxy.service
   fi
 
+  $HOST_CMD systemctl daemon-reload
+  $HOST_CMD systemctl enable blobfuse-proxy.service
   if [ "$updateBlobfuseProxy" = "true" ] || [ "$updateService" = "true" ];then
-    echo "start blobfuse-proxy...."
-    $HOST_CMD systemctl daemon-reload
-    $HOST_CMD systemctl enable blobfuse-proxy.service
+    echo "restart blobfuse-proxy...."
     $HOST_CMD systemctl restart blobfuse-proxy.service
+  else
+    echo "start blobfuse-proxy...."
+    $HOST_CMD systemctl start blobfuse-proxy.service
   fi
 fi
diff --git a/pkg/blobfuse-proxy/install-proxy.sh b/pkg/blobfuse-proxy/install-proxy.sh
@@ -115,10 +115,13 @@ if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
     cp /blobfuse-proxy/blobfuse-proxy.service /host/usr/lib/systemd/system/blobfuse-proxy.service
   fi
 
+  $HOST_CMD systemctl daemon-reload
+  $HOST_CMD systemctl enable blobfuse-proxy.service
   if [ "$updateBlobfuseProxy" = "true" ] || [ "$updateService" = "true" ];then
-    echo "start blobfuse-proxy...."
-    $HOST_CMD systemctl daemon-reload
-    $HOST_CMD systemctl enable blobfuse-proxy.service
+    echo "restart blobfuse-proxy...."
     $HOST_CMD systemctl restart blobfuse-proxy.service
+  else
+    echo "start blobfuse-proxy...."
+    $HOST_CMD systemctl start blobfuse-proxy.service
   fi
 fi