Skip to content

fix: guard nil ConfigMap.Data before assignment in two controllers #2773

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

Open
AruneshDwivedi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: guard nil ConfigMap.Data before assignment in two controllers #2773

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
3 changes: 3 additions & 0 deletions pkg/yurtmanager/controller/platformadmin/platform_admin_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,9 @@ func (r *ReconcilePlatformAdmin) writeFramework(ctx context.Context, platformAdm

// Creates configmap on behalf of the framework, which is called only once upon creation
_, err = controllerutil.CreateOrUpdate(ctx, r.Client, cm, func() error {
if cm.Data == nil {
cm.Data = make(map[string]string)
}
cm.Data["framework"] = string(data)
return controllerutil.SetOwnerReference(platformAdmin, cm, r.Scheme())
})
Expand Down
3 changes: 3 additions & 0 deletions pkg/yurtmanager/controller/raven/dns/gateway_dns_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ func (r *ReconcileDNS) Reconcile(ctx context.Context, req reconcile.Request) (re
klog.Error(Format("could not list node, error %s", err.Error()))
return reconcile.Result{Requeue: true, RequeueAfter: 2 * time.Second}, err
}
if cm.Data == nil {
cm.Data = make(map[string]string)
}
cm.Data[util.ProxyNodesKey] = buildDNSRecords(&nodeList, enableProxy, proxyAddress)
err = r.updateDNS(cm)
if err != nil {
Expand Down