alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

fix: join masters in serial (#437)

Browse Source 
Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
This commit is contained in:
Andrew Rynhard 2019-03-03 08:26:55 -08:00 committed by GitHub
parent 9f1e54c7c8
commit b6e6c46417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/app/init/pkg/system/services/kubeadm.go
View File

@ -58,11 +58,11 @@ func (k *Kubeadm) PreFunc(data *userdata.UserData) (err error) {
// PostFunc implements the Service interface.
func (k *Kubeadm) PostFunc(data *userdata.UserData) error {
if !data.IsBootstrap() {
if data.IsWorker() {
return nil
}
if data.Services.Trustd.Endpoints == nil {
if data.Services.Trustd == nil || data.Services.Trustd.Next == "" {
return nil
}
@ -72,8 +72,6 @@ func (k *Kubeadm) PostFunc(data *userdata.UserData) error {
)
files := []string{
"/etc/kubernetes/audit-policy.yaml",
constants.EncryptionConfigInitramfsPath,
"/etc/kubernetes/pki/ca.crt",
"/etc/kubernetes/pki/ca.key",
"/etc/kubernetes/pki/sa.key",
@ -82,19 +80,20 @@ func (k *Kubeadm) PostFunc(data *userdata.UserData) error {
"/etc/kubernetes/pki/front-proxy-ca.key",
"/etc/kubernetes/pki/etcd/ca.crt",
"/etc/kubernetes/pki/etcd/ca.key",
"/etc/kubernetes/audit-policy.yaml",
constants.EncryptionConfigInitramfsPath,
"/etc/kubernetes/admin.conf",
}
for _, endpoint := range data.Services.Trustd.Endpoints {
conn, err := basic.NewConnection(endpoint, constants.TrustdPort, creds)
if err != nil {
return err
}
client := proto.NewTrustdClient(conn)
conn, err := basic.NewConnection(data.Services.Trustd.Next, constants.TrustdPort, creds)
if err != nil {
return err
}
if err := writeFiles(client, files); err != nil {
return err
}
client := proto.NewTrustdClient(conn)
if err := writeFiles(client, files); err != nil {
return err
}
return nil

1
internal/pkg/userdata/userdata.go
View File

@ -214,6 +214,7 @@ type Trustd struct {
Password string `yaml:"password"`
Endpoints []string `yaml:"endpoints,omitempty"`
CertSANs []string `yaml:"certSANs,omitempty"`
Next string `yaml:"next,omitempty"`
}
// OSD describes the configuration of the osd service.