Skip to content

Commit 96e582a

Browse files
authored
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
2 parents 29ae1a6 + 9c0d9bd commit 96e582a

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

pkg/blobfuse-proxy/install-proxy-rhcos.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,13 @@ if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
7373
cp /blobfuse-proxy/blobfuse-proxy.service /host/etc/systemd/system/blobfuse-proxy.service
7474
fi
7575

76+
$HOST_CMD systemctl daemon-reload
77+
$HOST_CMD systemctl enable blobfuse-proxy.service
7678
if [ "$updateBlobfuseProxy" = "true" ] || [ "$updateService" = "true" ];then
77-
echo "start blobfuse-proxy...."
78-
$HOST_CMD systemctl daemon-reload
79-
$HOST_CMD systemctl enable blobfuse-proxy.service
79+
echo "restart blobfuse-proxy...."
8080
$HOST_CMD systemctl restart blobfuse-proxy.service
81+
else
82+
echo "start blobfuse-proxy...."
83+
$HOST_CMD systemctl start blobfuse-proxy.service
8184
fi
8285
fi

pkg/blobfuse-proxy/install-proxy.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,13 @@ if [ "${INSTALL_BLOBFUSE_PROXY}" = "true" ];then
115115
cp /blobfuse-proxy/blobfuse-proxy.service /host/usr/lib/systemd/system/blobfuse-proxy.service
116116
fi
117117

118+
$HOST_CMD systemctl daemon-reload
119+
$HOST_CMD systemctl enable blobfuse-proxy.service
118120
if [ "$updateBlobfuseProxy" = "true" ] || [ "$updateService" = "true" ];then
119-
echo "start blobfuse-proxy...."
120-
$HOST_CMD systemctl daemon-reload
121-
$HOST_CMD systemctl enable blobfuse-proxy.service
121+
echo "restart blobfuse-proxy...."
122122
$HOST_CMD systemctl restart blobfuse-proxy.service
123+
else
124+
echo "start blobfuse-proxy...."
125+
$HOST_CMD systemctl start blobfuse-proxy.service
123126
fi
124127
fi

0 commit comments

Comments
 (0)