Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make ambassador a dependency #480

Merged
merged 11 commits into from
Apr 4, 2019
Merged

make ambassador a dependency #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e696eac
Make ambassador a dependency
naseemkullah Feb 12, 2019
39117b6
Removing ambassador rbac, letting ambassador chart deal with it
naseemkullah Feb 12, 2019
b0feaf9
Version 1.1.0 of stable/ambassador
naseemkullah Feb 13, 2019
71b0cfb
Merge branch 'master' into seldon-core-ambassador-pr445
ryandawsonuk Mar 27, 2019
9e545dd
adjust label for ambassador
ryandawsonuk Mar 27, 2019
f3f558d
add items generated by tests to gitignore and comment on using Makefile
ryandawsonuk Mar 27, 2019
b31c0e3
clean other generated dirs
ryandawsonuk Mar 28, 2019
656ac5b
apply resources to ambassador, note on minikube and retries for grpc …
ryandawsonuk Mar 28, 2019
6c7857f
more retries and ksonnet to use same ambassador labels as helm
ryandawsonuk Mar 29, 2019
7c40899
default ambassador to cluster wide and override - workaround helm cha…
ryandawsonuk Mar 29, 2019
fc2957a
update helm chart doc
ryandawsonuk Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,7 @@ doc/source/_static/cluster-manager
python/build/
python/dist/
testing/scripts/proto
testing/scripts/tensorflow
Copy link
Contributor Author

@ryandawsonuk ryandawsonuk Apr 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noticed these were generated so put in gitignore and also the clean script in the testing makefile

testing/scripts/run.log
testing/scripts/my-model/
wrappers/s2i/python/_python/
5 changes: 3 additions & 2 deletions components/outlier-detection/isolation-forest/isolation_forest.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor Author

@ryandawsonuk ryandawsonuk Apr 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is not strictly necessary as otherwise it will be cluster-wide and that would work too. But previously it was namespace-only. In addition to running the tests I also stepped through this notebook to make sure it was ok to make this change. I was able to make all the requests.

Copy link
Contributor Author

@ryandawsonuk ryandawsonuk Apr 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For a little while I wasn't able to see anything in the grafana dashboard but that turned out to be unrelated as I was seeing it with master too and it was fixed by recreating minikube.

]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
5 changes: 3 additions & 2 deletions components/outlier-detection/mahalanobis/outlier_mahalanobis.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
5 changes: 3 additions & 2 deletions components/outlier-detection/seq2seq-lstm/seq2seq_lstm.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
5 changes: 3 additions & 2 deletions components/outlier-detection/vae/outlier_vae.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
5 changes: 3 additions & 2 deletions components/routers/case_study/credit_card_default.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
9 changes: 5 additions & 4 deletions doc/source/reference/helm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions examples/ambassador/canary/ambassador_canary.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
4 changes: 2 additions & 2 deletions examples/ambassador/custom/ambassador_custom.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
4 changes: 2 additions & 2 deletions examples/ambassador/headers/ambassador_headers.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
4 changes: 2 additions & 2 deletions examples/ambassador/shadow/ambassador_shadow.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/cicd-argocd/seldon-core/port-forard-ambassador
View file
Open in desktop
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

1 change: 1 addition & 0 deletions examples/cicd-argocd/seldon-core/start-seldon-core
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

5 changes: 3 additions & 2 deletions examples/combiners/mnist_combiner/mnist_combiner.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand All @@ -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",
"```"
]
},
Expand Down
5 changes: 3 additions & 2 deletions examples/istio/canary_update/canary.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
2 changes: 1 addition & 1 deletion examples/istio/canary_update/setup_port_forwards.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 &
Expand Down
5 changes: 3 additions & 2 deletions examples/models/nvidia-mnist/nvidia_mnist.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
2 changes: 1 addition & 1 deletion examples/models/openvino/openvino-squeezenet.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"```"
]
},
Expand Down
2 changes: 1 addition & 1 deletion examples/models/openvino_imagenet_ensemble/openvino_imagenet_ensemble.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/models/template_model_bindata/modelWithBindata.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}'"
]
},
{
Expand Down
5 changes: 3 additions & 2 deletions examples/models/tfserving-mnist/tfserving-mnist.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
"```"
]
},
Expand Down
Binary file added helm-charts/seldon-core/charts/ambassador-2.0.1.tgz
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions helm-charts/seldon-core/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependencies:
- name: ambassador
version: ^2.0.1
repository: https://kubernetes-charts.storage.googleapis.com/
condition: ambassador.enabled
Loading