Skip to content

installer/pkg/config-generator: Pass ignition config pointers #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wking wants to merge 1 commit into from
Closed

installer/pkg/config-generator: Pass ignition config pointers #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions installer/pkg/config-generator/ignition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ func (c *ConfigGenerator) GenerateIgnConfig(clusterDir string) error {
// XXX(crawford): The SSH key should only be added to the bootstrap
// node. After that, MCO should be responsible for
// distributing SSH keys.
c.embedUserBlock(&workerCfg)
c.appendCertificateAuthority(&workerCfg, ca)
c.embedAppendBlock(&workerCfg, "worker", "")
c.embedUserBlock(workerCfg)
c.appendCertificateAuthority(workerCfg, ca)
c.embedAppendBlock(workerCfg, "worker", "")

if err = ignCfgToFile(workerCfg, filepath.Join(clusterDir, config.IgnitionPathWorker)); err != nil {
return err
Expand All @@ -65,9 +65,9 @@ func (c *ConfigGenerator) GenerateIgnConfig(clusterDir string) error {
// XXX(crawford): The SSH key should only be added to the bootstrap
// node. After that, MCO should be responsible for
// distributing SSH keys.
c.embedUserBlock(&ignCfg)
c.appendCertificateAuthority(&ignCfg, ca)
c.embedAppendBlock(&ignCfg, "master", fmt.Sprintf("etcd_index=%d", i))
c.embedUserBlock(ignCfg)
c.appendCertificateAuthority(ignCfg, ca)
c.embedAppendBlock(ignCfg, "master", fmt.Sprintf("etcd_index=%d", i))

if err = ignCfgToFile(ignCfg, filepath.Join(clusterDir, fmt.Sprintf(config.IgnitionPathMaster, i))); err != nil {
return err
Expand All @@ -77,9 +77,9 @@ func (c *ConfigGenerator) GenerateIgnConfig(clusterDir string) error {
return nil
}

func parseIgnFile(filePath string) (ignconfigtypes.Config, error) {
func parseIgnFile(filePath string) (*ignconfigtypes.Config, error) {
if filePath == "" {
return ignconfigtypes.Config{
return &ignconfigtypes.Config{
Ignition: ignconfigtypes.Ignition{
Version: ignconfigtypes.MaxVersion.String(),
},
Expand All @@ -88,15 +88,15 @@ func parseIgnFile(filePath string) (ignconfigtypes.Config, error) {

data, err := ioutil.ReadFile(filePath)
if err != nil {
return ignconfigtypes.Config{}, err
return nil, err
}

cfg, rpt, _ := ignconfig.Parse(data)
if len(rpt.Entries) > 0 {
return ignconfigtypes.Config{}, fmt.Errorf("failed to parse ignition file %s: %s", filePath, rpt.String())
return nil, fmt.Errorf("failed to parse ignition file %s: %s", filePath, rpt.String())
}

return cfg, nil
return &cfg, nil
}

func (c *ConfigGenerator) embedAppendBlock(ignCfg *ignconfigtypes.Config, role string, query string) {
Expand Down Expand Up @@ -147,8 +147,8 @@ func (c *ConfigGenerator) getTNCURL(role string, query string) string {
return u
}

func ignCfgToFile(ignCfg ignconfigtypes.Config, filePath string) error {
data, err := json.MarshalIndent(&ignCfg, "", " ")
func ignCfgToFile(ignCfg *ignconfigtypes.Config, filePath string) error {
data, err := json.MarshalIndent(ignCfg, "", " ")
if err != nil {
return err
}
Expand Down