diff --git a/docs/config_file_desc.md b/docs/config_file_desc.md index 1e0fae26b7235074b25a149da4ffaef700d1c23a..ca819b195549d5d211d1f51b1ceeeb14e8a28631 100644 --- a/docs/config_file_desc.md +++ b/docs/config_file_desc.md @@ -29,18 +29,18 @@ worker: # 配置worker节点的列 ip: "" # 如果不设置worker节点IP地址，则由dhcp自动分配，默认为空 runtime: isulad # 指定容器运行时类型，目前支持 docker、isulad、containerd和crio kubernetes: # 集群相关配置列表 - kubernetes_version: "v1.23.10" # 部署集群的版本 + kubernetes-version: "v1.23.10" # 部署集群的版本 kubernetes-apiversion: "v1beta3" # 指定kubeadm配置文件格式的版本，目前支持 v1beta3、v1beta2、v1beta1 - apiserver_endpoint: "192.168.132.11:6443" # 对外暴露的APISERVER服务的地址或域名 - image_registry: "k8s.gcr.io" # 下载容器镜像时使用的镜像仓库的mirror站点地址 - pause_image: "pause:3.6" # 容器运行时的pause容器的容器镜像名称 - release_image_url: "hub.oepkgs.net/nestos/nestos:22.03-LTS-SP2.20230928.0-{arch}-k8s-v1.23.10" # 包含K8S二进制组件的NestOS发布镜像的地址，支持架构x86_64或者aarch64 + apiserver-endpoint: "192.168.132.11:6443" # 对外暴露的APISERVER服务的地址或域名 + image-registry: "k8s.gcr.io" # 下载容器镜像时使用的镜像仓库的mirror站点地址 + pause-image: "pause:3.6" # 容器运行时的pause容器的容器镜像名称 + release-image-url: "hub.oepkgs.net/nestos/nestos:22.03-LTS-SP2.20230928.0-{arch}-k8s-v1.23.10" # 包含K8S二进制组件的NestOS发布镜像的地址，支持架构x86_64或者aarch64 token: "" # 启动引导过程中使用的令牌，默认自动生成 adminkubeconfig: /etc/nkd/cluster/admin.config # 集群管理员配置文件admin.conf的路径 certificatekey: "" # 添加新的控制面节点时用来解密所下载的Secret中的证书的秘钥 network: # k8s集群网络配置 - service_subnet: "10.96.0.0/16" # k8s创建的service的IP地址网段 - pod_subnet: "10.244.0.0/16" # k8s集群网络的IP地址网段 + service-subnet: "10.96.0.0/16" # k8s创建的service的IP地址网段 + pod-subnet: "10.244.0.0/16" # k8s集群网络的IP地址网段 plugin: https://projectcalico.docs.tigera.io/archive/v3.22/manifests/calico.yaml # 网络插件 housekeeper: # housekeeper相关配置列表 deployhousekeeper: false # 是否部署housekeeper diff --git a/pkg/cert/GenerateAllFiles.go b/pkg/cert/GenerateAllFiles.go index 87fcdec565629279ef7f2b35a04a47437eb75da1..f0eb37931db64b367a6c4bf54af900204b456560 100644 --- a/pkg/cert/GenerateAllFiles.go +++ b/pkg/cert/GenerateAllFiles.go @@ -42,14 +42,14 @@ func GenerateAllFiles(clusterID string, node *asset.NodeAsset) ([]utils.StorageC ipaddress := node.IP //用于后续kubeconfig生成 - apiserverEndpoint := "https://" + clusterconfig.Kubernetes.ApiServer_Endpoint + apiserverEndpoint := "https://" + clusterconfig.Kubernetes.ApiServerEndpoint //读取用户自定义服务子网IP /*TODO: 1. 新增internalAPIServerVirtualIP 字段用于读取用户自定义内容； 2. 新增判断，默认值取用Network.Service_Subnet并进行以下解析，如用户填充internalAPIServerVirtualIP 则读取用户自定义内容 3. 持续调研service clusterip相关内容，是否有统一入口进行相关配置。*/ - _, svcSubnet, err := net.ParseCIDR(clusterconfig.Network.Service_Subnet) + _, svcSubnet, err := net.ParseCIDR(clusterconfig.Network.ServiceSubnet) if err != nil { logrus.Errorf("unable to get internal Kubernetes Service IP from the given service CIDR: %v\n", err) return nil, err diff --git a/pkg/configmanager/asset/clusterasset.go b/pkg/configmanager/asset/clusterasset.go index 53492a406afe31fb6484d41a7976537084a9051d..0cb84b36226a3b050b82a5b6475005af2498628b 100644 --- a/pkg/configmanager/asset/clusterasset.go +++ b/pkg/configmanager/asset/clusterasset.go @@ -168,12 +168,12 @@ type InfraPlatform interface { } type Kubernetes struct { - Kubernetes_Version string + KubernetesVersion string `yaml:"kubernetes-version"` KubernetesAPIVersion string `yaml:"kubernetes-apiversion"` - ApiServer_Endpoint string - Image_Registry string - Pause_Image string - Release_Image_URL string + ApiServerEndpoint string `yaml:"apiserver-endpoint"` + ImageRegistry string `yaml:"image-registry"` + PauseImage string `yaml:"pause-image"` + ReleaseImageURL string `yaml:"release-image-url"` Token string AdminKubeConfig string CertificateKey string @@ -182,9 +182,9 @@ type Kubernetes struct { } type Network struct { - Service_Subnet string - Pod_Subnet string - Plugin string + ServiceSubnet string `yaml:"service-subnet"` + PodSubnet string `yaml:"pod-subnet"` + Plugin string } type Housekeeper struct { @@ -272,16 +272,16 @@ func (clusterAsset *ClusterAsset) InitClusterAsset(infraAsset InfraAsset, opts * setStringValue(&clusterAsset.UserName, opts.UserName, cf.UserName) setStringValue(&clusterAsset.Password, opts.Password, cf.Password) setStringValue(&clusterAsset.SSHKey, opts.SSHKey, cf.SSHKey) - setStringValue(&clusterAsset.Kubernetes.Kubernetes_Version, opts.KubeVersion, cf.Kubernetes_Version) + setStringValue(&clusterAsset.Kubernetes.KubernetesVersion, opts.KubeVersion, cf.KubernetesVersion) setStringValue(&clusterAsset.Runtime, opts.Runtime, cf.Runtime) - setStringValue(&clusterAsset.Kubernetes.ApiServer_Endpoint, opts.ApiServerEndpoint, cf.ApiServer_Endpoint) - setStringValue(&clusterAsset.Kubernetes.Image_Registry, opts.ImageRegistry, cf.Image_Registry) - setStringValue(&clusterAsset.Kubernetes.Pause_Image, opts.PauseImage, cf.Pause_Image) - setStringValue(&clusterAsset.Kubernetes.Release_Image_URL, opts.ReleaseImageUrl, cf.Release_Image_URL) + setStringValue(&clusterAsset.Kubernetes.ApiServerEndpoint, opts.ApiServerEndpoint, cf.ApiServerEndpoint) + setStringValue(&clusterAsset.Kubernetes.ImageRegistry, opts.ImageRegistry, cf.ImageRegistry) + setStringValue(&clusterAsset.Kubernetes.PauseImage, opts.PauseImage, cf.PauseImage) + setStringValue(&clusterAsset.Kubernetes.ReleaseImageURL, opts.ReleaseImageUrl, cf.ReleaseImageURL) setStringValue(&clusterAsset.Kubernetes.CertificateKey, opts.CertificateKey, opts.CertificateKey) setStringValue(&clusterAsset.Kubernetes.Token, opts.Token, cf.Token) - setStringValue(&clusterAsset.Kubernetes.Network.Service_Subnet, opts.NetWork.ServiceSubnet, cf.Service_Subnet) - setStringValue(&clusterAsset.Kubernetes.Network.Pod_Subnet, opts.NetWork.PodSubnet, cf.Network.Pod_Subnet) + setStringValue(&clusterAsset.Kubernetes.Network.ServiceSubnet, opts.NetWork.ServiceSubnet, cf.ServiceSubnet) + setStringValue(&clusterAsset.Kubernetes.Network.PodSubnet, opts.NetWork.PodSubnet, cf.Network.PodSubnet) setStringValue(&clusterAsset.Kubernetes.Network.Plugin, opts.NetWork.Plugin, cf.Network.Plugin) apiVersion, err := utils.GetKubernetesApiVersion(opts.KubernetesAPIVersion) if err != nil { @@ -370,18 +370,18 @@ func GetDefaultClusterConfig(arch string) (*ClusterAsset, error) { }, Runtime: "isulad", Kubernetes: Kubernetes{ - Kubernetes_Version: "v1.23.10", + KubernetesVersion: "v1.23.10", KubernetesAPIVersion: "v1beta3", - ApiServer_Endpoint: utils.GetApiServerEndpoint("192.168.132.11"), - Image_Registry: "k8s.gcr.io", - Pause_Image: "pause:3.6", - Release_Image_URL: "", + ApiServerEndpoint: utils.GetApiServerEndpoint("192.168.132.11"), + ImageRegistry: "k8s.gcr.io", + PauseImage: "pause:3.6", + ReleaseImageURL: "", Token: generateToken(), CertificateKey: "a301c9c55596c54c5d4c7173aa1e3b6fd304130b0c703bb23149c0c69f94b8e0", Network: Network{ - Service_Subnet: "10.96.0.0/16", - Pod_Subnet: "10.244.0.0/16", - Plugin: "https://projectcalico.docs.tigera.io/archive/v3.22/manifests/calico.yaml", + ServiceSubnet: "10.96.0.0/16", + PodSubnet: "10.244.0.0/16", + Plugin: "https://projectcalico.docs.tigera.io/archive/v3.22/manifests/calico.yaml", }, }, Housekeeper: Housekeeper{ diff --git a/pkg/ignition/common.go b/pkg/ignition/common.go index 7f9b9801d1721a6a0e7a7cb9aeb640ec7bb6ff3d..8e046aa0b6778d1a6b4463cd30307667b16117c0 100644 --- a/pkg/ignition/common.go +++ b/pkg/ignition/common.go @@ -214,17 +214,17 @@ func GetTmplData(c *asset.ClusterAsset) (*TmplData, error) { } return &TmplData{ - APIServerURL: c.Kubernetes.ApiServer_Endpoint, - ImageRegistry: c.Kubernetes.Image_Registry, + APIServerURL: c.Kubernetes.ApiServerEndpoint, + ImageRegistry: c.Kubernetes.ImageRegistry, Runtime: c.Runtime, CriSocket: criSocket, - PauseImage: c.Kubernetes.Pause_Image, - KubeVersion: c.Kubernetes.Kubernetes_Version, + PauseImage: c.Kubernetes.PauseImage, + KubeVersion: c.Kubernetes.KubernetesVersion, KubeadmApiVersion: c.Kubernetes.KubernetesAPIVersion, - ServiceSubnet: c.Network.Service_Subnet, - PodSubnet: c.Network.Pod_Subnet, + ServiceSubnet: c.Network.ServiceSubnet, + PodSubnet: c.Network.PodSubnet, Token: c.Kubernetes.Token, - ReleaseImageURl: c.Kubernetes.Release_Image_URL, + ReleaseImageURl: c.Kubernetes.ReleaseImageURL, CertificateKey: c.Kubernetes.CertificateKey, Hsip: hsip, }, nil