flagd customisation (#64)

Signed-off-by: Alex Jones <[email protected]>

Author: AlexsJones

apis/core/v1alpha1/featureflagconfiguration_types.go

@@ -35,10 +35,17 @@ type FeatureFlagConfigurationSpec struct {
 	// +optional
 	// +nullable
 	SyncProvider *FeatureFlagSyncProvider `json:"syncProvider"`
+	// +optional
+	// +nullable
+	FlagDSpec *FlagDSpec `json:"flagDSpec"`
 	// FeatureFlagSpec is the json representation of the feature flag
 	FeatureFlagSpec string `json:"featureFlagSpec,omitempty"`
 }
 
+type FlagDSpec struct {
+	Port string `json:"port"`
+}
+
 type FeatureFlagSyncProvider struct {
 	// +kubebuilder:validation:Enum=filepath
 	Name string `json:"name"`

controllers/featureflagconfiguration_controller.go

@@ -62,10 +62,12 @@ type FeatureFlagConfigurationReconciler struct {
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
 
-const crdName = "FeatureFlagConfiguration"
-const reconcileErrorInterval = 10 * time.Second
-const reconcileSuccessInterval = 120 * time.Second
-const finalizerName = "featureflagconfiguration.core.openfeature.dev/finalizer"
+const (
+	crdName                  = "FeatureFlagConfiguration"
+	reconcileErrorInterval   = 10 * time.Second
+	reconcileSuccessInterval = 120 * time.Second
+	finalizerName            = "featureflagconfiguration.core.openfeature.dev/finalizer"
+)
 
 func (r *FeatureFlagConfigurationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	r.Log = log.FromContext(ctx)

controllers/suite_test.go

@@ -37,9 +37,11 @@ import (
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
 // http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
 
-var cfg *rest.Config
-var k8sClient client.Client
-var testEnv *envtest.Environment
+var (
+	cfg       *rest.Config
+	k8sClient client.Client
+	testEnv   *envtest.Environment
+)
 
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
@@ -70,7 +72,6 @@ var _ = BeforeSuite(func() {
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
 	Expect(err).NotTo(HaveOccurred())
 	Expect(k8sClient).NotTo(BeNil())
-
 }, 60)
 
 var _ = AfterSuite(func() {

main.go

@@ -88,10 +88,14 @@ func main() {
 
 	//+kubebuilder:scaffold:builder
 	hookServer := mgr.GetWebhookServer()
-	hookServer.Register("/mutate-v1-pod", &webhook.Admission{Handler: &webhooks.PodMutator{Client: mgr.GetClient(),
-		Log: ctrl.Log.WithName("mutating-pod-webhook")}})
-	hookServer.Register("/validate-v1alpha1-featureflagconfiguration", &webhook.Admission{Handler: &webhooks.FeatureFlagConfigurationValidator{Client: mgr.GetClient(),
-		Log: ctrl.Log.WithName("validating-featureflagconfiguration-webhook")}})
+	hookServer.Register("/mutate-v1-pod", &webhook.Admission{Handler: &webhooks.PodMutator{
+		Client: mgr.GetClient(),
+		Log:    ctrl.Log.WithName("mutating-pod-webhook"),
+	}})
+	hookServer.Register("/validate-v1alpha1-featureflagconfiguration", &webhook.Admission{Handler: &webhooks.FeatureFlagConfigurationValidator{
+		Client: mgr.GetClient(),
+		Log:    ctrl.Log.WithName("validating-featureflagconfiguration-webhook"),
+	}})
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
 		setupLog.Error(err, "unable to set up health check")

webhooks/featureflagconfiguration_webhook.go

@@ -32,7 +32,6 @@ type FeatureFlagConfigurationValidator struct {
 
 // FeatureFlagConfigurationValidator adds an annotation to every incoming pods.
 func (m *FeatureFlagConfigurationValidator) Handle(ctx context.Context, req admission.Request) admission.Response {
-
 	config := corev1alpha1.FeatureFlagConfiguration{}
 	err := m.decoder.Decode(req, &config)
 	if err != nil {
@@ -51,8 +50,10 @@ func (m *FeatureFlagConfigurationValidator) Handle(ctx context.Context, req admi
 	if config.Spec.ServiceProvider != nil && config.Spec.ServiceProvider.Credentials != nil {
 		// Check the provider and whether it has an existing secret
 		providerKeySecret := corev1.Secret{}
-		if err := m.Client.Get(ctx, client.ObjectKey{Name: config.Spec.ServiceProvider.Credentials.Name,
-			Namespace: config.Spec.ServiceProvider.Credentials.Namespace}, &providerKeySecret); errors.IsNotFound(err) {
+		if err := m.Client.Get(ctx, client.ObjectKey{
+			Name:      config.Spec.ServiceProvider.Credentials.Name,
+			Namespace: config.Spec.ServiceProvider.Credentials.Namespace,
+		}, &providerKeySecret); errors.IsNotFound(err) {
 			return admission.Denied("credentials secret not found")
 		}
 	}
@@ -75,7 +76,6 @@ func (m *FeatureFlagConfigurationValidator) isJSON(str string) bool {
 }
 
 func (m *FeatureFlagConfigurationValidator) validateJSONSchema(schemaJSON string, inputJSON string) error {
-
 	schemaLoader := gojsonschema.NewBytesLoader([]byte(schemaJSON))
 	valuesLoader := gojsonschema.NewBytesLoader([]byte(inputJSON))
 	result, err := gojsonschema.Validate(schemaLoader, valuesLoader)

webhooks/pod_webhook.go

@@ -23,9 +23,7 @@ const (
 	FlagDImagePullPolicy = "Always"
 )
 
-var (
-	FlagDTag = "main"
-)
+var FlagDTag = "main"
 
 // NOTE: RBAC not needed here.
 //+kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch;create;update;patch;delete
@@ -159,6 +157,12 @@ func (m *PodMutator) injectSidecar(pod *corev1.Pod, configMap string, featureFla
 	commandSequence := []string{
 		"start", "--uri", "/etc/flagd/config.json",
 	}
+	// Parse the FlagDConfigurationSpec (apis/core/v1alpha1/featureflagconfiguration_types.go)
+	if featureFlag.Spec.FlagDSpec != nil {
+		if featureFlag.Spec.FlagDSpec.Port != "" {
+			commandSequence = append(commandSequence, "--port", featureFlag.Spec.FlagDSpec.Port)
+		}
+	}
 	// FlagD is the default provider name externally
 	if featureFlag.Spec.ServiceProvider != nil && featureFlag.Spec.ServiceProvider.Name != "flagd" {
 		commandSequence = append(commandSequence, "--service-provider")