Skip to content

OCPBUGS-105315: Check secret before mutating vSphere templates #6382

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
djoshy wants to merge 1 commit into from
+19 −0
Closed

OCPBUGS-105315: Check secret before mutating vSphere templates #6382

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
19 changes: 19 additions & 0 deletions pkg/controller/bootimage/vsphere_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,12 @@ func resolveExistingTemplateVM(
if len(computedName) > 80 {
return nil, "", false, fmt.Errorf("length of VM template name `%s` exceeds the permitted limit of 80 characters", computedName)
}
// Validate/upgrade the ignition stub before creating the template in vSphere. If this fails,
// we must not have already mutated vSphere state, or a subsequent reconcile would find the
// template already in place and silently drop the error (see reconcileVSphereProviderSpec).
if err := upgradeStubIgnitionIfRequired(providerSpec.UserDataSecret.Name, kubeClient); err != nil {
return nil, "", false, err
}
ova, ovaErr := streamData.QueryDisk(arch, "vmware", "ova")
if ovaErr != nil {
return nil, "", false, ovaErr
Expand All @@ -383,6 +389,11 @@ func resolveExistingTemplateVM(
}

// Rollback: restore the old template renamed away during a crashed atomic swap.
// Validate/upgrade the ignition stub before this rename, so an invalid user-data secret blocks
// even this recovery mutation rather than only the OVA-driven create/swap paths.
if err := upgradeStubIgnitionIfRequired(providerSpec.UserDataSecret.Name, kubeClient); err != nil {
return nil, "", false, err
}
klog.Infof("Recovering from mid-swap crash: renaming %s back to %s", oldTempName, computedName)
renameTask, renameErr := oldVM.Rename(ctx, computedName)
if renameErr != nil {
Expand Down Expand Up @@ -742,6 +753,14 @@ func createNewVMTemplate(streamData *stream.Stream, providerSpec *machinev1beta1
if templateProductVersion != release {
klog.Infof("Existing RHCOS v%s does not match current RHCOS v%s. Starting reconciliation process.", templateProductVersion, release)

// Validate/upgrade the ignition stub before swapping the template in vSphere. If this
// fails, we must not have already mutated vSphere state, or a subsequent reconcile would
// find the template already up to date and silently drop the error (see
// reconcileVSphereProviderSpec).
if err := upgradeStubIgnitionIfRequired(providerSpec.UserDataSecret.Name, kubeClient); err != nil {
return "", false, err
}

Comment thread
coderabbitai[bot] marked this conversation as resolved.
// Find and download the relevant OVA file
ova, err := streamData.QueryDisk(arch, "vmware", "ova")
if err != nil {
Expand Down