fix: use flagd standalone tag instead of sidecar tag for flagd deploy…

…ments (#643) Signed-off-by: Florian Bacher <florian.bacher@dynatrace.com>
open-feature · May 23, 2024 · a8b7ad4 · a8b7ad4
1 parent 06b399e
commit a8b7ad4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/controllers/core/flagd/resources/deployment.go b/controllers/core/flagd/resources/deployment.go
@@ -94,6 +94,10 @@ func (r *FlagdDeployment) GetResource(ctx context.Context, flagd *api.Flagd) (cl
 		return nil, errors.New("no flagd container has been injected into deployment")
 	}
 
+	// override settings for the injected container for flagd standalone deployment mode
+
+	deployment.Spec.Template.Spec.Containers[0].Image = fmt.Sprintf("%s:%s", r.FlagdConfig.Image, r.FlagdConfig.Tag)
+
 	deployment.Spec.Template.Spec.Containers[0].Ports = []corev1.ContainerPort{
 		{
 			Name:          "management",

diff --git a/controllers/core/flagd/resources/deployment_test.go b/controllers/core/flagd/resources/deployment_test.go
@@ -4,6 +4,7 @@ package resources
 import (
 	"context"
 	"errors"
+	"fmt"
 	"testing"
 
 	"github.com/golang/mock/gomock"
@@ -92,6 +93,11 @@ func TestFlagdDeployment_getFlagdDeployment(t *testing.T) {
 	require.Equal(t, flagdObj.Name, deploymentResult.Name)
 	require.Equal(t, flagdObj.Namespace, deploymentResult.Namespace)
 	require.Len(t, deploymentResult.OwnerReferences, 1)
+	require.Equal(
+		t,
+		fmt.Sprintf("%s:%s", r.FlagdConfig.Image, r.FlagdConfig.Tag),
+		deploymentResult.Spec.Template.Spec.Containers[0].Image,
+	)
 	require.Equal(t, []v1.ContainerPort{
 		{
 			Name:          "management",

diff --git a/test/e2e/chainsaw/flagd-with-ingress-custom-paths/00-assert.yaml b/test/e2e/chainsaw/flagd-with-ingress-custom-paths/00-assert.yaml
@@ -25,6 +25,8 @@ spec:
     spec:
       containers:
           - name: flagd
+            # renovate: datasource=github-tags depName=open-feature/flagd/flagd
+            image: ghcr.io/open-feature/flagd:v0.10.1
             ports:
               - containerPort: 8014
                 name: management

diff --git a/test/e2e/chainsaw/flagd-with-ingress-default-paths/00-assert.yaml b/test/e2e/chainsaw/flagd-with-ingress-default-paths/00-assert.yaml
@@ -25,6 +25,8 @@ spec:
     spec:
       containers:
           - name: flagd
+            # renovate: datasource=github-tags depName=open-feature/flagd/flagd
+            image: ghcr.io/open-feature/flagd:v0.10.1
             ports:
               - containerPort: 8014
                 name: management