Merge pull request #3487 from Azure/tsatam/hotfix-mdsd-pullspec-allow…

…-reset-to-default

Ensure Fluentbit/MDSD spec operatorflags assume default version when set to empty string

pkg/operator/controllers/genevalogging/genevalogging.go

@@ -65,8 +65,14 @@ func (r *Reconciler) daemonset(cluster *arov1alpha1.Cluster) (*appsv1.DaemonSet,
 		return nil, err
 	}
 
-	fluentbitPullspec := cluster.Spec.OperatorFlags.GetWithDefault(controllerFluentbitPullSpec, version.FluentbitImage(cluster.Spec.ACRDomain))
-	mdsdPullspec := cluster.Spec.OperatorFlags.GetWithDefault(controllerMDSDPullSpec, version.MdsdImage(cluster.Spec.ACRDomain))
+	fluentbitPullspec := cluster.Spec.OperatorFlags.GetWithDefault(controllerFluentbitPullSpec, "")
+	if fluentbitPullspec == "" {
+		fluentbitPullspec = version.FluentbitImage(cluster.Spec.ACRDomain)
+	}
+	mdsdPullspec := cluster.Spec.OperatorFlags.GetWithDefault(controllerMDSDPullSpec, "")
+	if mdsdPullspec == "" {
+		mdsdPullspec = version.MdsdImage(cluster.Spec.ACRDomain)
+	}
 
 	return &appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{

pkg/operator/controllers/genevalogging/genevalogging_test.go

@@ -180,6 +180,44 @@ func TestGenevaLoggingDaemonset(t *testing.T) {
 			wantErrMsg:     "",
 			wantConditions: defaultConditions,
 		},
+		{
+			name: "fluentbit/mdsd specs provided as empty strings",
+			operatorFlags: arov1alpha1.OperatorFlags{
+				operator.GenevaLoggingEnabled: operator.FlagTrue,
+				controllerFluentbitPullSpec:   "",
+				controllerMDSDPullSpec:        "",
+			},
+			validateDaemonset: func(d *appsv1.DaemonSet) (errs []error) {
+				if len(d.Spec.Template.Spec.Containers) != 2 {
+					errs = append(errs, fmt.Errorf("expected 2 containers, got %d", len(d.Spec.Template.Spec.Containers)))
+				}
+
+				// we want the default fluentbit image
+				fluentbit, err := getContainer(d, "fluentbit")
+				if err != nil {
+					errs = append(errs, err)
+					return
+				}
+				for _, err := range deep.Equal(fluentbit.Image, version.FluentbitImage("acrDomain")) {
+					errs = append(errs, errors.New(err))
+				}
+
+				// we want the default mdsd image
+				mdsd, err := getContainer(d, "mdsd")
+				if err != nil {
+					errs = append(errs, err)
+					return
+				}
+				for _, err := range deep.Equal(mdsd.Image, version.MdsdImage("acrDomain")) {
+					errs = append(errs, errors.New(err))
+				}
+
+				return
+			},
+			mocks:          nominalMocks,
+			wantErrMsg:     "",
+			wantConditions: defaultConditions,
+		},
 		{
 			name: "fluentbit changed",
 			operatorFlags: arov1alpha1.OperatorFlags{