Skip to content

Commit

Permalink
Fix UI service and role to support collectors metrics when installed …
Browse files Browse the repository at this point in the history
…via helm (#1510)

This was already added in
odigos-io/odigos-charts#113.
However, during this time and the refactoring and migration to the new
helm repo, this change was reverted and caused #1496.
Added an assertion for the UI service in e2e tests.
  • Loading branch information
RonFed authored Sep 16, 2024
1 parent 1532011 commit 7d73b0b
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 1 deletion.
8 changes: 8 additions & 0 deletions helm/odigos/templates/ui/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@ rules:
- patch
- update
- watch
- apiGroups:
- ""
resources:
- pods
verbs:
- get
- list
- watch
2 changes: 2 additions & 0 deletions helm/odigos/templates/ui/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@ spec:
ports:
- name: ui
port: 3000
- name: otlp
port: 4317
selector:
app: odigos-ui
3 changes: 2 additions & 1 deletion tests/e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ brew install jq
```
- Odigos cli compiled at `cli` folder. Compile via:
```bash
go build -tags=embed_manifests -o ./cli/odigos ./cli
cd cli; go build -tags=embed_manifests -o odigos .
```
Go back to the root folder of the project.
- Odigos images tagged with `e2e-test` preloaded to the cluster. If you are using Kind you can run:
```bash
TAG=e2e-test make build-images load-to-kind
Expand Down
18 changes: 18 additions & 0 deletions tests/e2e/helm-chart/assert-odigos-installed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,24 @@ status:
started: true
---
apiVersion: v1
kind: Service
metadata:
name: ui
namespace: odigos-test-ns
spec:
ports:
- name: ui
port: 3000
protocol: TCP
targetPort: 3000
- name: otlp
port: 4317
protocol: TCP
targetPort: 4317
selector:
app: odigos-ui
---
apiVersion: v1
kind: ConfigMap
metadata:
labels:
Expand Down
18 changes: 18 additions & 0 deletions tests/e2e/multi-apps/assert-odigos-installed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,24 @@ status:
started: true
---
apiVersion: v1
kind: Service
metadata:
name: ui
namespace: odigos-system
spec:
ports:
- name: ui
port: 3000
protocol: TCP
targetPort: 3000
- name: otlp
port: 4317
protocol: TCP
targetPort: 4317
selector:
app: odigos-ui
---
apiVersion: v1
kind: ConfigMap
metadata:
labels:
Expand Down

0 comments on commit 7d73b0b

Please sign in to comment.