Skip to content

feat: add configurable cluster domain support #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add configurable cluster domain support #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/common/flagdinjector/flagdinjector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
1 change: 1 addition & 0 deletions internal/common/flagdinjector/flagdinjector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,7 @@ func getProxyConfig() *flagdproxy.FlagdProxyConfiguration {
Image: testImage,
Tag: testTag,
Namespace: "my-namespace",
ClusterDomain: "cluster.local",
}
}

Expand Down
2 changes: 2 additions & 0 deletions internal/common/flagdproxy/flagdproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -61,6 +62,7 @@ func NewFlagdProxyConfiguration(env types.EnvConfig, imagePullSecrets []string,
ImagePullSecrets: imagePullSecrets,
Labels: labels,
Annotations: annotations,
ClusterDomain: env.ClusterDomain,
}
}

Expand Down
2 changes: 2 additions & 0 deletions internal/common/flagdproxy/flagdproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -217,6 +218,7 @@ func TestNewFlagdProxyConfiguration(t *testing.T) {
Replicas: 123,
Labels: labels,
Annotations: annotations,
ClusterDomain: "cluster.local",
}, kpConfig)
}

Expand Down
1 change: 1 addition & 0 deletions internal/common/types/envconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down