Flip injectIstio param to true (kubeflow#3087)

* flip prototypes * flip pipeline * try disable istio for tf-serving test * disable istio in kfctl.sh * remove quotes
ricardov1 · Apr 29, 2019 · 308b79f · 308b79f
1 parent 5367d99
commit 308b79f
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 21 deletions.
diff --git a/kubeflow/argo/prototypes/argo.jsonnet b/kubeflow/argo/prototypes/argo.jsonnet
@@ -14,7 +14,7 @@
 // @optionalParam artifactRepositoryAccessKeySecretKey string accesskey artifactRepositoryAccessKeySecretKey
 // @optionalParam artifactRepositorySecretKeySecretName string mlpipeline-minio-artifact artifactRepositorySecretKeySecretName
 // @optionalParam artifactRepositorySecretKeySecretKey string secretkey artifactRepositorySecretKeySecretKey
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string svc.cluster.local DNS config to cluster domain.
 
 local argo = import "kubeflow/argo/argo.libsonnet";

diff --git a/kubeflow/common/prototypes/centraldashboard.jsonnet b/kubeflow/common/prototypes/centraldashboard.jsonnet
@@ -4,7 +4,7 @@
 // @shortDescription centraldashboard
 // @param name string Name
 // @optionalParam image string gcr.io/kubeflow-images-public/centraldashboard:v0.5.0 Image for the central dashboard
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string cluster.local DNS config to cluster domain.
 
 local centraldashboard = import "kubeflow/common/centraldashboard.libsonnet";

diff --git a/kubeflow/common/prototypes/echo-server.jsonnet b/kubeflow/common/prototypes/echo-server.jsonnet
@@ -4,7 +4,7 @@
 // @shortDescription A simple echo server.
 // @param name string Name for the component
 // @optionalParam image string gcr.io/kubeflow-images-staging/echo-server:v20180628-44f08d31 The image to use.
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string cluster.local DNS config to cluster domain.
 
 local echoserver = import "kubeflow/common/echo-server.libsonnet";

diff --git a/kubeflow/examples/prototypes/tensorboard.jsonnet b/kubeflow/examples/prototypes/tensorboard.jsonnet
@@ -8,7 +8,7 @@
 // @optionalParam servicePort number 9000 Name of the servicePort
 // @optionalParam serviceType string ClusterIP The service type for tensorboard service
 // @optionalParam defaultTbImage string tensorflow/tensorflow:1.8.0 default tensorboard image to use
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string cluster.local DNS config to cluster domain.
 
 local tensorboard = import "kubeflow/tensorboard/tensorboard.libsonnet";

diff --git a/kubeflow/jupyter/prototypes/jupyter-web-app.jsonnet b/kubeflow/jupyter/prototypes/jupyter-web-app.jsonnet
@@ -8,7 +8,7 @@
 // @optionalParam policy string Always imagePullPolicy for the UI's image
 // @optionalParam prefix string jupyter The prefix under which the app is accessed
 // @optionalParam rokSecretName string secret-rok-{username} The name of the secret containing user's credentials for Arrikto Rok
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string svc.cluster.local DNS config to cluster domain.
 
 local jupyter_ui = import "kubeflow/jupyter/jupyter-web-app.libsonnet";

diff --git a/kubeflow/katib/prototypes/all.jsonnet b/kubeflow/katib/prototypes/all.jsonnet
@@ -13,7 +13,7 @@
 // @optionalParam vizierDbImage string mysql:8.0.3 The image for vizier db.
 // @optionalParam studyJobControllerImage string gcr.io/kubeflow-images-public/katib/studyjob-controller:v0.1.2-alpha-156-g4ab3dbd The image for studyjob-controller.
 // @optionalParam metricsCollectorImage string gcr.io/kubeflow-images-public/katib/metrics-collector:v0.1.2-alpha-156-g4ab3dbd The image for metrics-collector.
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string cluster.local DNS config to cluster domain.
 
 local k = import "k.libsonnet";

diff --git a/kubeflow/kubebench/prototypes/kubebench-dashboard.jsonnet b/kubeflow/kubebench/prototypes/kubebench-dashboard.jsonnet
@@ -4,7 +4,7 @@
 // @shortDescription Kubebench dashboard installer
 // @param name string Name for the component
 // @optionalParam image string gcr.io/kubeflow-images-public/kubebench/kubebench-dashboard:v0.4.0-13-g262c593 Image for kubebench dashboard
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string cluster.local DNS config to cluster domain.
 
 local k = import "k.libsonnet";

diff --git a/kubeflow/openvino/prototypes/openvino.jsonnet b/kubeflow/openvino/prototypes/openvino.jsonnet
@@ -14,7 +14,7 @@
 // @optionalParam modelName string resnet model name
 // @optionalParam pvc string nfs Claimname for the PVC
 // @optionalParam pvcMount string /opt/ml Mount path for PVC.
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string cluster.local DNS config to cluster domain.
 
 local openvino = import "kubeflow/openvino/openvino.libsonnet";

diff --git a/kubeflow/pipeline/pipeline.libsonnet b/kubeflow/pipeline/pipeline.libsonnet
@@ -15,7 +15,7 @@
     mysqlPd: null,
     minioPd: null,
     nfsPd: null,
-    injectIstio: "false",
+    injectIstio: "true",
     clusterDomain: "cluster.local",
   },
 

diff --git a/kubeflow/tensorboard/prototypes/tensorboard-aws.jsonnet b/kubeflow/tensorboard/prototypes/tensorboard-aws.jsonnet
@@ -20,7 +20,7 @@
 // @optionalParam efsPvcName string null Name of the Persistent Volume Claim used for EFS
 // @optionalParam efsVolumeName string null Name of the Volume to mount to the pod
 // @optionalParam efsMountPath string null Where to mount the EFS Volume
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string cluster.local DNS config to cluster domain.
 
 local subtype = import "kubeflow/tensorboard/aws.libsonnet";

diff --git a/kubeflow/tensorboard/prototypes/tensorboard-gcp.jsonnet b/kubeflow/tensorboard/prototypes/tensorboard-gcp.jsonnet
@@ -9,7 +9,7 @@
 // @optionalParam serviceType string ClusterIP The service type for Jupyterhub.
 // @optionalParam defaultTbImage string tensorflow/tensorflow:1.8.0 default tensorboard image to use
 // @optionalParam gcpCredentialSecretName string null Name of the k8s secrets containing gcp credentials
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string cluster.local DNS config to cluster domain.
 
 local subtype = import "kubeflow/tensorboard/gcp.libsonnet";

diff --git a/kubeflow/tf-serving/prototypes/tf-serving-aws.jsonnet b/kubeflow/tf-serving/prototypes/tf-serving-aws.jsonnet
@@ -5,7 +5,7 @@
 // @param name string Name to give to each of the components
 // @optionalParam numGpus string 0 Number of gpus to use
 // @optionalParam deployHttpProxy string false Whether to deploy http proxy
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam enablePrometheus string true Whether to enable prometheus endpoint (requires TF 1.11)
 // @optionalParam modelBasePath string s3://kubeflow-examples-data/mnist The model path
 // @optionalParam modelName string null The model name

diff --git a/kubeflow/tf-serving/prototypes/tf-serving-gcp.jsonnet b/kubeflow/tf-serving/prototypes/tf-serving-gcp.jsonnet
@@ -12,7 +12,7 @@
 // @optionalParam defaultGpuImage string tensorflow/serving:1.11.1-gpu The default model server image (gpu)
 // @optionalParam httpProxyImage string gcr.io/kubeflow-images-public/tf-model-server-http-proxy:v20180723 Http proxy image
 // @optionalParam gcpCredentialSecretName string null If not empty, insert the secret credential
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam enablePrometheus string true Whether to enable prometheus endpoint (requires TF 1.11)
 
 local k = import "k.libsonnet";

diff --git a/kubeflow/tf-serving/prototypes/tf-serving-service.jsonnet b/kubeflow/tf-serving/prototypes/tf-serving-service.jsonnet
@@ -6,7 +6,7 @@
 // @optionalParam serviceType string ClusterIP The k8s service type for tf serving.
 // @optionalParam modelName string null The model name
 // @optionalParam trafficRule string v1:100 The traffic rule, in the format of version:percentage,version:percentage,..
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam enablePrometheus string true Whether to enable prometheus endpoint (requires TF 1.11)
 
 local k = import "k.libsonnet";

diff --git a/kubeflow/tf-training/prototypes/tf-job-operator.jsonnet b/kubeflow/tf-training/prototypes/tf-job-operator.jsonnet
@@ -10,7 +10,7 @@
 // @optionalParam deploymentScope string cluster The scope at which tf-job-operator should be deployed - valid values are cluster, namespace.
 // @optionalParam deploymentNamespace string null The namespace to which tf-job-operator should be scoped. If deploymentScope is set to cluster, this is ignored.
 // @optionalParam enableGangScheduling string false If set true, enable gang scheduling by kube-batch.
-// @optionalParam injectIstio string false Whether to inject istio sidecar; should be true or false.
+// @optionalParam injectIstio string true Whether to inject istio sidecar; should be true or false.
 // @optionalParam clusterDomain string cluster.local DNS config to cluster domain.
 
 local tfJobOperator = import "kubeflow/tf-training/tf-job-operator.libsonnet";

diff --git a/scripts/util.sh b/scripts/util.sh
@@ -94,17 +94,19 @@ createKsApp() {
   ks generate openvino openvino
   ks generate jupyter jupyter
   ks generate notebook-controller notebook-controller
-  ks generate jupyter-web-app jupyter-web-app
-  ks generate centraldashboard centraldashboard
-  ks generate tf-job-operator tf-job-operator
-  ks generate tensorboard tensorboard
+  ks generate jupyter-web-app jupyter-web-app --injectIstio false
+  ks generate centraldashboard centraldashboard --injectIstio false
+  ks generate tf-job-operator tf-job-operator --injectIstio false
+  ks generate tensorboard tensorboard --injectIstio false
   ks generate metacontroller metacontroller
   ks generate profiles profiles
   ks generate notebooks notebooks
-  ks generate argo argo
+  ks generate argo argo --injectIstio false
+
   ks generate pipeline pipeline
+  ks param set pipeline injectIstio false
 
-  ks generate katib katib
+  ks generate katib katib --injectIstio false
   # Enable collection of anonymous usage metrics
   # To disable metrics collection. Remove the spartakus component.
   # cd ks_app

diff --git a/testing/workflows/components/tfserving.libsonnet b/testing/workflows/components/tfserving.libsonnet
@@ -87,13 +87,15 @@
         modelName: "mnist",
         namespace: stepsNamespace,
         modelPath: "gs://kubeflow-examples-data/mnist",
+        injectIstio: "false",
       };
       local deployGpuParams = {
         name: "mnist-gpu",
         modelName: "mnist",
         namespace: stepsNamespace,
         modelPath: "gs://kubeflow-examples-data/mnist",
         numGpus: 1,
+        injectIstio: "false",
       };
 
       local toPair = function(k, v) k + "=" + v;