Apply suggestion from @wangke19

vrutkovs · wangke19 · web-flow · commit e2db6a1b32b4 · 2025-07-30T10:57:25.000+02:00
Co-authored-by: Ke Wang &lt;kewang@redhat.com&gt;
diff --git a/pkg/operator/nodekubeconfigcontroller/nodekubeconfigcontroller.go b/pkg/operator/nodekubeconfigcontroller/nodekubeconfigcontroller.go
@@ -154,12 +154,14 @@ func ensureNodeKubeconfigs(ctx context.Context, client coreclientv1.CoreV1Interf
 	}
 	requiredSecret.Annotations[annotations.OpenShiftComponent] = "kube-apiserver"
 	// Copy not-before/not-after annotations from systemAdminClientCert
-	if len(systemAdminCredsSecret.Annotations[certrotation.CertificateNotBeforeAnnotation]) > 0 {
-		requiredSecret.Annotations[certrotation.CertificateNotBeforeAnnotation] = systemAdminCredsSecret.Annotations[certrotation.CertificateNotBeforeAnnotation]
+if systemAdminCredsSecret.Annotations != nil {
+	if val, ok := systemAdminCredsSecret.Annotations[certrotation.CertificateNotBeforeAnnotation]; ok && len(val) > 0 {
+		requiredSecret.Annotations[certrotation.CertificateNotBeforeAnnotation] = val
 	}
-	if len(systemAdminCredsSecret.Annotations[certrotation.CertificateNotAfterAnnotation]) > 0 {
-		requiredSecret.Annotations[certrotation.CertificateNotAfterAnnotation] = systemAdminCredsSecret.Annotations[certrotation.CertificateNotAfterAnnotation]
+	if val, ok := systemAdminCredsSecret.Annotations[certrotation.CertificateNotAfterAnnotation]; ok && len(val) > 0 {
+		requiredSecret.Annotations[certrotation.CertificateNotAfterAnnotation] = val
 	}
+}
 
 	_, _, err = resourceapply.ApplySecret(ctx, client, recorder, requiredSecret)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -154,12 +154,14 @@ func ensureNodeKubeconfigs(ctx context.Context, client coreclientv1.CoreV1Interf`
`154`	`154`	`}`
`155`	`155`	`requiredSecret.Annotations[annotations.OpenShiftComponent] = "kube-apiserver"`
`156`	`156`	`// Copy not-before/not-after annotations from systemAdminClientCert`
`157`		`- if len(systemAdminCredsSecret.Annotations[certrotation.CertificateNotBeforeAnnotation]) > 0 {`
`158`		`- requiredSecret.Annotations[certrotation.CertificateNotBeforeAnnotation] = systemAdminCredsSecret.Annotations[certrotation.CertificateNotBeforeAnnotation]`
	`157`	`+if systemAdminCredsSecret.Annotations != nil {`
	`158`	`+ if val, ok := systemAdminCredsSecret.Annotations[certrotation.CertificateNotBeforeAnnotation]; ok && len(val) > 0 {`
	`159`	`+ requiredSecret.Annotations[certrotation.CertificateNotBeforeAnnotation] = val`
`159`	`160`	`}`
`160`		`- if len(systemAdminCredsSecret.Annotations[certrotation.CertificateNotAfterAnnotation]) > 0 {`
`161`		`- requiredSecret.Annotations[certrotation.CertificateNotAfterAnnotation] = systemAdminCredsSecret.Annotations[certrotation.CertificateNotAfterAnnotation]`
	`161`	`+ if val, ok := systemAdminCredsSecret.Annotations[certrotation.CertificateNotAfterAnnotation]; ok && len(val) > 0 {`
	`162`	`+ requiredSecret.Annotations[certrotation.CertificateNotAfterAnnotation] = val`
`162`	`163`	`}`
	`164`	`+}`
`163`	`165`
`164`	`166`	`_, _, err = resourceapply.ApplySecret(ctx, client, recorder, requiredSecret)`
`165`	`167`	`if err != nil {`