15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	api/v1alpha1/default.go
#	pkg/cluster/etcd/etcd.go
#	pkg/cluster/etcd/tmpl/etcdbackup.go
This commit is contained in:
“Forest-L 2020-09-28 15:08:05 +08:00
parent dfcafd11ba 3e5ffdc07d
commit b8377e5090
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/v1alpha1/cluster_types.go
View File

@ -43,6 +43,7 @@ type ClusterSpec struct {
Registry RegistryConfig `yaml:"registry" json:"registry,omitempty"`
Addons []Addon `yaml:"addons" json:"addons,omitempty"`
KubeSphere KubeSphere `json:"kubesphere,omitempty"`
Etcd EtcdCfg `yaml:"etcd" json:"etcd,omitempty"`
}
// ClusterStatus defines the observed state of Cluster

7
api/v1alpha1/network_types.go
View File

@ -28,3 +28,10 @@ type CalicoCfg struct {
VXLANMode string `yaml:"vxlanMode" json:"vxlanMode,omitempty"`
VethMTU string `yaml:"vethMTU" json:"vethMTU,omitempty"`
}
type EtcdCfg struct {
EtcdBackupDir string `yaml:"etcdBackupDir" json:"etcdBackupDir,omitempty"`
EtcdBackupPeriod string `yaml:"etcdBackupPeriod" json:"etcdBackupPeriod,omitempty"`
KeepBackupNumber string `yaml:"keepBackupNumber" json:"keepBackupNumber,omitempty"`
EtcdBackupScript string `yaml:"etcdBackupScript" json:"etcdBackupScript,omitempty"`
}