Skip to content

Commit

Permalink
e2e: move to use the maintained orchestrator-k8s helm chart
Browse files Browse the repository at this point in the history
Signed-off-by: Roy Golan <rgolan@redhat.com>
  • Loading branch information
rgolangh committed Jul 11, 2024
1 parent fd0f128 commit 53ec1dd
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 17 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/move2kube-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,11 @@ jobs:
kind load image-archive serverless-workflow-m2k-kfunc-${{ github.sha }}.tar
docker exec $(kind get clusters | head -1)-control-plane crictl images
- name: Deploy sonataflow-operator
- uses: actions/checkout@v4
- name: Deploy Orchestrator on K8s
run: |
helm repo add janus-idp-workflows https://rgolangh.github.io/janus-idp-workflows-helm/
helm install janus-idp-workflows janus-idp-workflows/janus-idp-workflows \
--set backstage.upstream.backstage.image.tag=1.1 \
-f https://raw.githubusercontent.com/rgolangh/janus-idp-workflows-helm/main/charts/kubernetes/orchestrator/values-k8s.yaml
make install-orchestrator-helm WORKFLOW_ID=na
echo "sleep bit long till the PV for data index and kaniko cache is ready. its a bit slow. TODO fixit"
kubectl get pv
sleep 3m
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/mta-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,11 @@ jobs:
kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=tackle-ui" -n my-konveyor-operator --timeout=120s
# now MTA workflow can execute agains tackle-ui.my-konveyor-operator.svc:8080
- name: Deploy Janus-idp-workflow-helm (janus + sonataflow-opertor)
- uses: actions/checkout@v4

- name: Deploy Orchestrator on K8s
run: |
helm repo add janus-idp-workflows https://rgolangh.github.io/janus-idp-workflows-helm/
helm install janus-idp-workflows janus-idp-workflows/janus-idp-workflows \
--set backstage.upstream.backstage.image.tag=1.1 \
-f https://raw.githubusercontent.com/rgolangh/janus-idp-workflows-helm/main/charts/kubernetes/orchestrator/values-k8s.yaml
make install-orchestrator-helm WORKFLOW_ID=na
echo "sleep bit long till the PV for data index and kaniko cache is ready. its a bit slow. TODO fixit"
kubectl get pv
Expand Down Expand Up @@ -129,6 +128,7 @@ jobs:
kubectl get pods -o wide
kubectl wait --for=condition=Ready=true pods -l "app=mtaanalysis" --timeout=5m
- uses: actions/checkout@v4
- name: Run e2e script
run: |
Expand All @@ -144,4 +144,4 @@ jobs:
if: always()
with:
name: kind-logs
path: ./kind_logs/
path: ./kind_logs/
7 changes: 2 additions & 5 deletions .github/workflows/mta-v6.x-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,9 @@ jobs:
kubectl wait --for=condition=Ready=true pods -l "app.kubernetes.io/name=tackle-ui" -n my-konveyor-operator --timeout=240s
# now MTA workflow can execute agains tackle-ui.my-konveyor-operator.svc:8080
- name: Deploy Janus-idp-workflow-helm (janus + sonataflow-opertor)
- name: Deploy Orchestrator on K8s
run: |
helm repo add janus-idp-workflows https://rgolangh.github.io/janus-idp-workflows-helm/
helm install janus-idp-workflows janus-idp-workflows/janus-idp-workflows \
--set backstage.upstream.backstage.image.tag=1.1 \
-f https://raw.githubusercontent.com/rgolangh/janus-idp-workflows-helm/main/charts/kubernetes/orchestrator/values-k8s.yaml
make install-orchestrator-helm WORKFLOW_ID=na
echo "sleep bit long till the PV for data index and kaniko cache is ready. its a bit slow. TODO fixit"
kubectl get pv
Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -184,3 +184,8 @@ push-manifests: prepare-workdir
cd $(WORKDIR)
@$(CONTAINER_ENGINE) run --rm -v $(WORKDIR):/workdir -w /workdir \
$(LINUX_IMAGE) /bin/bash -c "${SCRIPTS_DIR}/push_manifests.sh '$(GIT_USER_NAME)' $(GIT_USER_EMAIL) $(GIT_TOKEN) $(PR_OR_COMMIT_URL) $(DEPLOYMENT_REPO) $(DEPLOYMENT_BRANCH) $(WORKFLOW_ID) $(APPLICATION_ID) $(IMAGE_NAME) $(IMAGE_TAG)"

install-orchestrator-helm:
helm repo add orchestrator https://parodos-dev.github.io/orchestrator-helm-chart/
helm install orchestrator orchestrator/orchestrator-k8s

1 change: 1 addition & 0 deletions move2kube/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Move2kube (m2k) workflow

## Context
This workflow is using https://move2kube.konveyor.io/ to migrate the existing code contained in a git repository to a K8s/OCP platform.

Expand Down
2 changes: 1 addition & 1 deletion mta/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# MTA - migration analysis workflow
# MTA - Migration Analysis Workflow

# Synopsis
This workflow is an assessment workflow type, that invokes an application analysis workflow using [MTA][1]
Expand Down

0 comments on commit 53ec1dd

Please sign in to comment.