Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
yzhao583 committed Jun 11, 2024
2 parents 9b11a44 + bc28f39 commit f0e4049
Show file tree
Hide file tree
Showing 674 changed files with 30,742 additions and 7,273 deletions.
22 changes: 22 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
codecov:
require_ci_to_pass: true

coverage:
precision: 2
round: down
range: "50...70"
status:
project:
default:
informational: true
target: auto
threshold: 1%
patch:
default:
informational: true
target: 70%

comment:
layout: "reach,diff,flags,files,footer"
behavior: default
require_changes: false
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FASTIFY_LOG_LEVEL=debug

DSPA_NAME=dspa
METADATA_ENVOY_SERVICE_HOST=localhost
METADATA_ENVOY_SERVICE_PORT=9090
METADATA_ENVOY_SERVICE_PORT=10001
DS_PIPELINE_DSPA_SERVICE_HOST=localhost
DS_PIPELINE_DSPA_SERVICE_PORT=8443

Expand Down
28 changes: 0 additions & 28 deletions .github/workflows/dispatch_on_crd_change.yaml

This file was deleted.

17 changes: 12 additions & 5 deletions .github/workflows/pull_request.yml → .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: Pull request
on:
pull_request:
name: Test
on: [push, pull_request]
jobs:
Tests:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -45,6 +44,14 @@ jobs:
- name: Check for uncomitted changes
run: |
git diff --exit-code
- name: Test
- name: Test backend & test frontend with code coverage
if: ${{ success() }}
run: npm run test
run: npm run test:backend && npm run test:frontend:coverage
- name: Upload coverage reports to Codecov
uses: codecov/[email protected]
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: false
name: frontend
directory: ./frontend/coverage
verbose: true
22 changes: 18 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,41 @@ To review the ODH requirements, please refer to the [dev setup documentation].

### Running locally

Development for only "frontend" can target a backend service running on an OpenShift cluster. This method requires you to first log in to the OpenShift cluster. It is recommended to use this method unless backend changes are being developed.

```bash
cd frontend
oc login ...
npm run start:dev:ext
```

Development for both "frontend" and "backend" can be done while running:

``` bash
```bash
npm run dev
```

But the recommended flow for development would be have two sessions, one for the frontend:
But the recommended flow for development would be have two sessions, one for the "frontend":

```bash
cd frontend
npm run start:dev
```

And one for the backend
And one for the "backend":

```bash
cd backend
npm run start:dev
```

Once you have these running, you can open the dashboard locally at: `http://localhost:4010`. The dev server will reload automatically when you make changes.
Once you have either method running, you can open the dashboard locally at: `http://localhost:4010`. The dev server will reload automatically when you make changes.

If running a local backend, some requests from the frontend need to make their way to services running on the cluster for which there are no external routes exposed. This can be achieved using `oc port-forward`. Run the following command in a separate terminal to start the port forwarding processes. Note that this limits developers to working within a single namespace and must be restarted if switching to a new namespace.

```bash
NAMESPACE=my-example make port-forward
```

#### Give your dev env access

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ undeploy:
port-forward:
ifdef NAMESPACE
parallel -j0 --lb ::: \
'oc port-forward -n ${NAMESPACE} svc/ds-pipeline-metadata-envoy-${DSPA_NAME} ${METADATA_ENVOY_SERVICE_PORT}:9090' \
'oc port-forward -n ${NAMESPACE} svc/ds-pipeline-md-${DSPA_NAME} ${METADATA_ENVOY_SERVICE_PORT}:8443' \
'oc port-forward -n ${NAMESPACE} svc/ds-pipeline-${DSPA_NAME} ${DS_PIPELINE_DSPA_SERVICE_PORT}:8443' \
'oc port-forward -n ${NAMESPACE} svc/${TRUSTYAI_NAME}-tls ${TRUSTYAI_TAIS_SERVICE_PORT}:443'
'oc port-forward -n ${NAMESPACE} svc/${TRUSTYAI_NAME}-tls ${TRUSTYAI_TAIS_SERVICE_PORT}:443' \
'oc port-forward -n odh-model-registries svc/${MODEL_REGISTRY_NAME} ${MODEL_REGISTRY_SERVICE_PORT}:8080'
else
$(error Missing NAMESPACE variable)
Expand Down
3 changes: 2 additions & 1 deletion OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ approvers:
- lucferbux
- alexcreasy
- christianvogt
- mturley
- Gkrumbach07

reviewers:
- alexcreasy
- christianvogt
- uidoyen
- Gkrumbach07
- lucferbux
- DaoDaoNoCode
- manaswinidas
- pnaik1
- ppadti
- dpanshug
- mturley
Loading

0 comments on commit f0e4049

Please sign in to comment.