1
0
mirror of https://github.com/rancher/types.git synced 2025-08-31 04:40:56 +00:00

Merge pull request #217 from galal-hussein/change_etcdservers

Change etcd servers to list of etcd urls
This commit is contained in:
Alena Prokharchyk 2018-02-14 12:01:45 -08:00 committed by GitHub
commit 933af7a29f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 17 deletions

View File

@ -124,8 +124,8 @@ type RKEConfigServices struct {
type ETCDService struct {
// Base service properties
BaseService `yaml:",inline" json:",inline"`
// Comma separated list of etcd urls
EtcdServers string `yaml:"etcd_servers" json:"etcdServers,omitempty"`
// List of etcd urls
ExternalURLs []string `yaml:"external_urls" json:"externalUrls,omitempty"`
// External CA certificate
CACert string `yaml:"ca_cert" json:"caCert,omitempty"`
// External Client certificate

View File

@ -2055,6 +2055,11 @@ func (in *DynamicSchemaStatus) DeepCopy() *DynamicSchemaStatus {
func (in *ETCDService) DeepCopyInto(out *ETCDService) {
*out = *in
in.BaseService.DeepCopyInto(&out.BaseService)
if in.ExternalURLs != nil {
in, out := &in.ExternalURLs, &out.ExternalURLs
*out = make([]string, len(*in))
copy(*out, *in)
}
return
}

View File

@ -1,22 +1,22 @@
package client
const (
ETCDServiceType = "etcdService"
ETCDServiceFieldCACert = "caCert"
ETCDServiceFieldCert = "cert"
ETCDServiceFieldEtcdServers = "etcdServers"
ETCDServiceFieldExtraArgs = "extraArgs"
ETCDServiceFieldImage = "image"
ETCDServiceFieldKey = "key"
ETCDServiceFieldPath = "path"
ETCDServiceType = "etcdService"
ETCDServiceFieldCACert = "caCert"
ETCDServiceFieldCert = "cert"
ETCDServiceFieldExternalURLs = "externalUrls"
ETCDServiceFieldExtraArgs = "extraArgs"
ETCDServiceFieldImage = "image"
ETCDServiceFieldKey = "key"
ETCDServiceFieldPath = "path"
)
type ETCDService struct {
CACert string `json:"caCert,omitempty"`
Cert string `json:"cert,omitempty"`
EtcdServers string `json:"etcdServers,omitempty"`
ExtraArgs map[string]string `json:"extraArgs,omitempty"`
Image string `json:"image,omitempty"`
Key string `json:"key,omitempty"`
Path string `json:"path,omitempty"`
CACert string `json:"caCert,omitempty"`
Cert string `json:"cert,omitempty"`
ExternalURLs []string `json:"externalUrls,omitempty"`
ExtraArgs map[string]string `json:"extraArgs,omitempty"`
Image string `json:"image,omitempty"`
Key string `json:"key,omitempty"`
Path string `json:"path,omitempty"`
}