Merge pull request #936 from oliver-rew/fix/empty-default-image-pull-secrets

Zerpet · web-flow · commit 657dbbbfbba7 · 2022-01-27T11:10:04.000Z
fix: don't set empty image pull secrets
diff --git a/controllers/rabbitmqcluster_controller.go b/controllers/rabbitmqcluster_controller.go
@@ -131,8 +131,12 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	}
 
 	if rabbitmqCluster.Spec.ImagePullSecrets == nil {
+		// split the comma separated list of default image pull secrets from
+		// the 'DEFAULT_IMAGE_PULL_SECRETS' env var, but ignore empty strings.
 		for _, reference := range strings.Split(r.DefaultImagePullSecrets, ",") {
-			rabbitmqCluster.Spec.ImagePullSecrets = append(rabbitmqCluster.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: reference})
+			if len(reference) > 0 {
+				rabbitmqCluster.Spec.ImagePullSecrets = append(rabbitmqCluster.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: reference})
+			}
 		}
 		if err = r.Update(ctx, rabbitmqCluster); err != nil {
 			if k8serrors.IsConflict(err) {

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,12 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`if rabbitmqCluster.Spec.ImagePullSecrets == nil {`
	`134`	`+ // split the comma separated list of default image pull secrets from`
	`135`	`+ // the 'DEFAULT_IMAGE_PULL_SECRETS' env var, but ignore empty strings.`
`134`	`136`	`for _, reference := range strings.Split(r.DefaultImagePullSecrets, ",") {`
`135`		`- rabbitmqCluster.Spec.ImagePullSecrets = append(rabbitmqCluster.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: reference})`
	`137`	`+ if len(reference) > 0 {`
	`138`	`+ rabbitmqCluster.Spec.ImagePullSecrets = append(rabbitmqCluster.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: reference})`
	`139`	`+ }`
`136`	`140`	`}`
`137`	`141`	`if err = r.Update(ctx, rabbitmqCluster); err != nil {`
`138`	`142`	`if k8serrors.IsConflict(err) {`