fix(kuma-cp): don't add postStart hook to builtin gateway even if `…

…waitForDataplaneReady: true` (kumahq#7939) * always pass "waitForDataplaneReady: false" when generating builtin gateway pod * bind envoy admin to ::1 and set "waitForDataplaneReady: true" in e2e-multizone Signed-off-by: Ilya Lobkov <[email protected]>
lnajdekKong · Oct 3, 2023 · 2697f09 · 2697f09
1 parent fb92b77
commit 2697f09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/plugins/runtime/k8s/plugin_gateway.go b/pkg/plugins/runtime/k8s/plugin_gateway.go
@@ -64,7 +64,7 @@ func addGatewayReconcilers(mgr kube_ctrl.Manager, rt core_runtime.Runtime, conve
 	}
 
 	proxyFactory := containers.NewDataplaneProxyFactory(cpURL, caCert, rt.Config().GetEnvoyAdminPort(),
-		cfg.SidecarContainer.DataplaneContainer, cfg.BuiltinDNS, cfg.SidecarContainer.WaitForDataplaneReady)
+		cfg.SidecarContainer.DataplaneContainer, cfg.BuiltinDNS, false)
 
 	kubeConfig := mgr.GetConfig()
 

diff --git a/test/framework/envs/multizone/env.go b/test/framework/envs/multizone/env.go
@@ -53,6 +53,14 @@ func SetupAndGetState() []byte {
 		},
 		framework.KumaDeploymentOptionsFromConfig(framework.Config.KumaCpConfig.Multizone.KubeZone1)...,
 	)
+	if Config.IPV6 {
+		// if the underneath clusters support IPv6, we'll configure kuma-1 with waitForDataplaneReady feature and
+		// envoy admin binding to ::1 address
+		kubeZone1Options = append(kubeZone1Options,
+			WithEnv("KUMA_RUNTIME_KUBERNETES_INJECTOR_SIDECAR_CONTAINER_WAIT_FOR_DATAPLANE_READY", "true"),
+			WithEnv("KUMA_BOOTSTRAP_SERVER_PARAMS_ADMIN_ADDRESS", "::1"),
+		)
+	}
 	KubeZone1 = NewK8sCluster(NewTestingT(), Kuma1, Verbose)
 	go func() {
 		defer GinkgoRecover()