From c88e721fc71e3062c0512e98b32014486f16e60a Mon Sep 17 00:00:00 2001 From: Jeremie Vallee Date: Mon, 14 Oct 2019 20:06:59 +0100 Subject: [PATCH] [3945] Configurable Istio Gateway for Notebook Controller (kubeflow/kubeflow#4216) --- .../notebook-controller/controllers/notebook_controller.go | 7 ++++++- components/notebook-controller/go.sum | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/components/notebook-controller/controllers/notebook_controller.go b/components/notebook-controller/controllers/notebook_controller.go index ba8f87fd..855a6894 100644 --- a/components/notebook-controller/controllers/notebook_controller.go +++ b/components/notebook-controller/controllers/notebook_controller.go @@ -352,7 +352,12 @@ func generateVirtualService(instance *v1beta1.Notebook) (*unstructured.Unstructu if err := unstructured.SetNestedStringSlice(vsvc.Object, []string{"*"}, "spec", "hosts"); err != nil { return nil, fmt.Errorf("Set .spec.hosts error: %v", err) } - if err := unstructured.SetNestedStringSlice(vsvc.Object, []string{"kubeflow/kubeflow-gateway"}, + + istioGateway := os.Getenv("ISTIO_GATEWAY") + if len(istioGateway) == 0 { + istioGateway = "kubeflow/kubeflow-gateway" + } + if err := unstructured.SetNestedStringSlice(vsvc.Object, []string{istioGateway}, "spec", "gateways"); err != nil { return nil, fmt.Errorf("Set .spec.gateways error: %v", err) } diff --git a/components/notebook-controller/go.sum b/components/notebook-controller/go.sum index 299c2a74..1c150c38 100644 --- a/components/notebook-controller/go.sum +++ b/components/notebook-controller/go.sum @@ -639,6 +639,7 @@ k8s.io/apimachinery v0.0.0-20190119020841-d41becfba9ee h1:3MH/wGFP+9PjyLIMnPN2GY k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d h1:Jmdtdt1ZnoGfWWIIik61Z7nKYgO3J+swQJtPYsP9wHA= k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010 h1:pyoq062NftC1y/OcnbSvgolyZDJ8y4fmUPWMkdA6gfU= +k8s.io/apimachinery v0.0.0-20190927035529-0104e33c351d h1:oYLB5Nk2IOm17BHdatnaWAgzNGzq/5dlWy7Bzo5Htdc= k8s.io/client-go v0.0.0-20181126152608-d082d5923d3c h1:Yfl89y6L9aMi54tA3TSQjkhjp0gGyb53qblgMqms4Gg= k8s.io/client-go v0.0.0-20181126152608-d082d5923d3c/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible h1:U5Bt+dab9K8qaUmXINrkXO135kA11/i5Kg1RUydgaMQ=