Skip to content

Commit 674dd16

Browse files
kimsehwan96lukas-reining
kimsehwan96
and
lukas-reining
authored
fix: Add --port argument in flagd pods for set flagd service port (#710)
Co-authored-by: Lukas Reining <lukas.reining@codecentric.de>
1 parent 5b57697 commit 674dd16

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

‎common/flagdinjector/flagdinjector.go

+6
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,8 @@ func (fi *FlagdContainerInjector) generateBasicFlagdContainer(flagSourceConfig *
394394
"start",
395395
"--management-port",
396396
fmt.Sprintf("%d", flagSourceConfig.ManagementPort),
397+
"--port",
398+
fmt.Sprintf("%d", flagSourceConfig.Port),
397399
},
398400
ImagePullPolicy: common.FlagdImagePullPolicy,
399401
VolumeMounts: []corev1.VolumeMount{},
@@ -403,6 +405,10 @@ func (fi *FlagdContainerInjector) generateBasicFlagdContainer(flagSourceConfig *
403405
Name: "management",
404406
ContainerPort: flagSourceConfig.ManagementPort,
405407
},
408+
{
409+
Name: "flagd",
410+
ContainerPort: flagSourceConfig.Port,
411+
},
406412
},
407413
SecurityContext: getSecurityContext(),
408414
Resources: fi.FlagdResourceRequirements,

‎common/flagdinjector/flagdinjector_test.go

+16-12
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider(t *testing.T) {
5858

5959
expectedPod.Annotations = nil
6060

61-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]"}
61+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]"}
6262

6363
require.Equal(t, expectedPod, pod)
6464
}
@@ -93,7 +93,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithDebugLogging(t *te
9393

9494
expectedPod.Annotations = nil
9595

96-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--debug"}
96+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--debug"}
9797

9898
require.Equal(t, expectedPod, pod)
9999
}
@@ -128,7 +128,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithOtelCollectorUri(t
128128

129129
expectedPod.Annotations = nil
130130

131-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--metrics-exporter", "otel", "--otel-collector-uri", "localhost:4317"}
131+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--metrics-exporter", "otel", "--otel-collector-uri", "localhost:4317"}
132132

133133
require.Equal(t, expectedPod, pod)
134134
}
@@ -172,7 +172,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithResources(t *testi
172172

173173
expectedPod.Annotations = nil
174174

175-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]"}
175+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]"}
176176
expectedPod.Spec.Containers[1].Resources = flagSourceConfig.Resources
177177

178178
require.Equal(t, expectedPod, pod)
@@ -208,7 +208,7 @@ func TestFlagdContainerInjector_InjectDefaultSyncProvider_WithSyncProviderArgs(t
208208

209209
expectedPod.Annotations = nil
210210

211-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--sync-provider-args", "arg-1", "--sync-provider-args", "arg-2"}
211+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"\",\"provider\":\"grpc\"}]", "--sync-provider-args", "arg-1", "--sync-provider-args", "arg-2"}
212212

213213
require.Equal(t, expectedPod, pod)
214214
}
@@ -243,7 +243,7 @@ func TestFlagdContainerInjector_InjectFlagdKubernetesSource(t *testing.T) {
243243

244244
expectedPod := getExpectedPod(namespace)
245245

246-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"my-namespace/server-side\",\"provider\":\"kubernetes\"}]"}
246+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"my-namespace/server-side\",\"provider\":\"kubernetes\"}]"}
247247

248248
require.Equal(t, expectedPod, pod)
249249

@@ -305,7 +305,7 @@ func TestFlagdContainerInjector_InjectFlagdFilePathSource(t *testing.T) {
305305
},
306306
}
307307

308-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"/etc/flagd/my-namespace_server-side/my-namespace_server-side.flagd.json\",\"provider\":\"file\"}]"}
308+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"/etc/flagd/my-namespace_server-side/my-namespace_server-side.flagd.json\",\"provider\":\"file\"}]"}
309309
expectedPod.Spec.Containers[1].VolumeMounts = []v1.VolumeMount{
310310
{
311311
Name: "server-side",
@@ -385,7 +385,7 @@ func TestFlagdContainerInjector_InjectFlagdFilePathSource_UpdateReferencedConfig
385385
},
386386
}
387387

388-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"/etc/flagd/my-namespace_server-side/my-namespace_server-side.flagd.json\",\"provider\":\"file\"}]"}
388+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"/etc/flagd/my-namespace_server-side/my-namespace_server-side.flagd.json\",\"provider\":\"file\"}]"}
389389
expectedPod.Spec.Containers[1].VolumeMounts = []v1.VolumeMount{
390390
{
391391
Name: "server-side",
@@ -441,7 +441,7 @@ func TestFlagdContainerInjector_InjectHttpSource(t *testing.T) {
441441

442442
expectedPod.Annotations = nil
443443

444-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"http://localhost:8013\",\"provider\":\"http\",\"bearerToken\":\"my-token\",\"interval\":8}]"}
444+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"http://localhost:8013\",\"provider\":\"http\",\"bearerToken\":\"my-token\",\"interval\":8}]"}
445445

446446
require.Equal(t, expectedPod, pod)
447447
}
@@ -482,7 +482,7 @@ func TestFlagdContainerInjector_InjectGrpcSource(t *testing.T) {
482482

483483
expectedPod.Annotations = nil
484484

485-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--sources", "[{\"uri\":\"grpc://localhost:8013\",\"provider\":\"grpc\",\"certPath\":\"cert-path\",\"tls\":true,\"providerID\":\"provider-id\",\"selector\":\"selector\"}]"}
485+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"grpc://localhost:8013\",\"provider\":\"grpc\",\"certPath\":\"cert-path\",\"tls\":true,\"providerID\":\"provider-id\",\"selector\":\"selector\"}]"}
486486

487487
require.Equal(t, expectedPod, pod)
488488
}
@@ -594,7 +594,7 @@ func TestFlagdContainerInjector_InjectProxySource_ProxyIsReady(t *testing.T) {
594594

595595
expectedPod.Annotations = nil
596596

597-
expectedPod.Spec.Containers[1].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/\"}]"}
597+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013", "--sources", "[{\"uri\":\"flagd-proxy-svc.my-namespace.svc.cluster.local:8013\",\"provider\":\"grpc\",\"selector\":\"core.openfeature.dev/my-namespace/\"}]"}
598598

599599
require.Equal(t, expectedPod, pod)
600600
}
@@ -624,7 +624,7 @@ func TestFlagdContainerInjector_Inject_FlagdContainerAlreadyPresent(t *testing.T
624624
expectedPod := getExpectedPod(namespace)
625625

626626
expectedPod.Annotations = nil
627-
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014"}
627+
expectedPod.Spec.Containers[1].Args = []string{"start", "--management-port", "8014", "--port", "8013"}
628628

629629
require.Equal(t, expectedPod, pod)
630630
}
@@ -831,6 +831,10 @@ func getExpectedPod(namespace string) v1.Pod {
831831
Name: "management",
832832
ContainerPort: int32(8014),
833833
},
834+
{
835+
Name: "flagd",
836+
ContainerPort: int32(8013),
837+
},
834838
},
835839
Env: []v1.EnvVar{
836840
{

0 commit comments

Comments
 (0)