From bbbe8c64b656dcf54075e5d9c656400e6d99fdc5 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Tue, 6 Jan 2026 17:21:57 +0100 Subject: [PATCH 1/4] fix(envconfig): rename CLUSTER_DOMAIN env var to FLAGD_CLUSTER_DOMAIN Prefix the cluster domain environment variable with FLAGD_ to maintain consistency with other flagd-related configuration options. Signed-off-by: Roman Kuznetsov --- internal/common/types/envconfig.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/common/types/envconfig.go b/internal/common/types/envconfig.go index 9c2720241..818156083 100644 --- a/internal/common/types/envconfig.go +++ b/internal/common/types/envconfig.go @@ -10,7 +10,7 @@ type EnvConfig struct { FlagdProxyPort int `envconfig:"FLAGD_PROXY_PORT" default:"8015"` FlagdProxyManagementPort int `envconfig:"FLAGD_PROXY_MANAGEMENT_PORT" default:"8016"` FlagdProxyDebugLogging bool `envconfig:"FLAGD_PROXY_DEBUG_LOGGING" default:"false"` - ClusterDomain string `envconfig:"CLUSTER_DOMAIN" default:"cluster.local"` + ClusterDomain string `envconfig:"FLAGD_CLUSTER_DOMAIN" default:"cluster.local"` FlagdImage string `envconfig:"FLAGD_IMAGE" default:"ghcr.io/open-feature/flagd"` // renovate: datasource=github-tags depName=open-feature/flagd/flagd From 0b0394afb2dd30c283d4574e600141e0c7445364 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Tue, 6 Jan 2026 17:31:10 +0100 Subject: [PATCH 2/4] fix(envconfig): rename ClusterDomain field to FlagdClusterDomain Rename the struct field from ClusterDomain to FlagdClusterDomain to maintain consistency with its environment variable FLAGD_CLUSTER_DOMAIN and other flagd-related configuration options in the EnvConfig struct. Signed-off-by: Roman Kuznetsov --- internal/common/flagdinjector/flagdinjector.go | 2 +- .../common/flagdinjector/flagdinjector_test.go | 14 +++++++------- internal/common/flagdproxy/flagdproxy.go | 4 ++-- internal/common/flagdproxy/flagdproxy_test.go | 4 ++-- internal/common/types/envconfig.go | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/common/flagdinjector/flagdinjector.go b/internal/common/flagdinjector/flagdinjector.go index 2086e2401..d4540cd61 100644 --- a/internal/common/flagdinjector/flagdinjector.go +++ b/internal/common/flagdinjector/flagdinjector.go @@ -350,7 +350,7 @@ func (fi *FlagdContainerInjector) toFlagdProxyConfig(ctx context.Context, object return types.SourceConfig{ Provider: "grpc", Selector: fmt.Sprintf("core.openfeature.dev/%s/%s", ns, n), - URI: fmt.Sprintf("%s.%s.svc.%s:%d", flagdproxy.FlagdProxyServiceName, fi.FlagdProxyConfig.Namespace, fi.FlagdProxyConfig.ClusterDomain, fi.FlagdProxyConfig.Port), + URI: fmt.Sprintf("%s.%s.svc.%s:%d", flagdproxy.FlagdProxyServiceName, fi.FlagdProxyConfig.Namespace, fi.FlagdProxyConfig.FlagdClusterDomain, fi.FlagdProxyConfig.Port), }, nil } diff --git a/internal/common/flagdinjector/flagdinjector_test.go b/internal/common/flagdinjector/flagdinjector_test.go index bdb77d623..d22b80737 100644 --- a/internal/common/flagdinjector/flagdinjector_test.go +++ b/internal/common/flagdinjector/flagdinjector_test.go @@ -945,13 +945,13 @@ func intPtr(i int64) *int64 { func getProxyConfig() *flagdproxy.FlagdProxyConfiguration { return &flagdproxy.FlagdProxyConfiguration{ - Port: 8013, - ManagementPort: 8014, - DebugLogging: false, - Image: testImage, - Tag: testTag, - Namespace: "my-namespace", - ClusterDomain: "cluster.local", + Port: 8013, + ManagementPort: 8014, + DebugLogging: false, + Image: testImage, + Tag: testTag, + Namespace: "my-namespace", + FlagdClusterDomain: "cluster.local", } } diff --git a/internal/common/flagdproxy/flagdproxy.go b/internal/common/flagdproxy/flagdproxy.go index b9b0e02bb..53a5b235f 100644 --- a/internal/common/flagdproxy/flagdproxy.go +++ b/internal/common/flagdproxy/flagdproxy.go @@ -46,7 +46,7 @@ type FlagdProxyConfiguration struct { ImagePullSecrets []string Labels map[string]string Annotations map[string]string - ClusterDomain string + FlagdClusterDomain string } func NewFlagdProxyConfiguration(env types.EnvConfig, imagePullSecrets []string, labels map[string]string, annotations map[string]string) *FlagdProxyConfiguration { @@ -62,7 +62,7 @@ func NewFlagdProxyConfiguration(env types.EnvConfig, imagePullSecrets []string, ImagePullSecrets: imagePullSecrets, Labels: labels, Annotations: annotations, - ClusterDomain: env.ClusterDomain, + FlagdClusterDomain: env.FlagdClusterDomain, } } diff --git a/internal/common/flagdproxy/flagdproxy_test.go b/internal/common/flagdproxy/flagdproxy_test.go index c318e6987..a0eb19a09 100644 --- a/internal/common/flagdproxy/flagdproxy_test.go +++ b/internal/common/flagdproxy/flagdproxy_test.go @@ -205,7 +205,7 @@ func TestNewFlagdProxyConfiguration(t *testing.T) { FlagdProxyPort: 8015, FlagdProxyManagementPort: 8016, FlagdProxyReplicaCount: 123, - ClusterDomain: "cluster.local", + FlagdClusterDomain: "cluster.local", }, pullSecrets, labels, annotations) require.NotNil(t, kpConfig) @@ -218,7 +218,7 @@ func TestNewFlagdProxyConfiguration(t *testing.T) { Replicas: 123, Labels: labels, Annotations: annotations, - ClusterDomain: "cluster.local", + FlagdClusterDomain: "cluster.local", }, kpConfig) } diff --git a/internal/common/types/envconfig.go b/internal/common/types/envconfig.go index 818156083..c3593bcc2 100644 --- a/internal/common/types/envconfig.go +++ b/internal/common/types/envconfig.go @@ -10,7 +10,7 @@ type EnvConfig struct { FlagdProxyPort int `envconfig:"FLAGD_PROXY_PORT" default:"8015"` FlagdProxyManagementPort int `envconfig:"FLAGD_PROXY_MANAGEMENT_PORT" default:"8016"` FlagdProxyDebugLogging bool `envconfig:"FLAGD_PROXY_DEBUG_LOGGING" default:"false"` - ClusterDomain string `envconfig:"FLAGD_CLUSTER_DOMAIN" default:"cluster.local"` + FlagdClusterDomain string `envconfig:"FLAGD_CLUSTER_DOMAIN" default:"cluster.local"` FlagdImage string `envconfig:"FLAGD_IMAGE" default:"ghcr.io/open-feature/flagd"` // renovate: datasource=github-tags depName=open-feature/flagd/flagd From 7909cc52a3d88bce731062b147737eed4460c3c1 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Tue, 6 Jan 2026 17:34:59 +0100 Subject: [PATCH 3/4] fix: keep ClusterDomain field name in FlagdProxyConfiguration Revert the field rename in FlagdProxyConfiguration struct since its other fields (Port, Image, Tag, etc.) don't use the Flagd prefix - the prefix is already in the struct name itself. Only EnvConfig uses the FlagdClusterDomain naming to match other env config fields like FlagdProxyPort, FlagdProxyImage, etc. Signed-off-by: Roman Kuznetsov --- internal/common/flagdinjector/flagdinjector.go | 2 +- internal/common/flagdinjector/flagdinjector_test.go | 2 +- internal/common/flagdproxy/flagdproxy.go | 4 ++-- internal/common/flagdproxy/flagdproxy_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/common/flagdinjector/flagdinjector.go b/internal/common/flagdinjector/flagdinjector.go index d4540cd61..2086e2401 100644 --- a/internal/common/flagdinjector/flagdinjector.go +++ b/internal/common/flagdinjector/flagdinjector.go @@ -350,7 +350,7 @@ func (fi *FlagdContainerInjector) toFlagdProxyConfig(ctx context.Context, object return types.SourceConfig{ Provider: "grpc", Selector: fmt.Sprintf("core.openfeature.dev/%s/%s", ns, n), - URI: fmt.Sprintf("%s.%s.svc.%s:%d", flagdproxy.FlagdProxyServiceName, fi.FlagdProxyConfig.Namespace, fi.FlagdProxyConfig.FlagdClusterDomain, fi.FlagdProxyConfig.Port), + URI: fmt.Sprintf("%s.%s.svc.%s:%d", flagdproxy.FlagdProxyServiceName, fi.FlagdProxyConfig.Namespace, fi.FlagdProxyConfig.ClusterDomain, fi.FlagdProxyConfig.Port), }, nil } diff --git a/internal/common/flagdinjector/flagdinjector_test.go b/internal/common/flagdinjector/flagdinjector_test.go index d22b80737..447ceef15 100644 --- a/internal/common/flagdinjector/flagdinjector_test.go +++ b/internal/common/flagdinjector/flagdinjector_test.go @@ -951,7 +951,7 @@ func getProxyConfig() *flagdproxy.FlagdProxyConfiguration { Image: testImage, Tag: testTag, Namespace: "my-namespace", - FlagdClusterDomain: "cluster.local", + ClusterDomain: "cluster.local", } } diff --git a/internal/common/flagdproxy/flagdproxy.go b/internal/common/flagdproxy/flagdproxy.go index 53a5b235f..d0a44f03f 100644 --- a/internal/common/flagdproxy/flagdproxy.go +++ b/internal/common/flagdproxy/flagdproxy.go @@ -46,7 +46,7 @@ type FlagdProxyConfiguration struct { ImagePullSecrets []string Labels map[string]string Annotations map[string]string - FlagdClusterDomain string + ClusterDomain string } func NewFlagdProxyConfiguration(env types.EnvConfig, imagePullSecrets []string, labels map[string]string, annotations map[string]string) *FlagdProxyConfiguration { @@ -62,7 +62,7 @@ func NewFlagdProxyConfiguration(env types.EnvConfig, imagePullSecrets []string, ImagePullSecrets: imagePullSecrets, Labels: labels, Annotations: annotations, - FlagdClusterDomain: env.FlagdClusterDomain, + ClusterDomain: env.FlagdClusterDomain, } } diff --git a/internal/common/flagdproxy/flagdproxy_test.go b/internal/common/flagdproxy/flagdproxy_test.go index a0eb19a09..af92edd61 100644 --- a/internal/common/flagdproxy/flagdproxy_test.go +++ b/internal/common/flagdproxy/flagdproxy_test.go @@ -218,7 +218,7 @@ func TestNewFlagdProxyConfiguration(t *testing.T) { Replicas: 123, Labels: labels, Annotations: annotations, - FlagdClusterDomain: "cluster.local", + ClusterDomain: "cluster.local", }, kpConfig) } From 0c04704e5b3e2480eef14b6a853c10a44d746160 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Tue, 6 Jan 2026 17:38:56 +0100 Subject: [PATCH 4/4] style: fix struct field alignment in test Signed-off-by: Roman Kuznetsov --- .../common/flagdinjector/flagdinjector_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/common/flagdinjector/flagdinjector_test.go b/internal/common/flagdinjector/flagdinjector_test.go index 447ceef15..bdb77d623 100644 --- a/internal/common/flagdinjector/flagdinjector_test.go +++ b/internal/common/flagdinjector/flagdinjector_test.go @@ -945,13 +945,13 @@ func intPtr(i int64) *int64 { func getProxyConfig() *flagdproxy.FlagdProxyConfiguration { return &flagdproxy.FlagdProxyConfiguration{ - Port: 8013, - ManagementPort: 8014, - DebugLogging: false, - Image: testImage, - Tag: testTag, - Namespace: "my-namespace", - ClusterDomain: "cluster.local", + Port: 8013, + ManagementPort: 8014, + DebugLogging: false, + Image: testImage, + Tag: testTag, + Namespace: "my-namespace", + ClusterDomain: "cluster.local", } }