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

Update mlp deployment in CI to use charts from caraml #318

Merged
merged 8 commits into from
Nov 11, 2022
Merged

Update mlp deployment in CI to use charts from caraml #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
69a9e9c
change mlp chart to caraml
Nov 8, 2022
73cd174
disable parts of ci for test
Nov 8, 2022
050db73
override
Nov 8, 2022
3ab41f3
drop ingress
Nov 8, 2022
4459acd
add path type
Nov 8, 2022
7b7770b
undo
Nov 8, 2022
926c468
update char version to 0.3.4
Nov 8, 2022
5c0f265
revert normal ci
Nov 8, 2022
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
8 changes: 2 additions & 6 deletions .github/workflows/merlin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,15 +342,11 @@ jobs:
LOCAL_REGISTRY_PORT: 12345
LOCAL_REGISTRY: "dev.localhost"
INGRESS_HOST: "127.0.0.1.nip.io"
MLP_CHART_VERSION: 0.3.4
steps:
- uses: actions/checkout@v2
with:
path: merlin
- uses: actions/checkout@master
with:
repository: gojek/mlp
ref: v1.7.4
path: merlin/scripts/e2e/mlp
- uses: actions/setup-go@v2
with:
go-version: ${{ env.GO_VERSION }}
Expand Down Expand Up @@ -398,7 +394,7 @@ jobs:
run: ./setup-cluster.sh merlin-cluster ${{ env.INGRESS_HOST }}
- name: Deploy merlin and mlp
working-directory: merlin/scripts/e2e
run: ./deploy-merlin.sh ${{ env.INGRESS_HOST }} ${{ env.LOCAL_REGISTRY }}:${{ env.LOCAL_REGISTRY_PORT }} ../../charts/merlin ${{ needs.create-version.outputs.version }} ${{ github.ref }}
run: ./deploy-merlin.sh ${{ env.INGRESS_HOST }} ${{ env.LOCAL_REGISTRY }}:${{ env.LOCAL_REGISTRY_PORT }} ../../charts/merlin ${{ needs.create-version.outputs.version }} ${{ github.ref }} ${{ env.MLP_CHART_VERSION }}
- name: Run E2E Test
timeout-minutes: 30
id: run-e2e-test
Expand Down
20 changes: 12 additions & 8 deletions scripts/e2e/deploy-merlin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,24 @@ DOCKER_REGISTRY="$2"
CHART_PATH="$3"
VERSION="$4"
GIT_REF="$5"
MLP_CHART_VERSION="$6"


TIMEOUT=120s

install_mlp() {
echo "::group::MLP Deployment"
helm upgrade --install --debug mlp mlp/charts/mlp --namespace mlp --create-namespace -f mlp/charts/mlp/values-e2e.yaml \
--set mlp.image.tag=v1.7.4 \
--set mlp.apiHost=http://mlp.mlp.${INGRESS_HOST}/v1 \
--set mlp.mlflowTrackingUrl=http://mlflow.mlp.${INGRESS_HOST} \
--set mlp.ingress.enabled=true \
--set mlp.ingress.class=istio \
--set mlp.ingress.path="/*" \
--set mlp.ingress.host=mlp.mlp.${INGRESS_HOST} \

helm repo add caraml https://caraml-dev.github.io/helm-charts

helm upgrade --install --debug mlp caraml/mlp --namespace mlp --create-namespace \
--version ${MLP_CHART_VERSION} \
--set fullnameOverride=mlp \
--set deployment.apiHost=http://mlp.mlp.${INGRESS_HOST}/v1 \
--set deployment.mlflowTrackingUrl=http://mlflow.mlp.${INGRESS_HOST} \
--set ingress.enabled=true \
--set ingress.class=istio \
--set ingress.host=mlp.mlp.${INGRESS_HOST} \
--wait --timeout=${TIMEOUT}

kubectl apply -f config/mock/message-dumper.yaml
Expand Down
19 changes: 10 additions & 9 deletions scripts/quick_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export VAULT_VERSION=0.7.0
export MINIO_VERSION=7.0.2

export OAUTH_CLIENT_ID="<put your oauth client id here>"
export MLP_CHART_VERSION=0.3.4
export MERLIN_VERSION=v0.9.0

# Install Istio
Expand Down Expand Up @@ -177,16 +178,16 @@ helm install minio minio/minio --version=${MINIO_VERSION} --namespace=minio --va
# Install MLP
kubectl create namespace mlp

git clone git@github.com:gojek/mlp.git
helm repo add caraml https://caraml-dev.github.io/helm-charts

helm install mlp ./mlp/chart --namespace=mlp --values=./mlp/chart/values-e2e.yaml \
--set mlp.image.tag=main \
--set mlp.apiHost=http://mlp.mlp.${INGRESS_HOST}.nip.io/v1 \
--set mlp.oauthClientID=${OAUTH_CLIENT_ID} \
--set mlp.mlflowTrackingUrl=http://mlflow.mlp.${INGRESS_HOST}.nip.io \
--set mlp.ingress.enabled=true \
--set mlp.ingress.class=istio \
--set mlp.ingress.host=mlp.mlp.${INGRESS_HOST}.nip.io \
helm upgrade --install --debug mlp caraml/mlp --namespace mlp --create-namespace \
--version ${MLP_CHART_VERSION} \
--set fullnameOverride=mlp \
--set deployment.apiHost=http://mlp.mlp.${INGRESS_HOST}.nip.io/v1 \
--set deployment.mlflowTrackingUrl=http://mlflow.mlp.${INGRESS_HOST}.nip.io \
--set ingress.enabled=true \
--set ingress.class=istio \
--set ingress.host=mlp.mlp.${INGRESS_HOST}.nip.io \
--wait --timeout=5m

cat <<EOF > mlp-ingress.yaml
Expand Down