Skip to content

fix: prevent nil map panic when updating node annotations and labels #10

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
zhangben6 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent nil map panic when updating node annotations and labels #10

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
12 changes: 12 additions & 0 deletions pkg/ccm/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ func (i *instances) NodeAddressesByProviderID(ctx context.Context, providerID st

// 20240117 node updates Annotation in real time and compatible with Cpu bundled core
if len(res.Data.Annotations) != 0 {
// init annotations map if nil
if nodeAnnotations.ObjectMeta.Annotations == nil {
nodeAnnotations.ObjectMeta.Annotations = make(map[string]string)
}
for _, annotation := range res.Data.Annotations {
for key, value := range annotation {
nodeAnnotations.ObjectMeta.Annotations[key] = value
Expand Down Expand Up @@ -196,6 +200,10 @@ func (i *instances) InstanceTypeByProviderID(ctx context.Context, providerID str
// set labels
returnInstanceTypeValue := ""
if len(res.Data.Labels) != 0 {
// init labels map if nil
if nodeLabels.ObjectMeta.Labels == nil {
nodeLabels.ObjectMeta.Labels = make(map[string]string)
}
for _, label := range res.Data.Labels {
for key, value := range label {
if key == "node.kubernetes.io/instance-type" {
Expand All @@ -219,6 +227,10 @@ func (i *instances) InstanceTypeByProviderID(ctx context.Context, providerID str
// set Annotations
nodeAnnotations, err := i.k8sClient.CoreV1().Nodes().Get(nodeName, metav1.GetOptions{})
if len(res.Data.Annotations) != 0 {
// init annotations map if nil
if nodeAnnotations.ObjectMeta.Annotations == nil {
nodeAnnotations.ObjectMeta.Annotations = make(map[string]string)
}
for _, annotation := range res.Data.Annotations {
for key, value := range annotation {
nodeAnnotations.ObjectMeta.Annotations[key] = value
Expand Down