diff --git a/app/apis/nkd/const.go b/app/apis/nkd/const.go index ebb40129156063fdad2aabb6c60dcc4fc949323c..35274993c60dc9b2e5afc76a1b60c879e9c4edd7 100644 --- a/app/apis/nkd/const.go +++ b/app/apis/nkd/const.go @@ -103,4 +103,7 @@ var ( Master_Count = 3 Worker_Count = 3 + + // containerdaemon + Pauseversion = "pause:3.6" ) diff --git a/app/apis/nkd/types.go b/app/apis/nkd/types.go index bc8b9a1c0ba726e21d3bb87bbf1f53a46f329aa3..ed5782c6ca692d35871b056ed31e4c289863a8bf 100644 --- a/app/apis/nkd/types.go +++ b/app/apis/nkd/types.go @@ -65,11 +65,6 @@ type Repo struct { Registry string `yaml:"registry"` } -type TypeMeta struct { - // Kind string - ApiVersion string -} - type BootstrapTokenString struct { ID string `json:"-"` Secret string `json:"-" datapolicy:"token"` @@ -256,8 +251,6 @@ type DNS struct { ImageMeta `json:",inline"` } type ClusterConfiguration struct { - TypeMeta - // ComponentConfigs holds component configs known to kubeadm, should long-term only exist in the internal kubeadm API // +k8s:conversion-gen=false ComponentConfigs ComponentConfigMap @@ -335,7 +328,6 @@ type Patches struct { type Kubeadm struct { ClusterConfiguration - TypeMeta BootstrapTokens []BootstrapToken LocalAPIEndpoint APIEndpoint NodeRegistration NodeRegistrationOptions @@ -347,23 +339,19 @@ type Addon struct { Addons []map[string]string } -// type Nkd struct { -// Cluster Cluster -// System []System -// Repo Repo -// Kubeadm Kubeadm -// Addon Addon -// Infra Infra -// } +type ContainerDaemon struct { + Pause string +} type Master struct { - Node string - Cluster Cluster - System System - Repo Repo - Kubeadm Kubeadm - Addon Addon - Infra Infra + Node string + ContainerDaemon ContainerDaemon + Cluster Cluster + System System + Repo Repo + Kubeadm Kubeadm + Addon Addon + Infra Infra } type WorkerK8s struct { @@ -385,12 +373,13 @@ type Discovery struct { } type Worker struct { - Node string - Repo Repo - System System - Infra Infra - Addon Addon - Worker WorkerK8s + Node string + ContainerDaemon ContainerDaemon + Repo Repo + System System + Infra Infra + Addon Addon + Worker WorkerK8s } type Node struct { diff --git a/app/cmd/phases/config/print.go b/app/cmd/phases/config/print.go index 1db6b81de3ea8c57a350168bff995f1fe9c18ce2..df4c54535eda93ce492dfd7b437d4b53fb6e41f5 100644 --- a/app/cmd/phases/config/print.go +++ b/app/cmd/phases/config/print.go @@ -140,11 +140,17 @@ func DefaultedStaticWorkerConfiguration(internalconfig *nkd.Worker) *nkd.Worker CaCertPath: nkd.CaCertPath, NodeRegistration: nodeRegistrationOptions, } + + containerdaemon := nkd.ContainerDaemon{ + Pause: nkd.Pauseversion, + } + internalconfig.Node = nkd.WorkerNode internalconfig.Repo = repo internalconfig.System = system1 internalconfig.Infra = infra internalconfig.Worker = worker + internalconfig.ContainerDaemon = containerdaemon return nil } @@ -200,10 +206,6 @@ func DefaultedStaticMasterConfiguration(internalconfig *nkd.Master) *nkd.Master Usages: nkd.DefaultUsages, } - typemeta := nkd.TypeMeta{ - ApiVersion: nkd.DefaultapiVersion, - } - localAPIEndpoint := nkd.APIEndpoint{ AdvertiseAddress: nkd.AdvertiseAddress, BindPort: nkd.BindPort, @@ -217,7 +219,6 @@ func DefaultedStaticMasterConfiguration(internalconfig *nkd.Master) *nkd.Master } ClusterConfiguration := nkd.ClusterConfiguration{ - TypeMeta: typemeta, CertificatesDir: nkd.CertificatesDir, ClusterName: nkd.ClusterName, Etcd: nkd.Etcd{Local: &nkd.LocalEtcd{DataDir: nkd.LocalDir}}, @@ -229,17 +230,22 @@ func DefaultedStaticMasterConfiguration(internalconfig *nkd.Master) *nkd.Master kubeadm := nkd.Kubeadm{ ClusterConfiguration: ClusterConfiguration, - TypeMeta: typemeta, BootstrapTokens: []nkd.BootstrapToken{bootstrapToken}, LocalAPIEndpoint: localAPIEndpoint, NodeRegistration: NodeRegistrationOptions, } + + containerdaemon := nkd.ContainerDaemon{ + Pause: nkd.Pauseversion, + } + internalconfig.Node = nkd.MasterNode internalconfig.Kubeadm = kubeadm internalconfig.Cluster = cluster internalconfig.Infra = infra internalconfig.System = system1 internalconfig.Repo = repo + internalconfig.ContainerDaemon = containerdaemon return internalconfig } diff --git a/app/util/config/initconfiguration.go b/app/util/config/initconfiguration.go index 464b22ecd71fcfab4bb5b363f992d3f598ebc442..9bc3f3e9622cf73896bddfc326818d57fcf1a37e 100644 --- a/app/util/config/initconfiguration.go +++ b/app/util/config/initconfiguration.go @@ -45,18 +45,6 @@ func LoadOrDefaultInitConfiguration(cfgPath string) (interface{}, string, error) } func LoadInitConfigurationFromFile(cfg string) (interface{}, string, error) { - // conf := new(nkd.Node) - // yamlFile, err := ioutil.ReadFile(cfg) - // if err != nil { - // return nil, err - // } - // err = yaml.Unmarshal(yamlFile, conf) - // fmt.Println(conf) - // if err != nil { - // fmt.Println("marshal error") - // } - // // return conf, nil - // return nil, nil node := new(nkd.Node) yamlFile, err := ioutil.ReadFile(cfg)