Skip to content

Commit

Permalink
Odigos UI beta (#1744)
Browse files Browse the repository at this point in the history
Co-authored-by: Ben Elferink <[email protected]>
Co-authored-by: Tamir David <[email protected]>
Co-authored-by: Tamir David <[email protected]>
Co-authored-by: Amir Blum <[email protected]>
Co-authored-by: Ron Federman <[email protected]>
Co-authored-by: yodigos <[email protected]>
Co-authored-by: Mike Dame <[email protected]>
Co-authored-by: alonbraymok <[email protected]>
Co-authored-by: Daria Dovzhikova <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: Eden Federman <[email protected]>
  • Loading branch information
13 people authored Nov 19, 2024
1 parent d30d41a commit 44be3a8
Show file tree
Hide file tree
Showing 684 changed files with 41,577 additions and 17,409 deletions.
27 changes: 10 additions & 17 deletions .github/workflows/cross-cloud-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ on:
- cron: '0 0 * * *' # Nightly run at midnight
workflow_dispatch: # Manual trigger


permissions:
id-token: write
contents: read
contents: read

jobs:
build-and-push-images:
build-and-push-images:
permissions:
id-token: write
contents: read
contents: read
name: Build and Push Docker Images
runs-on: warp-ubuntu-latest-x64-8x-spot
steps:
Expand All @@ -24,14 +23,12 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3


- name: Configure AWS credentials from OIDC
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: arn:aws:iam::061717858829:role/ecr-pull-push-role
aws-region: us-east-1


- name: Login to Amazon ECR
run: |
aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws
Expand Down Expand Up @@ -60,7 +57,7 @@ jobs:
test:
permissions:
id-token: write
contents: read
contents: read
needs: build-and-push-images
runs-on: warp-ubuntu-latest-x64-8x-spot
strategy:
Expand All @@ -69,7 +66,6 @@ jobs:
test-scenario: [multi-apps, helm-chart] # Add or remove scenarios as needed

steps:

- name: Configure AWS credentials from OIDC
uses: aws-actions/configure-aws-credentials@v4
with:
Expand All @@ -92,7 +88,6 @@ jobs:
echo "TF_VAR_test_scenario=${{ matrix.test-scenario }}" >> $GITHUB_ENV
echo "TF_VAR_run_id=${{ github.run_id }}" >> $GITHUB_ENV
- name: Configure Cloud Provider
run: |
if [ "${{ matrix.cloud-provider }}" = "aks" ]; then
Expand Down Expand Up @@ -140,8 +135,7 @@ jobs:
fi
- name: Initialize OpenTofu
run: tofu -chdir=$TF_DIR init

run: tofu -chdir=$TF_DIR init

- name: Plan OpenTofu
run: tofu -chdir=$TF_DIR plan
Expand All @@ -166,7 +160,7 @@ jobs:
- name: Verify cluster Access
run: |
kubectl get nodes || exit 1
kubectl get nodes || exit 1
- name: Install Chainsaw
uses: kyverno/[email protected]
Expand All @@ -179,7 +173,7 @@ jobs:
- name: Install FE
# this is used for cypress tests which are not run in every scenario
if: matrix.test-scenario == 'multi-apps' || matrix.test-scenario == 'helm-chart' || matrix.test-scenario == 'fe-synthetic'
if: matrix.test-scenario == 'multi-apps' || matrix.test-scenario == 'helm-chart'
run: |
cd frontend/webapp
yarn install
Expand All @@ -189,18 +183,18 @@ jobs:
# This uses in chainsaw to split e2e tests from cross cloud tests
export MODE=cross-cloud-tests
# This uses in chainsaw to verify the odigos version is equal to the commit version
export COMMIT_HASH=${{ github.sha }}
chainsaw test tests/e2e/${{ matrix.test-scenario }}
- name: Run diagnose command
if: always()
run: |
./cli/odigos diagnose
continue-on-error: true

- name: Upload run details artifact
if: always()
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -237,4 +231,3 @@ jobs:
GITHUB_RUN_ID: ${{ github.run_id }}
run: |
curl -X POST -H 'Content-type: application/json' --data '{"blocks":[{"type":"section","text":{"type":"mrkdwn","text":"*SUCCESS*: Providers tests succeed > `${{ matrix.cloud-provider }} - ${{ matrix.test-scenario }}`"}},{"type":"section","fields":[{"type":"mrkdwn","text":"*Link:*\n<https://github.com/${{ env.GITHUB_REPOSITORY }}/actions/runs/${{ env.GITHUB_RUN_ID }}|View the GitHub Run>"},{"type":"mrkdwn","text":"*Tag:*\n`${{ steps.extract_tag.outputs.tag }}`"}]}]}' ${{ env.SLACK_WEBHOOK_URL }}
38 changes: 18 additions & 20 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ concurrency:
cancel-in-progress: true

jobs:

build-cli:
runs-on: ubuntu-latest
steps:
Expand All @@ -22,7 +21,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "~1.22"
go-version: '~1.22'
check-latest: true
cache: true
cache-dependency-path: |
Expand Down Expand Up @@ -57,38 +56,37 @@ jobs:
path: odigos-images.tar

kubernetes-test:
needs:
needs:
- build-odigos-images
- build-cli
runs-on: warp-ubuntu-latest-x64-8x-spot
strategy:
fail-fast: false
matrix:
kube-version:
- "1.20.15"
- "1.23"
- "1.30"
- '1.20.15'
- '1.23'
- '1.30'
test-scenario:
- "multi-apps"
- "helm-chart"
- "fe-synthetic"
- "cli-upgrade"
- "workload-lifecycle"
- 'multi-apps'
- 'helm-chart'
- 'cli-upgrade'
- 'workload-lifecycle'
include:
- kube-version: "1.20.15"
kind-image: "kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394"
- kube-version: "1.23"
kind-image: "kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3"
- kube-version: "1.30"
kind-image: "kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
- kube-version: '1.20.15'
kind-image: 'kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394'
- kube-version: '1.23'
kind-image: 'kindest/node:v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3'
- kube-version: '1.30'
kind-image: 'kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e'
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "~1.22"
go-version: '~1.22'
check-latest: true
cache: true
cache-dependency-path: |
Expand All @@ -106,12 +104,12 @@ jobs:
uses: helm/[email protected]
with:
node_image: ${{ matrix.kind-image }}
version: "v0.23.0"
version: 'v0.23.0'
cluster_name: kind

- name: Install FE
# this is used for cypress tests which are not run in every scenario
if: matrix.test-scenario == 'multi-apps' || matrix.test-scenario == 'helm-chart' || matrix.test-scenario == 'fe-synthetic'
if: matrix.test-scenario == 'multi-apps' || matrix.test-scenario == 'helm-chart'
run: |
cd frontend/webapp
yarn install
Expand Down
152 changes: 69 additions & 83 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,84 +1,70 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Remote Odiglet",
"type": "go",
"request": "attach",
"mode": "remote",
"debugAdapter": "legacy",
"port": 2345,
"host": "127.0.0.1",
"remotePath": ""
},
{
"name": "instrumentor local",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/instrumentor",
"cwd": "${workspaceFolder}/instrumentor",
"env": {
"LOCAL_MUTATING_WEBHOOK_CERT_DIR": "${workspaceFolder}/serving-certs"
}
},
{
"name": "frontend",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/frontend",
"cwd": "${workspaceFolder}/frontend",
"args": ["--port", "8085", "--address", "0.0.0.0"]
},
{
"name": "autoscaler local",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/autoscaler",
"cwd": "${workspaceFolder}/autoscaler",
"env": {
"ODIGOS_VERSION": "v1.0.90"
}
},
{
"name": "scheduler local",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/scheduler",
"cwd": "${workspaceFolder}/scheduler"
},
{
"name": "cli uninstall",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/cli",
"cwd": "${workspaceFolder}/cli",
"args": ["uninstall", "--yes"],
"buildFlags": "-tags=embed_manifests"
},
{
"name": "cli install",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/cli",
"cwd": "${workspaceFolder}/cli",
"args": ["install"],
"buildFlags": "-tags=embed_manifests"
},
{
"name": "cli describe",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/cli",
"cwd": "${workspaceFolder}/cli",
"args": ["describe source deployment membership"],
"buildFlags": "-tags=embed_manifests"
}
]
}
"version": "0.2.0",
"configurations": [
{
"name": "Remote Odiglet",
"type": "go",
"request": "attach",
"mode": "remote",
"debugAdapter": "legacy",
"port": 2345,
"host": "127.0.0.1",
"remotePath": ""
},
{
"name": "instrumentor local",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/instrumentor",
"cwd": "${workspaceFolder}/instrumentor"
},
{
"name": "frontend",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/frontend",
"cwd": "${workspaceFolder}/frontend",
"args": ["--port", "8085", "--address", "0.0.0.0"]
},
{
"name": "gql-playground",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/frontend/main.go",
"cwd": "${workspaceFolder}/frontend"
},
{
"name": "autoscaler local",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/autoscaler",
"cwd": "${workspaceFolder}/autoscaler",
"env": {
"ODIGOS_VERSION": "v1.0.90"
}
},
{
"name": "scheduler local",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/scheduler",
"cwd": "${workspaceFolder}/scheduler"
},
{
"name": "cli uninstall",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/cli",
"cwd": "${workspaceFolder}/cli",
"args": ["uninstall", "--yes"],
"buildFlags": "-tags=embed_manifests"
}
]
}

4 changes: 4 additions & 0 deletions cli/cmd/resources/ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,10 @@ func NewUIService(ns string) *corev1.Service {
Name: "ui",
Port: 3000,
},
{
Name: "beta-ui",
Port: 3001,
},
{
Name: "otlp",
Port: consts.OTLPPort,
Expand Down
Loading

0 comments on commit 44be3a8

Please sign in to comment.