Skip to content

Commit 1444328

Browse files
toddbaerttoddbaert
authored
fix: flagd mgmt port setting ignored (#588)
Signed-off-by: Todd Baert <todd.baert@dynatrace.com>
1 parent f79c46f commit 1444328

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

‎apis/core/v1beta1/featureflagsource_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const (
3838
SidecarLogFormatEnvVar string = "LOG_FORMAT"
3939
SidecarProbesEnabledVar string = "PROBES_ENABLED"
4040
defaultSidecarEnvVarPrefix string = "FLAGD"
41-
DefaultMetricPort int32 = 8014
41+
DefaultManagementPort int32 = 8014
4242
defaultPort int32 = 8013
4343
defaultSocketPath string = ""
4444
defaultEvaluator string = "json"
@@ -230,7 +230,7 @@ func (fc *FeatureFlagSourceSpec) ToEnvVars() []corev1.EnvVar {
230230
})
231231
}
232232

233-
if fc.ManagementPort != DefaultMetricPort {
233+
if fc.ManagementPort != DefaultManagementPort {
234234
envs = append(envs, corev1.EnvVar{
235235
Name: common.EnvVarKey(fc.EnvVarPrefix, SidecarMetricPortEnvVar),
236236
Value: fmt.Sprintf("%d", fc.ManagementPort),

‎common/flagdinjector/flagdinjector.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,15 @@ func (fi *FlagdContainerInjector) generateBasicFlagdContainer(flagSourceConfig *
392392
Image: fmt.Sprintf("%s:%s", fi.Image, fi.Tag),
393393
Args: []string{
394394
"start",
395+
"--management-port",
396+
fmt.Sprintf("%d", flagSourceConfig.ManagementPort),
395397
},
396398
ImagePullPolicy: common.FlagdImagePullPolicy,
397399
VolumeMounts: []corev1.VolumeMount{},
398400
Env: []corev1.EnvVar{},
399401
Ports: []corev1.ContainerPort{
400402
{
401-
Name: "metrics",
403+
Name: "management",
402404
ContainerPort: flagSourceConfig.ManagementPort,
403405
},
404406
},

‎common/flagdinjector/flagdinjector_test.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider(t *testing.T) {
6565

6666
expectedDeployment.Annotations = nil
6767

68-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]"}
68+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]"}
6969

7070
require.Equal(t, expectedDeployment, deployment)
7171
}
@@ -106,7 +106,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithDebugLogging(t *te
106106

107107
expectedDeployment.Annotations = nil
108108

109-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--debug"}
109+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--debug"}
110110

111111
require.Equal(t, expectedDeployment, deployment)
112112
}
@@ -147,7 +147,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithOtelCollectorUri(t
147147

148148
expectedDeployment.Annotations = nil
149149

150-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--metrics-exporter", "otel", "--otel-collector-uri", "localhost:4317"}
150+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--metrics-exporter", "otel", "--otel-collector-uri", "localhost:4317"}
151151

152152
require.Equal(t, expectedDeployment, deployment)
153153
}
@@ -197,7 +197,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithResources(t *testi
197197

198198
expectedDeployment.Annotations = nil
199199

200-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]"}
200+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]"}
201201
expectedDeployment.Spec.Template.Spec.Containers[0].Resources = flagSourceConfig.Resources
202202

203203
require.Equal(t, expectedDeployment, deployment)
@@ -239,7 +239,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithSyncProviderArgs(t
239239

240240
expectedDeployment.Annotations = nil
241241

242-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--sync-provider-args", "arg-1", "--sync-provider-args", "arg-2"}
242+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--sync-provider-args", "arg-1", "--sync-provider-args", "arg-2"}
243243

244244
require.Equal(t, expectedDeployment, deployment)
245245
}
@@ -279,7 +279,7 @@ func TestFlagdContainerInjector_InjectFlagdKubernetesSource(t *testing.T) {
279279

280280
expectedDeployment := getExpectedDeployment(namespace)
281281

282-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"my-namespace/server-side\",\"provider\":\"kubernetes\"}]"}
282+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"my-namespace/server-side\",\"provider\":\"kubernetes\"}]"}
283283

284284
require.Equal(t, expectedDeployment, deployment)
285285

@@ -347,7 +347,7 @@ func TestFlagdContainerInjector_InjectFlagdFilePathSource(t *testing.T) {
347347
},
348348
}
349349

350-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"/etc/flagd/my-namespace_server-side/my-namespace_server-side.flagd.json\",\"provider\":\"file\"}]"}
350+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"/etc/flagd/my-namespace_server-side/my-namespace_server-side.flagd.json\",\"provider\":\"file\"}]"}
351351
expectedDeployment.Spec.Template.Spec.Containers[0].VolumeMounts = []v1.VolumeMount{
352352
{
353353
Name: "server-side",
@@ -434,7 +434,7 @@ func TestFlagdContainerInjector_InjectFlagdFilePathSource_UpdateReferencedConfig
434434
},
435435
}
436436

437-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"/etc/flagd/my-namespace_server-side/my-namespace_server-side.flagd.json\",\"provider\":\"file\"}]"}
437+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"/etc/flagd/my-namespace_server-side/my-namespace_server-side.flagd.json\",\"provider\":\"file\"}]"}
438438
expectedDeployment.Spec.Template.Spec.Containers[0].VolumeMounts = []v1.VolumeMount{
439439
{
440440
Name: "server-side",
@@ -495,7 +495,7 @@ func TestFlagdContainerInjector_InjectHttpSource(t *testing.T) {
495495

496496
expectedDeployment.Annotations = nil
497497

498-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"http://localhost:8013\",\"provider\":\"http\",\"bearerToken\":\"my-token\"}]"}
498+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"http://localhost:8013\",\"provider\":\"http\",\"bearerToken\":\"my-token\"}]"}
499499

500500
require.Equal(t, expectedDeployment, deployment)
501501
}
@@ -542,7 +542,7 @@ func TestFlagdContainerInjector_InjectGrpcSource(t *testing.T) {
542542

543543
expectedDeployment.Annotations = nil
544544

545-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"grpc://localhost:8013\",\"provider\":\"grpc\",\"certPath\":\"cert-path\",\"tls\":true,\"providerID\":\"provider-id\",\"selector\":\"selector\"}]"}
545+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"grpc://localhost:8013\",\"provider\":\"grpc\",\"certPath\":\"cert-path\",\"tls\":true,\"providerID\":\"provider-id\",\"selector\":\"selector\"}]"}
546546

547547
require.Equal(t, expectedDeployment, deployment)
548548
}
@@ -672,7 +672,7 @@ func TestFlagdContainerInjector_InjectProxySource_ProxyIsReady(t *testing.T) {
672672

673673
expectedDeployment.Annotations = nil
674674

675-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--sources", "[{\"uri\":\"flagd-proxy-svc.my-namespace.svc.cluster.local:8013\",\"provider\":\"grpc\",\"selector\":\"core.openfeature.dev/my-namespace/\"}]"}
675+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"flagd-proxy-svc.my-namespace.svc.cluster.local:8013\",\"provider\":\"grpc\",\"selector\":\"core.openfeature.dev/my-namespace/\"}]"}
676676

677677
require.Equal(t, expectedDeployment, deployment)
678678
}
@@ -716,7 +716,7 @@ func TestFlagdContainerInjector_Inject_FlagdContainerAlreadyPresent(t *testing.T
716716
expectedDeployment := getExpectedDeployment(namespace)
717717

718718
expectedDeployment.Annotations = nil
719-
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start"}
719+
expectedDeployment.Spec.Template.Spec.Containers[0].Args = []string{"start", "--management-port", "8014"}
720720

721721
require.Equal(t, expectedDeployment, deployment)
722722
}
@@ -898,7 +898,7 @@ func getExpectedDeployment(namespace string) appsV1.Deployment {
898898
WorkingDir: "",
899899
Ports: []v1.ContainerPort{
900900
{
901-
Name: "metrics",
901+
Name: "management",
902902
ContainerPort: int32(8014),
903903
},
904904
},

0 commit comments

Comments
 (0)