feat: introduce debugLogging parameter to FlagSourceConfiguration CRD (#434)

odubajDT · web-flow · commit 26ae1257f761 · 2023-04-06T16:12:18.000-04:00
Signed-off-by: odubajDT &lt;ondrej.dubaj@dynatrace.com&gt;
diff --git a/apis/core/v1alpha1/flagsourceconfiguration_types.go b/apis/core/v1alpha1/flagsourceconfiguration_types.go
@@ -22,6 +22,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/open-feature/open-feature-operator/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -119,9 +120,13 @@ type FlagSourceConfigurationSpec struct {
 	// +optional
 	RolloutOnChange *bool `json:"rolloutOnChange"`
 
-	// ProbesEnabled defines whether to enable liveness and readiness probes of flagd sidecar. Default true(enabled)
+	// ProbesEnabled defines whether to enable liveness and readiness probes of flagd sidecar. Default true (enabled).
 	// +optional
 	ProbesEnabled *bool `json:"probesEnabled"`
+
+	// DebugLogging defines whether to enable --debug flag of flagd sidecar. Default false (disabled).
+	// +optional
+	DebugLogging *bool `json:"debugLogging"`
 }
 
 type Source struct {
@@ -197,6 +202,7 @@ func NewFlagSourceConfigurationSpec() (*FlagSourceConfigurationSpec, error) {
 		EnvVarPrefix:        defaultSidecarEnvVarPrefix,
 		LogFormat:           defaultLogFormat,
 		RolloutOnChange:     nil,
+		DebugLogging:        utils.FalseVal(),
 	}
 
 	// set default value derived from constant default
@@ -308,6 +314,9 @@ func (fc *FlagSourceConfigurationSpec) Merge(new *FlagSourceConfigurationSpec) {
 	if new.ProbesEnabled != nil {
 		fc.ProbesEnabled = new.ProbesEnabled
 	}
+	if new.DebugLogging != nil {
+		fc.DebugLogging = new.DebugLogging
+	}
 }
 
 func (fc *FlagSourceConfigurationSpec) ToEnvVars() []corev1.EnvVar {
diff --git a/apis/core/v1alpha1/flagsourceconfiguration_types_test.go b/apis/core/v1alpha1/flagsourceconfiguration_types_test.go
@@ -118,6 +118,7 @@ func Test_FLagSourceConfiguration_Merge(t *testing.T) {
 			DefaultSyncProvider: SyncProviderKubernetes,
 			RolloutOnChange:     utils.TrueVal(),
 			ProbesEnabled:       utils.TrueVal(),
+			DebugLogging:        utils.TrueVal(),
 		},
 	}
 
@@ -157,6 +158,7 @@ func Test_FLagSourceConfiguration_Merge(t *testing.T) {
 			DefaultSyncProvider: SyncProviderKubernetes,
 			RolloutOnChange:     utils.TrueVal(),
 			ProbesEnabled:       utils.TrueVal(),
+			DebugLogging:        utils.TrueVal(),
 		},
 	}, ff_old)
 
@@ -190,6 +192,7 @@ func Test_FLagSourceConfiguration_Merge(t *testing.T) {
 			DefaultSyncProvider: SyncProviderFilepath,
 			RolloutOnChange:     utils.FalseVal(),
 			ProbesEnabled:       utils.FalseVal(),
+			DebugLogging:        utils.FalseVal(),
 		},
 	}
 
@@ -241,6 +244,7 @@ func Test_FLagSourceConfiguration_Merge(t *testing.T) {
 			DefaultSyncProvider: SyncProviderFilepath,
 			RolloutOnChange:     utils.FalseVal(),
 			ProbesEnabled:       utils.FalseVal(),
+			DebugLogging:        utils.FalseVal(),
 		},
 	}, ff_old)
 }
@@ -276,6 +280,7 @@ func Test_FLagSourceConfiguration_NewFlagSourceConfigurationSpec(t *testing.T) {
 		EnvVarPrefix:        "val6",
 		LogFormat:           "val5",
 		ProbesEnabled:       utils.TrueVal(),
+		DebugLogging:        utils.FalseVal(),
 	}, fs)
 
 	//error paths
diff --git a/apis/core/v1alpha1/zz_generated.deepcopy.go b/apis/core/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/core/v1alpha2/flagsourceconfiguration_conversion.go b/apis/core/v1alpha2/flagsourceconfiguration_conversion.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1"
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha2/common"
+	"github.com/open-feature/open-feature-operator/pkg/utils"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
@@ -47,6 +48,7 @@ func (src *FlagSourceConfiguration) ConvertTo(dstRaw conversion.Hub) error {
 		LogFormat:           src.Spec.LogFormat,
 		DefaultSyncProvider: v1alpha1.SyncProviderType(src.Spec.DefaultSyncProvider),
 		ProbesEnabled:       src.Spec.ProbesEnabled,
+		DebugLogging:        utils.FalseVal(),
 	}
 	return nil
 }
diff --git a/apis/core/v1alpha2/flagsourceconfiguration_conversion_test.go b/apis/core/v1alpha2/flagsourceconfiguration_conversion_test.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1"
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha2/common"
+	"github.com/open-feature/open-feature-operator/pkg/utils"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -63,6 +64,7 @@ func TestFlagSourceConfiguration_ConvertFrom(t *testing.T) {
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
 					SyncProviderArgs:    []string{"provider", "arg"},
+					DebugLogging:        utils.FalseVal(),
 				},
 			},
 			wantErr: false,
@@ -152,6 +154,7 @@ func TestFlagSourceConfiguration_ConvertTo(t *testing.T) {
 					EnvVarPrefix:        "",
 					RolloutOnChange:     nil,
 					SyncProviderArgs:    []string{"provider", "arg"},
+					DebugLogging:        utils.FalseVal(),
 				},
 			},
 		},
diff --git a/apis/core/v1alpha2/flagsourceconfiguration_types.go b/apis/core/v1alpha2/flagsourceconfiguration_types.go
@@ -64,7 +64,7 @@ type FlagSourceConfigurationSpec struct {
 	// +optional
 	LogFormat string `json:"logFormat"`
 
-	// ProbesEnabled defines whether to enable liveness and readiness probes of flagd sidecar. Default true(enabled)
+	// ProbesEnabled defines whether to enable liveness and readiness probes of flagd sidecar. Default true (enabled).
 	// +optional
 	ProbesEnabled *bool `json:"probesEnabled"`
 }
diff --git a/apis/core/v1alpha3/flagsourceconfiguration_conversion.go b/apis/core/v1alpha3/flagsourceconfiguration_conversion.go
@@ -62,6 +62,7 @@ func (src *FlagSourceConfiguration) ConvertTo(dstRaw conversion.Hub) error {
 		EnvVarPrefix:        src.Spec.EnvVarPrefix,
 		RolloutOnChange:     src.Spec.RolloutOnChange,
 		ProbesEnabled:       src.Spec.ProbesEnabled,
+		DebugLogging:        src.Spec.DebugLogging,
 	}
 	return nil
 }
@@ -104,6 +105,7 @@ func (dst *FlagSourceConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
 		EnvVarPrefix:        src.Spec.EnvVarPrefix,
 		RolloutOnChange:     src.Spec.RolloutOnChange,
 		ProbesEnabled:       src.Spec.ProbesEnabled,
+		DebugLogging:        src.Spec.DebugLogging,
 	}
 	return nil
 }
diff --git a/apis/core/v1alpha3/flagsourceconfiguration_conversion_test.go b/apis/core/v1alpha3/flagsourceconfiguration_conversion_test.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha1"
 	"github.com/open-feature/open-feature-operator/apis/core/v1alpha3/common"
+	"github.com/open-feature/open-feature-operator/pkg/utils"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -62,6 +63,7 @@ func TestFlagSourceConfiguration_ConvertFrom(t *testing.T) {
 					LogFormat:           "log",
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
+					DebugLogging:        utils.FalseVal(),
 				},
 			},
 			wantErr: false,
@@ -102,6 +104,7 @@ func TestFlagSourceConfiguration_ConvertFrom(t *testing.T) {
 					LogFormat:           "log",
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
+					DebugLogging:        utils.FalseVal(),
 				},
 			},
 		},
@@ -175,6 +178,7 @@ func TestFlagSourceConfiguration_ConvertTo(t *testing.T) {
 					LogFormat:           "log",
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
+					DebugLogging:        utils.FalseVal(),
 				},
 			},
 			wantErr: false,
@@ -215,6 +219,7 @@ func TestFlagSourceConfiguration_ConvertTo(t *testing.T) {
 					LogFormat:           "log",
 					EnvVarPrefix:        "pre",
 					RolloutOnChange:     &tt,
+					DebugLogging:        utils.FalseVal(),
 				},
 			},
 		},
diff --git a/apis/core/v1alpha3/flagsourceconfiguration_types.go b/apis/core/v1alpha3/flagsourceconfiguration_types.go
@@ -85,9 +85,13 @@ type FlagSourceConfigurationSpec struct {
 	// +optional
 	RolloutOnChange *bool `json:"rolloutOnChange"`
 
-	// ProbesEnabled defines whether to enable liveness and readiness probes of flagd sidecar. Default true(enabled)
+	// ProbesEnabled defines whether to enable liveness and readiness probes of flagd sidecar. Default true (enabled).
 	// +optional
 	ProbesEnabled *bool `json:"probesEnabled"`
+
+	// DebugLogging defines whether to enable --debug flag of flagd sidecar. Default false (disabled).
+	// +optional
+	DebugLogging *bool `json:"debugLogging"`
 }
 
 type Source struct {
diff --git a/apis/core/v1alpha3/zz_generated.deepcopy.go b/apis/core/v1alpha3/zz_generated.deepcopy.go
diff --git a/config/crd/bases/core.openfeature.dev_flagsourceconfigurations.yaml b/config/crd/bases/core.openfeature.dev_flagsourceconfigurations.yaml
@@ -39,6 +39,10 @@ spec:
             description: FlagSourceConfigurationSpec defines the desired state of
               FlagSourceConfiguration
             properties:
+              debugLogging:
+                description: DebugLogging defines whether to enable --debug flag of
+                  flagd sidecar. Default false (disabled).
+                type: boolean
               defaultSyncProvider:
                 description: DefaultSyncProvider defines the default sync provider
                 type: string
@@ -179,7 +183,7 @@ spec:
                 type: integer
               probesEnabled:
                 description: ProbesEnabled defines whether to enable liveness and
-                  readiness probes of flagd sidecar. Default true(enabled)
+                  readiness probes of flagd sidecar. Default true (enabled).
                 type: boolean
               rolloutOnChange:
                 description: RolloutOnChange dictates whether annotated deployments
@@ -294,7 +298,7 @@ spec:
                 type: integer
               probesEnabled:
                 description: ProbesEnabled defines whether to enable liveness and
-                  readiness probes of flagd sidecar. Default true(enabled)
+                  readiness probes of flagd sidecar. Default true (enabled).
                 type: boolean
               socketPath:
                 description: SocketPath defines the unix socket path to listen on
@@ -341,6 +345,10 @@ spec:
             description: FlagSourceConfigurationSpec defines the desired state of
               FlagSourceConfiguration
             properties:
+              debugLogging:
+                description: DebugLogging defines whether to enable --debug flag of
+                  flagd sidecar. Default false (disabled).
+                type: boolean
               defaultSyncProvider:
                 description: DefaultSyncProvider defines the default sync provider
                 type: string
@@ -481,7 +489,7 @@ spec:
                 type: integer
               probesEnabled:
                 description: ProbesEnabled defines whether to enable liveness and
-                  readiness probes of flagd sidecar. Default true(enabled)
+                  readiness probes of flagd sidecar. Default true (enabled).
                 type: boolean
               rolloutOnChange:
                 description: RolloutOnChange dictates whether annotated deployments
diff --git a/docs/flag_source_configuration.md b/docs/flag_source_configuration.md
@@ -34,6 +34,7 @@ spec:
     - name: MY_ENV_VAR
       value: my-env-value
     probesEnabled: true
+    debugLogging: false
 ```
 
 The relevant `FlagSourceConfigurations` are passed to the operator by setting the `openfeature.dev/flagsourceconfiguration` annotation, and is responsible for providing the full configuration of the injected sidecar.
@@ -54,6 +55,7 @@ The relevant `FlagSourceConfigurations` are passed to the operator by setting th
 | DefaultSyncProvider | Defines the default provider to be used, can be set to `kubernetes`, `filepath`, `http` or `flagd-proxy` (experimental).                                                                                                  | optional `string`                                                         | `kubernetes`                 | 
 | RolloutOnChange     | When set to true the operator will trigger a restart of any `Deployments` within the `FlagSourceConfiguration` reconcile loop, updating the injected sidecar with the latest configuration. | optional `boolean`                                                        | `false`                      | 
 | ProbesEnabled       | Enable or disable Liveness and Readiness probes of the flagd sidecar. When enabled, HTTP probes( paths - `/readyz`, `/healthz`) are set with an initial delay of 5 seconds                  | optional `boolean`                                                        | `true`                       |       
+| DebugLogging        | Enable or disable `--debug` flag of flagd sidecar                                                                                                                                             | optional `boolean`                                                        | `false`                      |
 
 ## Source Fields
 
diff --git a/test/e2e/kuttl/flagd-disabled/01-assert.yaml b/test/e2e/kuttl/flagd-disabled/01-assert.yaml
@@ -6,6 +6,6 @@ metadata:
 status:
   phase: Running
 spec:
-    containers:
-      - name: open-feature-e2e-test
-        image: nginx:stable-alpine
+  containers:
+    - name: open-feature-e2e-test
+      image: nginx:stable-alpine
diff --git a/test/e2e/kuttl/inject-flagd/01-assert.yaml b/test/e2e/kuttl/inject-flagd/01-assert.yaml
@@ -11,8 +11,8 @@ metadata:
 status:
   phase: Running
 spec:
-    containers:
-      - name: open-feature-e2e-test
-        image: nginx:stable-alpine
-      - name: flagd          # this part verifies flagd injection happened
-        image: ghcr.io/open-feature/flagd:v0.5.0
+  containers:
+    - name: open-feature-e2e-test
+      image: nginx:stable-alpine
+    - name: flagd          # this part verifies flagd injection happened
+      image: ghcr.io/open-feature/flagd:v0.5.0
diff --git a/webhooks/pod_webhook.go b/webhooks/pod_webhook.go
diff --git a/webhooks/pod_webhook_test.go b/webhooks/pod_webhook_test.go

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import (`
`21`	`21`
`22`	`22`	`"github.com/open-feature/open-feature-operator/apis/core/v1alpha1"`
`23`	`23`	`"github.com/open-feature/open-feature-operator/apis/core/v1alpha2/common"`
	`24`	`+ "github.com/open-feature/open-feature-operator/pkg/utils"`
`24`	`25`	`"sigs.k8s.io/controller-runtime/pkg/conversion"`
`25`	`26`	`)`
`26`	`27`
`@@ -47,6 +48,7 @@ func (src *FlagSourceConfiguration) ConvertTo(dstRaw conversion.Hub) error {`
`47`	`48`	`LogFormat: src.Spec.LogFormat,`
`48`	`49`	`DefaultSyncProvider: v1alpha1.SyncProviderType(src.Spec.DefaultSyncProvider),`
`49`	`50`	`ProbesEnabled: src.Spec.ProbesEnabled,`
	`51`	`+ DebugLogging: utils.FalseVal(),`
`50`	`52`	`}`
`51`	`53`	`return nil`
`52`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ type FlagSourceConfigurationSpec struct {`
`64`	`64`	`// +optional`
`65`	`65`	LogFormat string `json:"logFormat"`
`66`	`66`
`67`		`- // ProbesEnabled defines whether to enable liveness and readiness probes of flagd sidecar. Default true(enabled)`
	`67`	`+ // ProbesEnabled defines whether to enable liveness and readiness probes of flagd sidecar. Default true (enabled).`
`68`	`68`	`// +optional`
`69`	`69`	ProbesEnabled *bool `json:"probesEnabled"`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ func (src *FlagSourceConfiguration) ConvertTo(dstRaw conversion.Hub) error {`
`62`	`62`	`EnvVarPrefix: src.Spec.EnvVarPrefix,`
`63`	`63`	`RolloutOnChange: src.Spec.RolloutOnChange,`
`64`	`64`	`ProbesEnabled: src.Spec.ProbesEnabled,`
	`65`	`+ DebugLogging: src.Spec.DebugLogging,`
`65`	`66`	`}`
`66`	`67`	`return nil`
`67`	`68`	`}`
`@@ -104,6 +105,7 @@ func (dst *FlagSourceConfiguration) ConvertFrom(srcRaw conversion.Hub) error {`
`104`	`105`	`EnvVarPrefix: src.Spec.EnvVarPrefix,`
`105`	`106`	`RolloutOnChange: src.Spec.RolloutOnChange,`
`106`	`107`	`ProbesEnabled: src.Spec.ProbesEnabled,`
	`108`	`+ DebugLogging: src.Spec.DebugLogging,`
`107`	`109`	`}`
`108`	`110`	`return nil`
`109`	`111`	`}`