Skip to content

[release-4.18] OCPBUGS-61743: Fix panic when replacing services configmap #3306

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
merged 1 commit into from
Oct 23, 2025
Merged

[release-4.18] OCPBUGS-61743: Fix panic when replacing services configmap #3306

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
26 changes: 18 additions & 8 deletions controllers/configmap_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,17 +200,27 @@ func (r *ConfigMapReconciler) reconcileServices(ctx context.Context, windowsServ

// If a ConfigMap with invalid values is found, WMCO will delete and recreate it with proper values
data, err := servicescm.Parse(windowsServices.Data)
if err != nil || data.ValidateExpectedContent(r.servicesManifest) != nil {
// Deleting will trigger an event for the configmap_controller, which will re-create a proper ConfigMap
if err = r.client.Delete(ctx, windowsServices); err != nil {
return err
if err == nil {
validateErr := data.ValidateExpectedContent(r.servicesManifest)
if validateErr == nil {
return nil
}
r.log.Info("Deleted invalid resource", "ConfigMap",
kubeTypes.NamespacedName{Namespace: r.watchNamespace, Name: windowsServices.Name}, "Error", err.Error())
return nil
r.log.V(1).Info("Invalid content",
"ConfigMap", kubeTypes.NamespacedName{Namespace: r.watchNamespace, Name: windowsServices.Name},
"Error", validateErr)
} else {
r.log.V(1).Info("Parse error",
"ConfigMap", kubeTypes.NamespacedName{Namespace: r.watchNamespace, Name: windowsServices.Name},
"Error", err)
}
// Deleting will trigger an event for the configmap_controller, which will re-create a proper ConfigMap
if err = r.client.Delete(ctx, windowsServices); err != nil {
return err
}
// TODO: actually react to changes to the services ConfigMap
r.log.Info("Deleted invalid resource", "ConfigMap",
kubeTypes.NamespacedName{Namespace: r.watchNamespace, Name: windowsServices.Name})
return nil
// TODO: actually react to changes to the services ConfigMap
}

// removeOutdatedServicesConfigMaps deletes any outdated services ConfigMaps, if all nodes have moved past that version
Expand Down