Skip to content

Commit

Permalink
Stop adopting masters with machine API
Browse files Browse the repository at this point in the history
Master machine assets were introduced by openshift#491 to adopt instances generated by tf. There was never a follow up to leverage adoption for fatrther addon features. Unless there's a good reason to keep the adoption, this PR removes the machine API master awareness and assets generation
  • Loading branch information
enxebre committed Apr 29, 2019
1 parent 8eefb82 commit c9316d8
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions pkg/asset/machines/master.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,11 @@ func (m *Master) Generate(dependencies asset.Parents) error {

// Files returns the files generated by the asset.
func (m *Master) Files() []*asset.File {
files := make([]*asset.File, 0, 1+len(m.MachineConfigFiles)+len(m.MachineFiles))
files := make([]*asset.File, 0, 1+len(m.MachineConfigFiles))
if m.UserDataFile != nil {
files = append(files, m.UserDataFile)
}
files = append(files, m.MachineConfigFiles...)
files = append(files, m.MachineFiles...)
return files
}

Expand All @@ -226,12 +225,6 @@ func (m *Master) Load(f asset.FileFetcher) (found bool, err error) {
return true, err
}

fileList, err := f.FetchByPattern(filepath.Join(directory, masterMachineFileNamePattern))
if err != nil {
return true, err
}

m.MachineFiles = fileList
return true, nil
}

Expand Down

0 comments on commit c9316d8

Please sign in to comment.