From b87d3dbcb6a02e87a829bbca15514208f02115da Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Tue, 28 Feb 2023 16:18:48 +0000 Subject: [PATCH] allow to specify the ingress-gce image to use in the cluster --- kubetest2-gce/deployer/common.go | 4 ++++ kubetest2-gce/deployer/deployer.go | 2 ++ 2 files changed, 6 insertions(+) diff --git a/kubetest2-gce/deployer/common.go b/kubetest2-gce/deployer/common.go index 932cbebd..4cb61766 100644 --- a/kubetest2-gce/deployer/common.go +++ b/kubetest2-gce/deployer/common.go @@ -197,6 +197,10 @@ func (d *deployer) buildEnv() []string { env = append(env, fmt.Sprintf("KUBE_GCE_NODE_SERVICE_ACCOUNT=%s", d.NodeServiceAccount)) } + if d.IngressGCEImage != "" { + env = append(env, fmt.Sprintf("GCE_GLBC_IMAGE=%s", d.IngressGCEImage)) + } + return env } diff --git a/kubetest2-gce/deployer/deployer.go b/kubetest2-gce/deployer/deployer.go index 8e99886a..93e4de01 100644 --- a/kubetest2-gce/deployer/deployer.go +++ b/kubetest2-gce/deployer/deployer.go @@ -88,6 +88,8 @@ type deployer struct { MasterSize string `desc:"Sets the MASTER_SIZE environment variable during deployment."` NodeSize string `desc:"Sets the NODE_SIZE environment variable during deployment."` + + IngressGCEImage string `desc:"Sets the ingress-gce image used for the Ingress and Loadbalancer controller."` } // pseudoUniqueSubstring returns a substring of a UUID