diff --git a/pkg/cert/GenerateAllFiles.go b/pkg/cert/GenerateAllFiles.go index 60077b139a47ff6b69612d9ea1fbc3128c467cbb..78b012caa6a40f8de9ab02b024acd0bcf8e9e6a1 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 1824cc3f4e328fd3ccd3b0bac447dda12ee38272..a366fa3100abb94bd735918edbc6ee7b8d46a32d 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,