This is an automated email from the ASF dual-hosted git repository.
cdmikechen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 9bf57a3a SUBMARINE-1293. Move seldon-core install to helm
9bf57a3a is described below
commit 9bf57a3a7b88125fc45217034d83e0447a127bfd
Author: HH <[email protected]>
AuthorDate: Sun Oct 16 13:54:05 2022 +0800
SUBMARINE-1293. Move seldon-core install to helm
### What is this PR for?
Move seldon-core install to helm
### What type of PR is it?
[Bug Fix]
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-1293
### How should this be tested?
Make sure we can install the sekdon-core correctly.
### Screenshots (if appropriate)
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: HH <[email protected]>
Signed-off-by: cdmikechen <[email protected]>
Closes #999 from hhcs9527/SUBMARINE-1293 and squashes the following commits:
0b321cac [HH] SUBMARINE-1293. Fix Travis CI error ( Add helm dependency
update ).
a4bd1133 [HH] SUBMARINE-1293. Fix Travis CI error (mis-add the char name).
98e0f71b [HH] SUBMARINE-1293. Update Quickstart.md and fix Travis CI error.
a2b4cdaa [HH] SUBMARINE-1293. remain seldon-secret, modify namespace in
seldon-gateway.
36bcb75e [HH] SUBMARINE-1293. delete seldon-secret, add conditon and add
default value for synchronization
4099a993 [HH] SUBMARINE-1293. modify the value for seldon-core-operator
dependency.
b61cba29 [HH] SUBMARINE-1296. delete seldon-secret, add conditon and add
default value for synchronization
58182bec [HH] SUBMARINE-1296. Move seldon-core install to helm
---
.github/scripts/start-submarine.sh | 1 +
.github/workflows/master.yml | 2 ++
helm-charts/submarine/Chart.yaml | 6 +++++-
.../submarine/templates}/seldon-gateway.yaml | 2 +-
helm-charts/submarine/values.yaml | 8 ++++++++
submarine-cloud-v2/docs/developer-guide.md | 2 ++
submarine-cloud-v3/docs/developer-guide.md | 2 ++
submarine-serve/README.md | 1 +
submarine-serve/installation/install.sh | 10 ----------
website/docs/gettingStarted/quickstart.md | 7 ++++---
10 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/.github/scripts/start-submarine.sh
b/.github/scripts/start-submarine.sh
index c1cb9bd9..b5b9f66c 100644
--- a/.github/scripts/start-submarine.sh
+++ b/.github/scripts/start-submarine.sh
@@ -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"
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 22993b7f..fd596f7d 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -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
@@ -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
diff --git a/helm-charts/submarine/Chart.yaml b/helm-charts/submarine/Chart.yaml
index b70b9f74..e7c71ac0 100644
--- a/helm-charts/submarine/Chart.yaml
+++ b/helm-charts/submarine/Chart.yaml
@@ -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
+ version: "1.10.0"
+ repository: https://storage.googleapis.com/seldon-charts
+ condition: seldon-core-operator.enabled
\ No newline at end of file
diff --git a/submarine-serve/installation/seldon-gateway.yaml
b/helm-charts/submarine/templates/seldon-gateway.yaml
similarity index 96%
rename from submarine-serve/installation/seldon-gateway.yaml
rename to helm-charts/submarine/templates/seldon-gateway.yaml
index ff9c01be..3c0bbc63 100644
--- a/submarine-serve/installation/seldon-gateway.yaml
+++ b/helm-charts/submarine/templates/seldon-gateway.yaml
@@ -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
diff --git a/helm-charts/submarine/values.yaml
b/helm-charts/submarine/values.yaml
index 56c02090..7a045c70 100644
--- a/helm-charts/submarine/values.yaml
+++ b/helm-charts/submarine/values.yaml
@@ -45,3 +45,11 @@ podSecurityPolicy:
istio:
enabled: true
gatewaySelector: ingressgateway
+
+# seldon-core-operator configuration
+seldon-core-operator:
+ enabled: true
+ istio:
+ enabled: true
+ executor:
+ defaultEnvSecretRefName: submarine-serve-secret 2> /dev/null
diff --git a/submarine-cloud-v2/docs/developer-guide.md
b/submarine-cloud-v2/docs/developer-guide.md
index a0df1baf..db4e438d 100644
--- a/submarine-cloud-v2/docs/developer-guide.md
+++ b/submarine-cloud-v2/docs/developer-guide.md
@@ -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"
@@ -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
diff --git a/submarine-cloud-v3/docs/developer-guide.md
b/submarine-cloud-v3/docs/developer-guide.md
index 9789824e..706b4eff 100644
--- a/submarine-cloud-v3/docs/developer-guide.md
+++ b/submarine-cloud-v3/docs/developer-guide.md
@@ -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
```
@@ -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.
diff --git a/submarine-serve/README.md b/submarine-serve/README.md
index 521dc622..04f73e75 100644
--- a/submarine-serve/README.md
+++ b/submarine-serve/README.md
@@ -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
```
diff --git a/submarine-serve/installation/install.sh
b/submarine-serve/installation/install.sh
index 75734a85..05c85455 100755
--- a/submarine-serve/installation/install.sh
+++ b/submarine-serve/installation/install.sh
@@ -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 \
- --set executor.defaultEnvSecretRefName=submarine-serve-secret 2> /dev/null
-kubectl apply -f ${CURRENT_PATH}/seldon-gateway.yaml
diff --git a/website/docs/gettingStarted/quickstart.md
b/website/docs/gettingStarted/quickstart.md
index 0b00f119..d0b58472 100644
--- a/website/docs/gettingStarted/quickstart.md
+++ b/website/docs/gettingStarted/quickstart.md
@@ -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
```
@@ -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
@@ -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)
-
-
\ No newline at end of file
+
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
