Merge pull request #480 from SeldonIO/seldon-core-ambassador-pr445

make ambassador a dependency
SeldonIO · Apr 4, 2019 · 5c033e3 · 5c033e3
2 parents 8de1b30 + fc2957a
commit 5c033e3
Show file tree

Hide file tree

Showing 43 changed files with 134 additions and 249 deletions.
diff --git a/.gitignore b/.gitignore
@@ -189,3 +189,7 @@ doc/source/_static/cluster-manager
 python/build/
 python/dist/
 testing/scripts/proto
+testing/scripts/tensorflow
+testing/scripts/run.log
+testing/scripts/my-model/
+wrappers/s2i/python/_python/
diff --git a/components/outlier-detection/isolation-forest/isolation_forest.ipynb b/components/outlier-detection/isolation-forest/isolation_forest.ipynb
@@ -273,7 +273,8 @@
    "source": [
     "!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
     "        --namespace seldon \\\n",
-    "        --set ambassador.enabled=true"
+    "        --set ambassador.enabled=true \\\n",
+    "        --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -367,7 +368,7 @@
    "metadata": {},
    "source": [
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/components/outlier-detection/mahalanobis/outlier_mahalanobis.ipynb b/components/outlier-detection/mahalanobis/outlier_mahalanobis.ipynb
@@ -236,7 +236,8 @@
    "source": [
     "!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
     "        --namespace seldon \\\n",
-    "        --set ambassador.enabled=true"
+    "        --set ambassador.enabled=true \\\n",
+    "        --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -336,7 +337,7 @@
    "metadata": {},
    "source": [
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/components/outlier-detection/seq2seq-lstm/seq2seq_lstm.ipynb b/components/outlier-detection/seq2seq-lstm/seq2seq_lstm.ipynb
@@ -290,7 +290,8 @@
    "source": [
     "!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
     "        --namespace seldon \\\n",
-    "        --set ambassador.enabled=true"
+    "        --set ambassador.enabled=true \\\n",
+    "        --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -384,7 +385,7 @@
    "metadata": {},
    "source": [
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/components/outlier-detection/vae/outlier_vae.ipynb b/components/outlier-detection/vae/outlier_vae.ipynb
@@ -285,7 +285,8 @@
    "source": [
     "!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
     "        --namespace seldon \\\n",
-    "        --set ambassador.enabled=true"
+    "        --set ambassador.enabled=true \\\n",
+    "        --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -381,7 +382,7 @@
    "metadata": {},
    "source": [
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/components/routers/case_study/credit_card_default.ipynb b/components/routers/case_study/credit_card_default.ipynb
@@ -477,7 +477,8 @@
    "source": [
     "!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
     "        --namespace seldon \\\n",
-    "        --set ambassador.enabled=true"
+    "        --set ambassador.enabled=true \\\n",
+    "        --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -521,7 +522,7 @@
    "metadata": {},
    "source": [
     "```sh\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/doc/source/reference/helm.md b/doc/source/reference/helm.md
@@ -35,10 +35,11 @@ The core choice in using the helm chart is to decide if you want to use Ambassad
 |----------|-------------|---------|
 | ambassador.enabled | Whether to enable the ambbassador reverse proxy | false |
 | ambassador.annotations | Configuration for Ambassador | default |
-| ambassador.image.name | Image to use for ambassador | ```<tested release with seldon>``` |
-| ambassador.resources | resource limits and requests | default |
-| ambassador.service_type | How to expose the ambassador service, e.g. NodePort, LoadBalancer | NodePort |
-| ambassador.statsd.image.name | Image to use for statsd | default |
+| ambassador.image.repository | Image name to use for ambassador | ```<tested release with seldon>``` |
+| ambassador.image.tag | Image tag to use for ambassador | ```<tested release with seldon>``` |
+| ambassador.service.type | How to expose the ambassador service, e.g. NodePort, LoadBalancer | NodePort |
+
+For more see https://github.com/helm/charts/tree/master/stable/ambassador
 
 ### General Role Based Access Control Settings
 

diff --git a/examples/ambassador/canary/ambassador_canary.ipynb b/examples/ambassador/canary/ambassador_canary.ipynb
@@ -268,7 +268,7 @@
     }
    ],
    "source": [
-    "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon  --set ambassador.enabled=true"
+    "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon  --set ambassador.enabled=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -303,7 +303,7 @@
     "**Ensure you port forward ambassador**:\n",
     "\n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/examples/ambassador/custom/ambassador_custom.ipynb b/examples/ambassador/custom/ambassador_custom.ipynb
@@ -274,7 +274,7 @@
     }
    ],
    "source": [
-    "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon  --set ambassador.enabled=true"
+    "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon  --set ambassador.enabled=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -309,7 +309,7 @@
     "**Ensure you port forward ambassador**:\n",
     "\n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/examples/ambassador/headers/ambassador_headers.ipynb b/examples/ambassador/headers/ambassador_headers.ipynb
@@ -274,7 +274,7 @@
     }
    ],
    "source": [
-    "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon  --set ambassador.enabled=true"
+    "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon  --set ambassador.enabled=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -309,7 +309,7 @@
     "**Ensure you port forward ambassador**:\n",
     "\n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/examples/ambassador/shadow/ambassador_shadow.ipynb b/examples/ambassador/shadow/ambassador_shadow.ipynb
@@ -272,7 +272,7 @@
     }
    ],
    "source": [
-    "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon  --set ambassador.enabled=true"
+    "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon  --set ambassador.enabled=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -393,7 +393,7 @@
     "**Ensure you port forward ambassador**:\n",
     "\n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```\n",
     "\n",
     "**Ensure you port forward to Grafana**\n",

diff --git a/examples/cicd-argocd/seldon-core/port-forard-ambassador b/examples/cicd-argocd/seldon-core/port-forard-ambassador
@@ -10,5 +10,5 @@ source ${STARTUP_DIR}/../settings.sh
 
 KUBECTL="kubectl --context=${KUBE_CONTEXT}"
 
-${KUBECTL} port-forward $(${KUBECTL} get pods -n default -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n default 8080:8080
+${KUBECTL} port-forward $(${KUBECTL} get pods -n default -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n default 8080:8080
 
diff --git a/examples/cicd-argocd/seldon-core/start-seldon-core b/examples/cicd-argocd/seldon-core/start-seldon-core
@@ -19,5 +19,6 @@ helm install --kube-context="${KUBE_CONTEXT}" ${SELDON_CORE_DIR}/helm-charts/sel
         --name seldon-core \
         --set apife_service_type=ClusterIP \
         --set ambassador.enabled=true \
+        --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true \
         --namespace default
 
diff --git a/examples/combiners/mnist_combiner/mnist_combiner.ipynb b/examples/combiners/mnist_combiner/mnist_combiner.ipynb
@@ -127,7 +127,8 @@
    "outputs": [],
    "source": [
     "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon \\\n",
-    "    --set ambassador.enabled=true"
+    "    --set ambassador.enabled=true \\\n",
+    "    --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -148,7 +149,7 @@
     "To send requests to Ambassador ingress in another terminal run:\n",
     "    \n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8002:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8002:8080\n",
     "```"
    ]
   },

diff --git a/examples/istio/canary_update/canary.ipynb b/examples/istio/canary_update/canary.ipynb
@@ -532,7 +532,8 @@
    ],
    "source": [
     "!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon \\\n",
-    "    --set ambassador.enabled=true"
+    "    --set ambassador.enabled=true \\\n",
+    "    --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -626,7 +627,7 @@
     "To send requests to Ambassador ingress in another terminal run:\n",
     "    \n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8002:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8002:8080\n",
     "```"
    ]
   },

diff --git a/examples/istio/canary_update/setup_port_forwards.sh b/examples/istio/canary_update/setup_port_forwards.sh
@@ -1,5 +1,5 @@
 #Ambassador
-kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8002:8080 &
+kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8002:8080 &
 
 #Seldon Grafana
 kubectl port-forward $(kubectl get pods -n seldon -l app=grafana-prom-server -o jsonpath='{.items[0].metadata.name}') -n seldon 3001:3000 &

diff --git a/examples/models/nvidia-mnist/nvidia_mnist.ipynb b/examples/models/nvidia-mnist/nvidia_mnist.ipynb
@@ -798,7 +798,8 @@
    "source": [
     "!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
     "        --namespace seldon \\\n",
-    "        --set ambassador.enabled=true"
+    "        --set ambassador.enabled=true \\\n",
+    "        --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -1100,7 +1101,7 @@
     "**Port forward Ambassador**\n",
     "\n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/examples/models/openvino/openvino-squeezenet.ipynb b/examples/models/openvino/openvino-squeezenet.ipynb
@@ -549,7 +549,7 @@
     "**Ensure you port forward ambassador:**\n",
     "\n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/examples/models/openvino_imagenet_ensemble/openvino_imagenet_ensemble.ipynb b/examples/models/openvino_imagenet_ensemble/openvino_imagenet_ensemble.ipynb
@@ -892,7 +892,7 @@
     "Expose ambassador API endpoint outside of the Kubernetes cluster or connect to it via `kubectl port-forward`.\n",
     "\n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8080:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8080:8080\n",
     "```\n",
     "- Expose the service `seldon-core-ambassador` using a `LoadBalancer` or `NodePort` type.\n",
     "\n",

diff --git a/examples/models/template_model_bindata/modelWithBindata.ipynb b/examples/models/template_model_bindata/modelWithBindata.ipynb
@@ -554,7 +554,7 @@
    "outputs": [],
    "source": [
     "minikube_ip = !minikube ip\n",
-    "minikube_port = !kubectl get svc -l service=ambassador -o jsonpath='{.items[0].spec.ports[0].nodePort}'"
+    "minikube_port = !kubectl get svc -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].spec.ports[0].nodePort}'"
    ]
   },
   {

diff --git a/examples/models/tfserving-mnist/tfserving-mnist.ipynb b/examples/models/tfserving-mnist/tfserving-mnist.ipynb
@@ -474,7 +474,8 @@
    "source": [
     "!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
     "        --namespace seldon \\\n",
-    "        --set ambassador.enabled=true"
+    "        --set ambassador.enabled=true \\\n",
+    "        --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
    ]
   },
   {
@@ -716,7 +717,7 @@
     "**Port forward Ambassador**\n",
     "\n",
     "```\n",
-    "kubectl port-forward $(kubectl get pods -n seldon -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
+    "kubectl port-forward $(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080\n",
     "```"
    ]
   },

diff --git a/helm-charts/seldon-core/charts/ambassador-2.0.1.tgz b/helm-charts/seldon-core/charts/ambassador-2.0.1.tgz
diff --git a/helm-charts/seldon-core/requirements.yaml b/helm-charts/seldon-core/requirements.yaml
@@ -0,0 +1,5 @@
+dependencies:
+  - name: ambassador
+    version: ^2.0.1
+    repository: https://kubernetes-charts.storage.googleapis.com/
+    condition: ambassador.enabled
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,5 +10,5 @@ source ${STARTUP_DIR}/../settings.sh

		KUBECTL="kubectl --context=${KUBE_CONTEXT}"

		${KUBECTL} port-forward $(${KUBECTL} get pods -n default -l service=ambassador -o jsonpath='{.items[0].metadata.name}') -n default 8080:8080
		${KUBECTL} port-forward $(${KUBECTL} get pods -n default -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n default 8080:8080