diff --git a/internal/common/flagdinjector/flagdinjector.go b/internal/common/flagdinjector/flagdinjector.go index 67d3302c9..c9c759728 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.cluster.local:%d", flagdproxy.FlagdProxyServiceName, fi.FlagdProxyConfig.Namespace, 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 c53865f82..3af4f2647 100644 --- a/internal/common/flagdinjector/flagdinjector_test.go +++ b/internal/common/flagdinjector/flagdinjector_test.go @@ -951,6 +951,7 @@ func getProxyConfig() *flagdproxy.FlagdProxyConfiguration { Image: testImage, Tag: testTag, Namespace: "my-namespace", + ClusterDomain: "cluster.local", } } diff --git a/internal/common/flagdproxy/flagdproxy.go b/internal/common/flagdproxy/flagdproxy.go index 3bbebc9e5..b9b0e02bb 100644 --- a/internal/common/flagdproxy/flagdproxy.go +++ b/internal/common/flagdproxy/flagdproxy.go @@ -46,6 +46,7 @@ type FlagdProxyConfiguration struct { ImagePullSecrets []string Labels map[string]string Annotations map[string]string + ClusterDomain string } func NewFlagdProxyConfiguration(env types.EnvConfig, imagePullSecrets []string, labels map[string]string, annotations map[string]string) *FlagdProxyConfiguration { @@ -61,6 +62,7 @@ func NewFlagdProxyConfiguration(env types.EnvConfig, imagePullSecrets []string, ImagePullSecrets: imagePullSecrets, Labels: labels, Annotations: annotations, + ClusterDomain: env.ClusterDomain, } } diff --git a/internal/common/flagdproxy/flagdproxy_test.go b/internal/common/flagdproxy/flagdproxy_test.go index 5124e7b44..c318e6987 100644 --- a/internal/common/flagdproxy/flagdproxy_test.go +++ b/internal/common/flagdproxy/flagdproxy_test.go @@ -205,6 +205,7 @@ func TestNewFlagdProxyConfiguration(t *testing.T) { FlagdProxyPort: 8015, FlagdProxyManagementPort: 8016, FlagdProxyReplicaCount: 123, + ClusterDomain: "cluster.local", }, pullSecrets, labels, annotations) require.NotNil(t, kpConfig) @@ -217,6 +218,7 @@ func TestNewFlagdProxyConfiguration(t *testing.T) { Replicas: 123, Labels: labels, Annotations: annotations, + ClusterDomain: "cluster.local", }, kpConfig) } diff --git a/internal/common/types/envconfig.go b/internal/common/types/envconfig.go index e96be50a6..9c2720241 100644 --- a/internal/common/types/envconfig.go +++ b/internal/common/types/envconfig.go @@ -10,6 +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"` FlagdImage string `envconfig:"FLAGD_IMAGE" default:"ghcr.io/open-feature/flagd"` // renovate: datasource=github-tags depName=open-feature/flagd/flagd