(cloudstack) branch main updated: CKS: fix control plane endpoint IP (#11720)

[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 9cc88b8dccc CKS: fix control plane endpoint IP (#11720)
9cc88b8dccc is described below

commit 9cc88b8dcccbaace9a831ab1721f295944eba432
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Mon Sep 29 09:10:56 2025 +0200

    CKS: fix control plane endpoint IP (#11720)
---
 .../cluster/actionworkers/KubernetesClusterStartWorker.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
index 9ffee220a10..8cd539b78e4 100644
--- 
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
+++ 
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
@@ -198,16 +198,16 @@ public class KubernetesClusterStartWorker extends 
KubernetesClusterResourceModif
         String initArgs = "";
         if (haSupported) {
             initArgs = String.format("--control-plane-endpoint %s:%d 
--upload-certs --certificate-key %s ",
-                    controlNodeIp,
+                    serverIp,
                     CLUSTER_API_PORT,
                     
KubernetesClusterUtil.generateClusterHACertificateKey(kubernetesCluster));
         }
-        initArgs += String.format("--apiserver-cert-extra-sans=%s", 
controlNodeIp);
+        initArgs += String.format("--apiserver-cert-extra-sans=%s", serverIp);
         initArgs += String.format(" --kubernetes-version=%s", 
getKubernetesClusterVersion().getSemanticVersion());
         k8sControlNodeConfig = 
k8sControlNodeConfig.replace(clusterInitArgsKey, initArgs);
         k8sControlNodeConfig = k8sControlNodeConfig.replace(ejectIsoKey, 
String.valueOf(ejectIso));
         k8sControlNodeConfig = k8sControlNodeConfig.replace(etcdEndpointList, 
endpointList);
-        k8sControlNodeConfig = k8sControlNodeConfig.replace(k8sServerIp, 
controlNodeIp);
+        k8sControlNodeConfig = k8sControlNodeConfig.replace(k8sServerIp, 
serverIp);
         k8sControlNodeConfig = k8sControlNodeConfig.replace(k8sApiPort, 
String.valueOf(CLUSTER_API_PORT));
         k8sControlNodeConfig = k8sControlNodeConfig.replace(certSans, 
String.format("- %s", serverIp));
         k8sControlNodeConfig = k8sControlNodeConfig.replace(k8sCertificate, 
KubernetesClusterUtil.generateClusterHACertificateKey(kubernetesCluster));