(cloudstack) branch main updated: server: fix mgmt server 503 error by renaming kubernetesClusterHelper to kubernetesServiceHelper

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new aab13619491 server: fix mgmt server 503 error by renaming 
kubernetesClusterHelper to kubernetesServiceHelper
aab13619491 is described below

commit aab13619491ee212f1f60fd5bdfaa7e26c44650d
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Sat Jun 15 08:35:36 2024 +0200

    server: fix mgmt server 503 error by renaming kubernetesClusterHelper to 
kubernetesServiceHelper
---
 server/src/main/java/com/cloud/vm/UserVmManagerImpl.java     | 12 ++++++------
 .../cloudstack/core/spring-server-core-managers-context.xml  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 0963fabf233..ee73818638c 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -611,7 +611,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
     private boolean _dailyOrHourly = false;
     private int capacityReleaseInterval;
     private ExecutorService _vmIpFetchThreadExecutor;
-    private List<KubernetesServiceHelper> kubernetesClusterHelpers;
+    private List<KubernetesServiceHelper> kubernetesServiceHelpers;
 
 
     private String _instance;
@@ -625,12 +625,12 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
     private static final int NUM_OF_2K_BLOCKS = 512;
     private static final int MAX_HTTP_POST_LENGTH = NUM_OF_2K_BLOCKS * 
MAX_USER_DATA_LENGTH_BYTES;
 
-    public List<KubernetesServiceHelper> getKubernetesClusterHelpers() {
-        return kubernetesClusterHelpers;
+    public List<KubernetesServiceHelper> getKubernetesServiceHelpers() {
+        return kubernetesServiceHelpers;
     }
 
-    public void setKubernetesClusterHelpers(final 
List<KubernetesServiceHelper> kubernetesClusterHelpers) {
-        this.kubernetesClusterHelpers = kubernetesClusterHelpers;
+    public void setKubernetesServiceHelpers(final 
List<KubernetesServiceHelper> kubernetesServiceHelpers) {
+        this.kubernetesServiceHelpers = kubernetesServiceHelpers;
     }
 
     @Inject
@@ -2564,7 +2564,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
         // cleanup port forwarding rules
         VMInstanceVO vmInstanceVO = _vmInstanceDao.findById(vmId);
         NsxProviderVO nsx = 
nsxProviderDao.findByZoneId(vmInstanceVO.getDataCenterId());
-        if (Objects.isNull(nsx) || 
Objects.isNull(kubernetesClusterHelpers.get(0).findByVmId(vmId))) {
+        if (Objects.isNull(nsx) || 
Objects.isNull(kubernetesServiceHelpers.get(0).findByVmId(vmId))) {
             if (_rulesMgr.revokePortForwardingRulesForVm(vmId)) {
                 logger.debug("Port forwarding rules are removed successfully 
as a part of vm id=" + vmId + " expunge");
             } else {
diff --git 
a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
 
b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
index 2a33d0d4a97..163e54a14f3 100644
--- 
a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
+++ 
b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -107,7 +107,7 @@
     <bean id="configurationServerImpl" 
class="com.cloud.server.ConfigurationServerImpl" />
 
     <bean id="userVmManagerImpl" class="com.cloud.vm.UserVmManagerImpl">
-        <property name="kubernetesClusterHelpers" 
value="#{kubernetesClusterHelperRegistry.registered}" />
+        <property name="kubernetesServiceHelpers" 
value="#{kubernetesServiceHelperRegistry.registered}" />
     </bean>
 
     <bean id="consoleProxyManagerImpl" 
class="com.cloud.consoleproxy.ConsoleProxyManagerImpl">