Merge pull request #1867 from kube-logging/fix/nil-panic

fix: nil ptr panic on empty secrets slice during cfg-check

Author: csatib02

pkg/resources/fluentd/outputsecret.go

@@ -28,6 +28,10 @@ import (
 )
 
 func (r *Reconciler) markSecrets(secrets *secret.MountSecrets) ([]runtime.Object, reconciler.DesiredState, error) {
+	if secrets == nil {
+		return nil, reconciler.StateAbsent, nil
+	}
+
 	var loggingRef string
 	if r.Logging.Spec.LoggingRef != "" {
 		loggingRef = r.Logging.Spec.LoggingRef
@@ -51,6 +55,7 @@ func (r *Reconciler) markSecrets(secrets *secret.MountSecrets) ([]runtime.Object
 		secretItem.ObjectMeta.Annotations[annotationKey] = "watched"
 		markedSecrets = append(markedSecrets, secretItem)
 	}
+
 	return markedSecrets, reconciler.StatePresent, nil
 }
 
@@ -65,8 +70,12 @@ func (r *Reconciler) outputSecret(secrets *secret.MountSecrets, mountPath string
 	if fluentOutputSecret.Data == nil {
 		fluentOutputSecret.Data = make(map[string][]byte)
 	}
-	for _, secret := range *secrets {
-		fluentOutputSecret.Data[secret.MappedKey] = secret.Value
+
+	if secrets != nil {
+		for _, secret := range *secrets {
+			fluentOutputSecret.Data[secret.MappedKey] = secret.Value
+		}
 	}
+
 	return fluentOutputSecret, reconciler.StatePresent, nil
 }