From 68359b30dc1368b3ed39e7347ef21e687425b9af Mon Sep 17 00:00:00 2001 From: lauk001 Date: Mon, 11 Dec 2023 11:29:17 +0800 Subject: [PATCH] Adjust the apiserverEndpoint field --- pkg/cert/GenerateAllFiles.go | 2 +- pkg/ignition/common.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/cert/GenerateAllFiles.go b/pkg/cert/GenerateAllFiles.go index 60077b1..78b012c 100644 --- a/pkg/cert/GenerateAllFiles.go +++ b/pkg/cert/GenerateAllFiles.go @@ -40,7 +40,7 @@ func GenerateAllFiles(clusterID string, node *asset.NodeAsset) ([]utils.StorageC ipaddress := node.IP //用于后续kubeconfig生成 - apiserverEndpoint := clusterconfig.Kubernetes.ApiServer_Endpoint + apiserverEndpoint := "https://" + clusterconfig.Kubernetes.ApiServer_Endpoint /* **********生成root CA 证书和密钥********** */ diff --git a/pkg/ignition/common.go b/pkg/ignition/common.go index 1824cc3..a366fa3 100644 --- a/pkg/ignition/common.go +++ b/pkg/ignition/common.go @@ -211,6 +211,7 @@ func GetTmplData(c *asset.ClusterAsset) *TmplData { temp := c.Master[i].IP + " " + c.Master[i].Hostname + "\n" hsip = hsip + temp } + return &TmplData{ APIServerURL: c.Kubernetes.ApiServer_Endpoint, ImageRegistry: c.Kubernetes.Image_Registry, @@ -220,6 +221,7 @@ func GetTmplData(c *asset.ClusterAsset) *TmplData { PodSubnet: c.Network.Pod_Subnet, Token: c.Kubernetes.Token, CorednsImageTag: c.Network.CoreDNS_Image_Version, + IpSegment: ipSegment.String(), ReleaseImageURl: c.Kubernetes.Release_Image_URL, CertificateKey: c.Kubernetes.CertificateKey, Hsip: hsip, -- Gitee