Skip to content

Stop adopting masters with machine API #1687

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
enxebre wants to merge 1 commit into from
Closed

Stop adopting masters with machine API #1687

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
9 changes: 1 addition & 8 deletions pkg/asset/machines/master.go
View file
Open in desktop
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
Copy link
Contributor

@staebler staebler Apr 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break loading the asset from disk. The MachineFiles will be empty when the asset is loaded from disk.

return true, nil
}

Expand Down