diff --git a/controllers/controllers/workloads/cfprocess_controller_test.go b/controllers/controllers/workloads/cfprocess_controller_test.go index d981aaa90..9dce49ede 100644 --- a/controllers/controllers/workloads/cfprocess_controller_test.go +++ b/controllers/controllers/workloads/cfprocess_controller_test.go @@ -181,6 +181,7 @@ var _ = Describe("CFProcessReconciler Integration Tests", func() { MatchFields(IgnoreExtras, Fields{"Name": Equal("VCAP_APP_PORT")}), MatchFields(IgnoreExtras, Fields{"Name": Equal("VCAP_SERVICES")}), MatchFields(IgnoreExtras, Fields{"Name": Equal("env-key")}), + MatchFields(IgnoreExtras, Fields{"Name": Equal("CF_INSTANCE_PORTS")}), )) }) }) diff --git a/controllers/controllers/workloads/env/builder.go b/controllers/controllers/workloads/env/builder.go index 42763a021..035a3ab1f 100644 --- a/controllers/controllers/workloads/env/builder.go +++ b/controllers/controllers/workloads/env/builder.go @@ -138,9 +138,11 @@ func (b *ProcessEnvBuilder) buildPortEnv(ctx context.Context, cfApp *korifiv1alp processPorts := ports.FromRoutes(cfRoutesForProcess.Items, cfApp.Name, cfProcess.Spec.ProcessType) if len(processPorts) > 0 { portString := strconv.FormatInt(int64(processPorts[0]), 10) + cfInstancePorts := fmt.Sprintf("[{\"internal\":%s}]", portString) return []corev1.EnvVar{ {Name: "VCAP_APP_PORT", Value: portString}, {Name: "PORT", Value: portString}, + {Name: "CF_INSTANCE_PORTS", Value: cfInstancePorts}, }, nil } diff --git a/controllers/controllers/workloads/env/builder_test.go b/controllers/controllers/workloads/env/builder_test.go index d88a03e15..915249769 100644 --- a/controllers/controllers/workloads/env/builder_test.go +++ b/controllers/controllers/workloads/env/builder_test.go @@ -350,9 +350,12 @@ var _ = Describe("EnvBuilder", func() { "Name": Equal("PORT"), "Value": Equal("1234"), }), + MatchFields(IgnoreExtras, Fields{ + "Name": Equal("CF_INSTANCE_PORTS"), + "Value": MatchJSON("[{\"internal\":1234}]"), + }), )) }) - When("the route does not have destinations", func() { BeforeEach(func() { ensurePatch(cfRoute, func(cfRoute *korifiv1alpha1.CFRoute) {