Skip to content
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.

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

Update core SSH keys #23

Merged
merged 11 commits into from
Jun 7, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix crash
loganmc10 committed Jun 7, 2023

Verified

This commit was signed with the committer’s verified signature. The key has expired.
addaleax Anna Henningsen
commit 2000826892f56d0c1a11b29e670bf74825ef60bd
2 changes: 1 addition & 1 deletion internal/ssh/reconcile.go
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ func Reconcile(client client.Client, scheme *runtime.Scheme, ctx context.Context
for _, v := range []string{"master", "worker"} {
machineConfig := &machineconfigurationv1.MachineConfig{ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("core-ssh-key-%s", v)}}
op, err := controllerutil.CreateOrUpdate(ctx, client, machineConfig, func() error {
machineConfig.Labels["machineconfiguration.openshift.io/role"] = v
machineConfig.Labels = map[string]string{"machineconfiguration.openshift.io/role": v}
configData := MachineConfigData{
Ignition: map[string]string{"version": "3.2.0"},
Passwd: MachineConfigPasswdData{