Skip to content

Commit a8b7ad4

Browse files
authored
fix: use flagd standalone tag instead of sidecar tag for flagd deployments (#643)
Signed-off-by: Florian Bacher <florian.bacher@dynatrace.com>
1 parent 06b399e commit a8b7ad4

File tree

4 files changed

+14
-0
lines changed

4 files changed

+14
-0
lines changed

controllers/core/flagd/resources/deployment.go

+4
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ func (r *FlagdDeployment) GetResource(ctx context.Context, flagd *api.Flagd) (cl
9494
return nil, errors.New("no flagd container has been injected into deployment")
9595
}
9696

97+
// override settings for the injected container for flagd standalone deployment mode
98+
99+
deployment.Spec.Template.Spec.Containers[0].Image = fmt.Sprintf("%s:%s", r.FlagdConfig.Image, r.FlagdConfig.Tag)
100+
97101
deployment.Spec.Template.Spec.Containers[0].Ports = []corev1.ContainerPort{
98102
{
99103
Name: "management",

controllers/core/flagd/resources/deployment_test.go

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package resources
44
import (
55
"context"
66
"errors"
7+
"fmt"
78
"testing"
89

910
"github.com/golang/mock/gomock"
@@ -92,6 +93,11 @@ func TestFlagdDeployment_getFlagdDeployment(t *testing.T) {
9293
require.Equal(t, flagdObj.Name, deploymentResult.Name)
9394
require.Equal(t, flagdObj.Namespace, deploymentResult.Namespace)
9495
require.Len(t, deploymentResult.OwnerReferences, 1)
96+
require.Equal(
97+
t,
98+
fmt.Sprintf("%s:%s", r.FlagdConfig.Image, r.FlagdConfig.Tag),
99+
deploymentResult.Spec.Template.Spec.Containers[0].Image,
100+
)
95101
require.Equal(t, []v1.ContainerPort{
96102
{
97103
Name: "management",

test/e2e/chainsaw/flagd-with-ingress-custom-paths/00-assert.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ spec:
2525
spec:
2626
containers:
2727
- name: flagd
28+
# renovate: datasource=github-tags depName=open-feature/flagd/flagd
29+
image: ghcr.io/open-feature/flagd:v0.10.1
2830
ports:
2931
- containerPort: 8014
3032
name: management

test/e2e/chainsaw/flagd-with-ingress-default-paths/00-assert.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ spec:
2525
spec:
2626
containers:
2727
- name: flagd
28+
# renovate: datasource=github-tags depName=open-feature/flagd/flagd
29+
image: ghcr.io/open-feature/flagd:v0.10.1
2830
ports:
2931
- containerPort: 8014
3032
name: management

0 commit comments

Comments
 (0)