Skip to content

controller: Prefix generated configs with pool type #218

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

Merged
openshift-merge-robot merged 1 commit into from
Dec 12, 2018
Merged

controller: Prefix generated configs with pool type #218

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions pkg/controller/render/hash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ var (
}
)

func getMachineConfigHashedName(config *mcfgv1.MachineConfig) (string, error) {
// Given a config from a pool, generate a name for the config
// of the form <poolname>-<hash>
func getMachineConfigHashedName(pool *mcfgv1.MachineConfigPool, config *mcfgv1.MachineConfig) (string, error) {
if config == nil {
return "", fmt.Errorf("empty machineconfig object")
}
Expand All @@ -34,7 +36,7 @@ func getMachineConfigHashedName(config *mcfgv1.MachineConfig) (string, error) {
if err != nil {
return "", err
}
return fmt.Sprintf("%x", h), nil
return fmt.Sprintf("%s-%x", pool.GetName(), h), nil
}

func hashData(data []byte) ([]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/render/render_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ func (ctrl *Controller) syncGeneratedMachineConfig(pool *mcfgv1.MachineConfigPoo

func generateMachineConfig(pool *mcfgv1.MachineConfigPool, configs []*mcfgv1.MachineConfig) (*mcfgv1.MachineConfig, error) {
merged := mcfgv1.MergeMachineConfigs(configs)
hashedName, err := getMachineConfigHashedName(merged)
hashedName, err := getMachineConfigHashedName(pool, merged)
if err != nil {
return nil, err
}
Expand Down