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

default ambassador to singleNamespace #509

Merged
merged 1 commit into from
Apr 15, 2019
Merged

default ambassador to singleNamespace #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 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,8 +273,7 @@
"source": [
"!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
" --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
3 changes: 1 addition & 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,8 +236,7 @@
"source": [
"!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
" --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
3 changes: 1 addition & 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,8 +290,7 @@
"source": [
"!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
" --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
3 changes: 1 addition & 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,8 +285,7 @@
"source": [
"!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
" --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
3 changes: 1 addition & 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,8 +477,7 @@
"source": [
"!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
" --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion 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 --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
"!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion 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 --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
"!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion 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 --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
"!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion 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 --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
"!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true"
]
},
{
Expand Down
1 change: 0 additions & 1 deletion 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,6 +19,5 @@ 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

3 changes: 1 addition & 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,8 +127,7 @@
"outputs": [],
"source": [
"!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
3 changes: 1 addition & 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,8 +532,7 @@
],
"source": [
"!helm install ../../../helm-charts/seldon-core --name seldon-core --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
3 changes: 1 addition & 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,8 +798,7 @@
"source": [
"!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
" --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
3 changes: 1 addition & 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,8 +474,7 @@
"source": [
"!helm install ../../../helm-charts/seldon-core --name seldon-core \\\n",
" --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
Binary file removed helm-charts/seldon-core/charts/ambassador-2.0.1.tgz
View file
Open in desktop
Binary file not shown.
Binary file added helm-charts/seldon-core/charts/ambassador-2.1.0.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion helm-charts/seldon-core/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies:
- name: ambassador
version: ^2.0.1
version: ^2.1.0
repository: https://kubernetes-charts.storage.googleapis.com/
condition: ambassador.enabled
5 changes: 2 additions & 3 deletions helm-charts/seldon-core/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ ambassador:
rbac:
create: true
namespaced: true
# scope will be cluster wide unless below is set
# env:
# AMBASSADOR_SINGLE_NAMESPACE: "true"
scope:
singleNamespace: true
apife:
annotations: null
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion notebooks/helm_examples.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
}
],
"source": [
"!helm install ../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
"!helm install ../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion notebooks/max_grpc_msg_size.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
}
],
"source": [
"!helm install ../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
"!helm install ../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true"
]
},
{
Expand Down
3 changes: 1 addition & 2 deletions notebooks/timeouts.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,7 @@
],
"source": [
"!helm install ../helm-charts/seldon-core --name seldon-core --namespace seldon \\\n",
" --set ambassador.enabled=true \\\n",
" --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
" --set ambassador.enabled=true"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions seldon-core/seldon-core/json/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ The template_0.2.json is generated using:

```
git clone --branch release-0.2 git@github.com:SeldonIO/seldon-core.git seldon-core-release-0.2
helm template --set ambassador.enabled=true --set single_namespace=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true seldon-core-release-0.2/helm-charts/seldon-core > template_0.2_single_namespace.yaml
helm template --set ambassador.enabled=true --set single_namespace=false --set ambassador.rbac.namespaced=false seldon-core-release-0.2/helm-charts/seldon-core > template_0.2_cluster_wide.yaml
helm template --set ambassador.enabled=true --set single_namespace=true seldon-core-release-0.2/helm-charts/seldon-core > template_0.2_single_namespace.yaml
helm template --set ambassador.enabled=true --set single_namespace=false --set ambassador.rbac.namespaced=false --set ambassador.scope.singleNamespace=false seldon-core-release-0.2/helm-charts/seldon-core > template_0.2_cluster_wide.yaml
kubectl convert -f template_0.2_single_namespace.yaml -o json > template_0.2_single_namespace.json
kubectl convert -f template_0.2_cluster_wide.yaml -o json > template_0.2_cluster_wide.json
rm template_0.2*.yaml
Expand Down
1 change: 0 additions & 1 deletion start-seldon-core-private-repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ helm install "${STARTUP_DIR}/helm-charts/seldon-core" --name seldon-core \
--set engine.image.pull_policy=Always \
--set engine.image.name=$ENGINE_IMAGE_NAME \
--set ambassador.enabled=true \
--set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true \
--namespace "${NAMESPACE}"

2 changes: 1 addition & 1 deletion testing/notebooks/helm_single_namespace_tests.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"metadata": {},
"outputs": [],
"source": [
"!helm install ../../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true"
"!helm install ../../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions testing/scripts/k8s_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ def create_seldon_single_namespace_helm(request,version):
setup_k8s()
setup_helm()
run("helm install ../../helm-charts/seldon-core-crd --name seldon-core-crd --set usage_metrics.enabled=true", shell=True)
run("helm install ../../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true --set apife.image.name=127.0.0.1:5000/seldonio/apife:"+version+" --set cluster_manager.image.name=127.0.0.1:5000/seldonio/cluster-manager:"+version+" --set engine.image.name=127.0.0.1:5000/seldonio/engine:"+version, shell=True)
run("helm install ../../helm-charts/seldon-core --name seldon-core --namespace seldon --set ambassador.enabled=true --set apife.image.name=127.0.0.1:5000/seldonio/apife:"+version+" --set cluster_manager.image.name=127.0.0.1:5000/seldonio/cluster-manager:"+version+" --set engine.image.name=127.0.0.1:5000/seldonio/engine:"+version, shell=True)
wait_seldon_ready()
setup_finalizer_helm(request)

def create_seldon_clusterwide_helm(request,version):
setup_k8s()
setup_helm()
run("helm install ../../helm-charts/seldon-core-crd --name seldon-core-crd --set usage_metrics.enabled=true", shell=True)
run("helm install ../../helm-charts/seldon-core --name seldon-core --namespace seldon --set single_namespace=false --set ambassador.rbac.namespaced=false --set ambassador.enabled=true --set apife.image.name=127.0.0.1:5000/seldonio/apife:"+version+" --set cluster_manager.image.name=127.0.0.1:5000/seldonio/cluster-manager:"+version+" --set engine.image.name=127.0.0.1:5000/seldonio/engine:"+version, shell=True)
run("helm install ../../helm-charts/seldon-core --name seldon-core --namespace seldon --set single_namespace=false --set ambassador.rbac.namespaced=false --set ambassador.scope.singleNamespace=false --set ambassador.enabled=true --set apife.image.name=127.0.0.1:5000/seldonio/apife:"+version+" --set cluster_manager.image.name=127.0.0.1:5000/seldonio/cluster-manager:"+version+" --set engine.image.name=127.0.0.1:5000/seldonio/engine:"+version, shell=True)
wait_seldon_ready()
setup_finalizer_helm(request)

Expand Down
4 changes: 2 additions & 2 deletions util/ksonnet/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ install_kubectl:
sudo mv ./kubectl /usr/local/bin/kubectl

template_0.2_single_namespace.yaml template_0.2_cluster_wide.yaml:
helm template --set ambassador.enabled=true --set single_namespace=true --set ambassador.env.AMBASSADOR_SINGLE_NAMESPACE=true ../../helm-charts/seldon-core > template_0.2_single_namespace.yaml
helm template --set ambassador.enabled=true --set single_namespace=false --set ambassador.rbac.namespaced=false ../../helm-charts/seldon-core > template_0.2_cluster_wide.yaml
helm template --set ambassador.enabled=true --set single_namespace=true ../../helm-charts/seldon-core > template_0.2_single_namespace.yaml
helm template --set ambassador.enabled=true --set single_namespace=false --set ambassador.rbac.namespaced=false --set ambassador.scope.singleNamespace=false ../../helm-charts/seldon-core > template_0.2_cluster_wide.yaml

template_0.2_single_namespace.json template_0.2_cluster_wide.json: template_0.2_single_namespace.yaml template_0.2_cluster_wide.yaml
python y2j.py < template_0.2_single_namespace.yaml > template_0.2_single_namespace.json
Expand Down