Skip to content

Commit

Permalink
fix: remove the otel collector sidecar
Browse files Browse the repository at this point in the history
  • Loading branch information
rnishtala-sumo committed Oct 10, 2024
1 parent 9f74e12 commit bad81c7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 70 deletions.
48 changes: 4 additions & 44 deletions .github/workflows/dev_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ jobs:
- name: Login to Docker Hub
uses: docker/[email protected]
with:
username: ${{ secrets.DOCKERHUB_LOGIN_TAILING_SIDECAR_DEV }}
password: ${{ secrets.DOCKERHUB_PASSWORD_TAILING_SIDECAR_DEV }}
username: ${{ secrets.DOCKERHUB_LOGIN_TAILING_SIDECAR_OTEL_DEV }}
password: ${{ secrets.DOCKERHUB_PASSWORD_TAILING_SIDECAR_OTEL_DEV }}
- name: Build and push tailing sidecar multiplatform image
run: make build-push-multiplatform TAG=${{ env.SIDECAR_IMAGE_DOCKERHUB }}:${{ steps.extract_tag.outputs.tag }}
working-directory: ./sidecar/fluentbit
Expand All @@ -88,46 +88,6 @@ jobs:
run: make build-push-ubi VERSION=${{ env.LATEST_TAG }} TAG=${{ env.SIDECAR_IMAGE_DOCKERHUB }}:${{ env.LATEST_TAG }}
working-directory: ./sidecar/fluentbit

build-otelcol-sidecar:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
with:
filter: tree:0
fetch-depth: 0
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: '1.22'
cache-dependency-path: |
sidecar/otelcol/.otelcol-builder.yaml
sidecar/otelcol/.goreleaser.yaml
- name: Set up QEMU
uses: docker/[email protected]
- name: Set up Docker Buildx
uses: docker/[email protected]
- name: Login to GitHub Container Registry
uses: docker/[email protected]
with:
registry: ghcr.io
username: USERNAME
password: ${{ secrets.CR_PAT }}
- name: Log in to AWS Public ECR
run: make login-ecr
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID_TAILING_SIDECAR_OTEL_DEV }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY_TAILING_SIDECAR_OTEL_DEV }}
- name: Login to Docker Hub
uses: docker/[email protected]
with:
username: ${{ secrets.DOCKERHUB_LOGIN_TAILING_SIDECAR_OTEL_DEV }}
password: ${{ secrets.DOCKERHUB_PASSWORD_TAILING_SIDECAR_OTEL_DEV }}
- name: Build and push otelcol sidecar image
run: |
make install-builder
make release-dev
working-directory: ./sidecar/otelcol

build-operator:
runs-on: ubuntu-20.04
steps:
Expand Down Expand Up @@ -188,8 +148,8 @@ jobs:
- name: Login to Docker Hub
uses: docker/[email protected]
with:
username: ${{ secrets.DOCKERHUB_LOGIN_TAILING_SIDECAR_OPERATOR_DEV }}
password: ${{ secrets.DOCKERHUB_PASSWORD_TAILING_SIDECAR_OPERATOR_DEV }}
username: ${{ secrets.DOCKERHUB_LOGIN_TAILING_SIDECAR_OTEL_DEV }}
password: ${{ secrets.DOCKERHUB_PASSWORD_TAILING_SIDECAR_OTEL_DEV }}
- name: Build and push tailing sidecar operator multiplatform image
run: make build-push-multiplatform IMG=${{ env.OPERATOR_IMAGE_DOCKERHUB }}:${{ steps.extract_tag.outputs.tag }}
working-directory: ./operator
Expand Down
30 changes: 4 additions & 26 deletions .github/workflows/pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,35 +49,13 @@ jobs:
working-directory: ./operator
run: make manager

build-otelcol-sidecar:
name: Build otelcol sidecar
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v4
- name: Setup go
uses: actions/setup-go@v5
with:
go-version: '1.22'
cache-dependency-path: |
sidecar/otelcol/.otelcol-builder.yaml
sidecar/otelcol/.goreleaser.yaml
- name: Set up QEMU
uses: docker/[email protected]
- name: Set up Docker Buildx
uses: docker/[email protected]
- name: Build otelcol sidecar
working-directory: ./sidecar/otelcol
run: |
make install-builder
make build
test-without-helm:
name: Test resources created without Helm chart
runs-on: ubuntu-20.04
timeout-minutes: 15
strategy:
matrix:
sidecar: [fluentbit, otelcol]
sidecar: [fluentbit]
steps:
- uses: actions/checkout@v4
- name: Setup go
Expand Down Expand Up @@ -108,7 +86,7 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
sidecar: [fluentbit, otelcol]
sidecar: [fluentbit]
steps:
- uses: actions/checkout@v4
- name: Setup go
Expand Down Expand Up @@ -139,7 +117,7 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
sidecar: [fluentbit, otelcol]
sidecar: [fluentbit]
steps:
- uses: actions/checkout@v4
- name: Setup go
Expand Down Expand Up @@ -170,7 +148,7 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
sidecar: [fluentbit, otelcol]
sidecar: [fluentbit]
steps:
- uses: actions/checkout@v4
- name: Setup go
Expand Down

0 comments on commit bad81c7

Please sign in to comment.