Skip to content

Commit

Permalink
Merge pull request #27 from Chinwendu20/workflow
Browse files Browse the repository at this point in the history
updated CI
  • Loading branch information
DelusionalOptimist authored Mar 18, 2024
2 parents 8780674 + 81f2f3b commit 8dacfcd
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-latest-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ env:

jobs:
build:
name: Publish otel-receiver latest Docker image
if: github.repository == 'kubearmor/otel-receiver'
name: Publish otel-adapter latest Docker image
if: github.repository == 'kubearmor/otel-adapter'
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
Expand All @@ -38,4 +38,4 @@ jobs:

- name: Build and push Docker image
run: |
docker buildx build --platform=$PLATFORMS -t=kubearmor/otel-receiver:latest --push .
docker buildx build --platform=$PLATFORMS -t=kubearmor/otel-adapter:latest --push .
6 changes: 3 additions & 3 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ on:

jobs:
build:
name: Build & test otel-receiver
if: github.repository == 'kubearmor/otel-receiver'
name: Build & test otel-adapter
if: github.repository == 'kubearmor/otel-adapter'
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
Expand All @@ -27,7 +27,7 @@ jobs:
with:
go-version: "v1.22"

- name: Build otel-receiver
- name: Build otel-adapter
env:
GO111MODULE: on
CGO_ENABLED: 0
Expand Down
2 changes: 1 addition & 1 deletion example/collector-k8-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: kubearmor-collector
namespace: kubearmor
spec:
image: kubearmor/otel-receiver:latest
image: kubearmor/otel-adapter:latest
imagePullPolicy: Always
config: |
receivers:
Expand Down
6 changes: 3 additions & 3 deletions example/tutorials/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Depending on your deployment mode, you can follow:
```

#### Run pre-built OpenTelemetry collector in K8s
If you want to skip building the collector yourself, deploy the [example manifest](../collector-k8-manifest.yml) which pulls pre-built `kubearmor/otel-receiver` image:
If you want to skip building the collector yourself, deploy the [example manifest](../collector-k8-manifest.yml) which pulls pre-built `kubearmor/otel-adapter` image:
```bash
kubectl apply -f example/collector-k8-manifest.yml
```
Expand Down Expand Up @@ -81,7 +81,7 @@ kubectl delete -f https://github.com/cert-manager/cert-manager/releases/latest/d
#### Run pre-built OpeneTelemetry collector
If you want to skip building the example collector yourselves, you can use the pre-built one with:
```bash
docker run -d --net=host --name=kubearmor-otel-receiver kubearmor/otel-receiver
docker run -d --net=host --name=kubearmor-otel-adapter kubearmor/otel-adapter
```
#### Build a custom OpenTelemetry collector distribution.
Expand Down Expand Up @@ -119,7 +119,7 @@ Examine the logs to see that it is properly running.
#### Cleanup
```bash
# stop and remove the collector container
docker stop kubearmor-otel-receiver; docker rm kubearmor-otel-receiver
docker stop kubearmor-otel-adapter; docker rm kubearmor-otel-adapter
```

### Kubearmor receiver config.
Expand Down
4 changes: 2 additions & 2 deletions example/tutorials/tutorial_grafana.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ kubectl delete -f https://github.com/cert-manager/cert-manager/releases/latest/d

Once done with configuration, deploy the KubeArmor OpenTelemetry receiver with your custom configuration by running:
```bash
docker run -d --network=host -v $PWD/example/config.yml:/otelcol-custom/config.yml --name=kubearmor-otel-receiver kubearmor/otel-receiver:latest
docker run -d --network=host -v $PWD/example/config.yml:/otelcol-custom/config.yml --name=kubearmor-otel-adapter kubearmor/otel-adapter:latest
```

3. Refer to the example [Grafana dashboard](../grafana_dashboard.json) and follow [this tutorial](https://grafana.com/docs/grafana/latest/dashboards/manage-dashboards/#import-a-dashboard) to import the Grafana dashboard JSON to your instance.
Expand All @@ -145,7 +145,7 @@ kubectl delete -f https://github.com/cert-manager/cert-manager/releases/latest/d
#### Cleanup
To cleanup the demo setup, run:
```bash
docker stop kubearmor-otel-receiver; docker rm kubearmor-otel-receiver
docker stop kubearmor-otel-adapter; docker rm kubearmor-otel-adapter
docker compose -f example/docker-compose.yml down
```

Expand Down

0 comments on commit 8dacfcd

Please sign in to comment.