fix panic in getSecret (#11)

ilia601 · web-flow · commit df7c3e1bc69e · 2024-08-27T14:45:36.000+03:00
diff --git a/pkg/controller/machine_util.go b/pkg/controller/machine_util.go
@@ -607,12 +607,12 @@ func (c *controller) getSecretData(machineClassName string, secretRefs ...*v1.Se
 			continue
 		}
 
-		secretRef, err := c.getSecret(secretRef, machineClassName)
+		secret, err := c.getSecret(secretRef, machineClassName)
 		if err != nil {
 			klog.V(2).Infof("Secret reference %s/%s not found", secretRef.Namespace, secretRef.Name)
 			return nil, err
 		}
-		secretData = mergeDataMaps(secretData, secretRef.Data)
+		secretData = mergeDataMaps(secretData, secret.Data)
 	}
 
 	return secretData, nil

Original file line number	Diff line number	Diff line change
`@@ -607,12 +607,12 @@ func (c controller) getSecretData(machineClassName string, secretRefs ...v1.Se`
`607`	`607`	`continue`
`608`	`608`	`}`
`609`	`609`
`610`		`- secretRef, err := c.getSecret(secretRef, machineClassName)`
	`610`	`+ secret, err := c.getSecret(secretRef, machineClassName)`
`611`	`611`	`if err != nil {`
`612`	`612`	`klog.V(2).Infof("Secret reference %s/%s not found", secretRef.Namespace, secretRef.Name)`
`613`	`613`	`return nil, err`
`614`	`614`	`}`
`615`		`- secretData = mergeDataMaps(secretData, secretRef.Data)`
	`615`	`+ secretData = mergeDataMaps(secretData, secret.Data)`
`616`	`616`	`}`
`617`	`617`
`618`	`618`	`return secretData, nil`