Skip to content
This repository has been archived by the owner on Jul 10, 2024. It is now read-only.

SUBMARINE-1293. Move seldon-core install to helm #999

Closed
wants to merge 8 commits into from
1 change: 1 addition & 0 deletions .github/scripts/start-submarine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ kubectl create namespace submarine
kubectl create namespace "$submarine_user_namespace"
kubectl label namespace submarine istio-injection=enabled
kubectl label namespace "$submarine_user_namespace" istio-injection=enabled
helm dependency update ./helm-charts/submarine
helm install --wait --set storageClass.provisioner=rancher.io/local-path --set storageClass.volumeBindingMode=WaitForFirstConsumer submarine ./helm-charts/submarine -n submarine
kubectl apply -f ./submarine-cloud-v2/artifacts/examples/example-submarine.yaml -n "$submarine_user_namespace"

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ jobs:
run: |
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
helm dependency update ./helm-charts/submarine
helm install --wait --set dev=true --set storageClass.provisioner=rancher.io/local-path --set storageClass.volumeBindingMode=WaitForFirstConsumer submarine ./helm-charts/submarine
- name: Run end-to-end test
working-directory: submarine-cloud-v2
Expand Down Expand Up @@ -204,6 +205,7 @@ jobs:
run: |
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
helm dependency update ./helm-charts/submarine
helm install --wait --set dev=true --set storageClass.provisioner=rancher.io/local-path --set storageClass.volumeBindingMode=WaitForFirstConsumer submarine ./helm-charts/submarine -n submarine-cloud-v3-system
- name: Run end-to-end test
working-directory: submarine-cloud-v3
Expand Down
6 changes: 5 additions & 1 deletion helm-charts/submarine/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ version: 0.8.0-SNAPSHOT
icon: https://submarine.apache.org/assets/themes/submarine/img/submarine_white_logo.png
dependencies:
- name: training-operator
version: "0.1.0"
version: "0.7.0"
- name: notebook-controller
version: "0.1.0"
- name: seldon-core-operator
cdmikechen marked this conversation as resolved.
Show resolved Hide resolved
version: "1.10.0"
repository: https://storage.googleapis.com/seldon-charts
condition: seldon-core-operator.enabled
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ apiVersion: networking.istio.io/v1alpha3
kind: Gateway
metadata:
name: seldon-gateway
namespace: istio-system
namespace: {{ .Release.Namespace }}
spec:
selector:
istio: ingressgateway # use istio default controller
Expand Down
8 changes: 8 additions & 0 deletions helm-charts/submarine/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,11 @@ podSecurityPolicy:
istio:
enabled: true
gatewaySelector: ingressgateway

cdmikechen marked this conversation as resolved.
Show resolved Hide resolved
# seldon-core-operator configuration
seldon-core-operator:
enabled: true
istio:
enabled: true
executor:
defaultEnvSecretRefName: submarine-serve-secret 2> /dev/null
2 changes: 2 additions & 0 deletions submarine-cloud-v2/docs/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Running operator out-of-cluster is very handy for development

```bash
# Step1: Install helm chart dependencies, --set dev=true option will not install the operator deployment to the cluster
helm dependency update ./helm-charts/submarine
helm install --set dev=true submarine ../helm-charts/submarine/ -n submarine

# Step2: Build & Run "submarine-operator"
Expand Down Expand Up @@ -104,6 +105,7 @@ eval $(minikube docker-env)
make image

# Step2: Install helm dependencies
helm dependency update ./helm-charts/submarine
helm install --wait --set dev=true submarine ../helm-charts/submarine

# Step3: Run Tests
Expand Down
2 changes: 2 additions & 0 deletions submarine-cloud-v3/docs/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ istiod-699b647f8b-nx9rt 1/1 Running 2 7d4h
Before running submarine operator, install submarine dependencies with helm. `--set dev=true` option will not install the operator deployment to the cluster.

```bash
helm dependency update ./helm-charts/submarine
helm install --set dev=true submarine ../helm-charts/submarine/ -n submarine-cloud-v3-system
```

Expand Down Expand Up @@ -137,6 +138,7 @@ eval $(minikube docker-env -u)
# running Step3 will create it.
# However, note that if podSecurityPolicy is enabled,
# the submarine operator pod will not be permitted until running this
helm dependency update ./helm-charts/submarine
helm install --set dev=true submarine ../helm-charts/submarine/ -n submarine-cloud-v3-system

# Step3: Deploy the operator.
Expand Down
1 change: 1 addition & 0 deletions submarine-serve/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Submarine serve uses istio 1.6.8 and seldon-core 1.10.0 for serving.

```bash
cd submarine
helm dependency update ./helm-charts/submarine
helm install submarine ./helm-charts/submarine
```

Expand Down
10 changes: 0 additions & 10 deletions submarine-serve/installation/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,3 @@ if [[ ! -f ${CURRENT_PATH}/istioctl ]]; then
fi

${CURRENT_PATH}/istioctl install --skip-confirmation

kubectl create ns seldon-system
kubectl apply -f ${CURRENT_PATH}/seldon-secret.yaml
helm install seldon-core seldon-core-operator \
--repo https://storage.googleapis.com/seldon-charts \
--namespace seldon-system \
--version 1.10.0 \
--set istio.enabled=true \
cdmikechen marked this conversation as resolved.
Show resolved Hide resolved
--set executor.defaultEnvSecretRefName=submarine-serve-secret 2> /dev/null
kubectl apply -f ${CURRENT_PATH}/seldon-gateway.yaml
7 changes: 4 additions & 3 deletions website/docs/gettingStarted/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ kubectl label namespace submarine-user-test istio-injection=enabled
3. Install the submarine operator and dependencies by helm chart

```bash
# We move seldon-core install to helm, thus we need to update our dependency.
helm dependency update ./helm-charts/submarine
helm install submarine ./helm-charts/submarine -n submarine
```

Expand All @@ -74,7 +76,7 @@ helm install submarine ./helm-charts/submarine -n submarine
kubectl apply -f submarine-cloud-v2/artifacts/examples/example-submarine.yaml -n submarine-user-test
```

5. Install submarine serve package istio and seldon-core
5. Install submarine serve package istio

```bash
./submarine-serve/installation/install.sh
Expand Down Expand Up @@ -296,5 +298,4 @@ Events: <none>
6. After successfully serving the model, we can test the results of serving using the test python code [serve_predictions.py](https://github.com/apache/submarine/blob/master/dev-support/examples/quickstart/serve_predictions.py)

![](/img/submarine-serve-prediction.png)