From 3dbe7447b357bcbea5e07db23f25660abe4a2329 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 15:08:06 +0300 Subject: [PATCH 01/14] Add build job --- .github/workflows/build.yaml | 76 ++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..1a5c341 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,76 @@ +name: Build + +on: + push: + branches: + - main + release: + types: + - published + pull_request: + branches: + - main + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup Go 1.19 + uses: actions/setup-go@v4 + with: + go-version: '1.19.5' + + - name: Install dependencies + run: | + go get . + go get go.opentelemetry.io/collector/cmd/builder@latest + go get github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@latest + + - name: Cache Go modules + uses: actions/cache@v3 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }} + restore-keys: ${{ runner.os }}-build- + + - name: Get release tag + if: github.event_name == 'release' + run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + + - name: Prepare release + run: builder --config builder-config-console.yaml + + - name: Build Go binary amd64 + run: go build -ldflags "-s -w -X main.GitCommit=$GITHUB_SHA -X main.GitRef=$GITHUB_REF -X main.Version=${RELEASE_TAG:-commit-$GITHUB_SHA}" -o bin/castai-otelcol-receiver-amd64 -C collector-console + env: + GOOS: linux + GOARCH: amd64 + CGO_ENABLED: 0 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + if: ${{ github.event_name == 'pull_request' }} + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push pr + if: ${{ github.event_name == 'pull_request' }} + uses: docker/build-push-action@v2 + with: + context: . + platforms: linux/arm64,linux/amd64 + push: ${{ github.event_name == 'pull_request' }} + tags: ghcr.io/castai/otelcol-receiver:${{ github.sha }} \ No newline at end of file From 23e7e611de09d61719f70e42471e1dfb68e347c4 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 15:10:09 +0300 Subject: [PATCH 02/14] Add build job --- .github/workflows/build.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1a5c341..2a2c045 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -27,9 +27,8 @@ jobs: - name: Install dependencies run: | - go get . - go get go.opentelemetry.io/collector/cmd/builder@latest - go get github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@latest + go install go.opentelemetry.io/collector/cmd/builder@latest + go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@latest - name: Cache Go modules uses: actions/cache@v3 From 04a74a7b0f6eaf37d9072126ea6f1dfec62d2f83 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 15:13:40 +0300 Subject: [PATCH 03/14] Change Go version --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2a2c045..2779d3a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -20,10 +20,10 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Setup Go 1.19 + - name: Setup Go 1.20 uses: actions/setup-go@v4 with: - go-version: '1.19.5' + go-version: '1.20.4' - name: Install dependencies run: | From bf833c19eebb9d6beede64744059993791278161 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 15:26:49 +0300 Subject: [PATCH 04/14] Fix path --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2779d3a..e775d58 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,7 +42,7 @@ jobs: run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - name: Prepare release - run: builder --config builder-config-console.yaml + run: builder --skip-compilation --config builder-config-console.yaml - name: Build Go binary amd64 run: go build -ldflags "-s -w -X main.GitCommit=$GITHUB_SHA -X main.GitRef=$GITHUB_REF -X main.Version=${RELEASE_TAG:-commit-$GITHUB_SHA}" -o bin/castai-otelcol-receiver-amd64 -C collector-console From 1ac96127316399105e5aed3a4f0e3656cafe5015 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 15:29:38 +0300 Subject: [PATCH 05/14] Fix path --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e775d58..a0fb418 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -45,7 +45,7 @@ jobs: run: builder --skip-compilation --config builder-config-console.yaml - name: Build Go binary amd64 - run: go build -ldflags "-s -w -X main.GitCommit=$GITHUB_SHA -X main.GitRef=$GITHUB_REF -X main.Version=${RELEASE_TAG:-commit-$GITHUB_SHA}" -o bin/castai-otelcol-receiver-amd64 -C collector-console + run: cd collector-console && go build -ldflags "-s -w -X main.GitCommit=$GITHUB_SHA -X main.GitRef=$GITHUB_REF -X main.Version=${RELEASE_TAG:-commit-$GITHUB_SHA}" -o bin/castai-otelcol-receiver-amd64 env: GOOS: linux GOARCH: amd64 From 2c85e75003967113c46dd314e97cf1ce83d3c1df Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 15:34:23 +0300 Subject: [PATCH 06/14] Fix path --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a0fb418..af288f8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -45,7 +45,7 @@ jobs: run: builder --skip-compilation --config builder-config-console.yaml - name: Build Go binary amd64 - run: cd collector-console && go build -ldflags "-s -w -X main.GitCommit=$GITHUB_SHA -X main.GitRef=$GITHUB_REF -X main.Version=${RELEASE_TAG:-commit-$GITHUB_SHA}" -o bin/castai-otelcol-receiver-amd64 + run: cd collector-console && go build -ldflags "-s -w -X main.GitCommit=$GITHUB_SHA -X main.GitRef=$GITHUB_REF -X main.Version=${RELEASE_TAG:-commit-$GITHUB_SHA}" -o castai-collector-console env: GOOS: linux GOARCH: amd64 From 5989ae9f3c6d2515481f40794c758b4ddae73a04 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 15:53:58 +0300 Subject: [PATCH 07/14] Fix path --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index af288f8..4fd3c42 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,10 +42,10 @@ jobs: run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - name: Prepare release - run: builder --skip-compilation --config builder-config-console.yaml + run: builder --skip-compilation --config examples/loki/builder-config.yaml - name: Build Go binary amd64 - run: cd collector-console && go build -ldflags "-s -w -X main.GitCommit=$GITHUB_SHA -X main.GitRef=$GITHUB_REF -X main.Version=${RELEASE_TAG:-commit-$GITHUB_SHA}" -o castai-collector-console + run: cd examples/loki/collector-loki/ && go build -ldflags "-s -w -X main.GitCommit=$GITHUB_SHA -X main.GitRef=$GITHUB_REF -X main.Version=${RELEASE_TAG:-commit-$GITHUB_SHA}" -o castai-collector-loki env: GOOS: linux GOARCH: amd64 From f32ae09f443797b3b37e704eb6b18899c703ead5 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 15:59:06 +0300 Subject: [PATCH 08/14] Fix path --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4fd3c42..f01a9c8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -70,6 +70,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . + file: examples/loki/collector-loki/Dockerfile platforms: linux/arm64,linux/amd64 push: ${{ github.event_name == 'pull_request' }} tags: ghcr.io/castai/otelcol-receiver:${{ github.sha }} \ No newline at end of file From 222f046f3bead116a22637efc046ad5556942146 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 16:06:53 +0300 Subject: [PATCH 09/14] Fix path --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f01a9c8..a37c968 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -70,7 +70,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: examples/loki/collector-loki/Dockerfile + file: ./examples/loki/collector-loki/Dockerfile platforms: linux/arm64,linux/amd64 push: ${{ github.event_name == 'pull_request' }} tags: ghcr.io/castai/otelcol-receiver:${{ github.sha }} \ No newline at end of file From 0fb94c22f8ca6627d5d8264104c219031412824a Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 16:11:10 +0300 Subject: [PATCH 10/14] Fix context --- .github/workflows/build.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a37c968..c48c71e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,13 +30,6 @@ jobs: go install go.opentelemetry.io/collector/cmd/builder@latest go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@latest - - name: Cache Go modules - uses: actions/cache@v3 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-build-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-build- - - name: Get release tag if: github.event_name == 'release' run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV @@ -69,7 +62,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} uses: docker/build-push-action@v2 with: - context: . + context: ./examples/loki/collector-loki file: ./examples/loki/collector-loki/Dockerfile platforms: linux/arm64,linux/amd64 push: ${{ github.event_name == 'pull_request' }} From d87af57c2d60d2e7a41ad6c78a2afe564138119a Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 16:14:55 +0300 Subject: [PATCH 11/14] Fix context --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c48c71e..cb6cebc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -63,7 +63,7 @@ jobs: uses: docker/build-push-action@v2 with: context: ./examples/loki/collector-loki - file: ./examples/loki/collector-loki/Dockerfile + file: ./examples/loki/Dockerfile platforms: linux/arm64,linux/amd64 push: ${{ github.event_name == 'pull_request' }} tags: ghcr.io/castai/otelcol-receiver:${{ github.sha }} \ No newline at end of file From 1c4d73a9aa99b375987aa7336bc54354b6b3df57 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 16:25:32 +0300 Subject: [PATCH 12/14] Fix context --- examples/loki/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/loki/Dockerfile b/examples/loki/Dockerfile index d5e2ed3..830f803 100644 --- a/examples/loki/Dockerfile +++ b/examples/loki/Dockerfile @@ -9,8 +9,8 @@ ARG USER_UID=10001 USER ${USER_UID} COPY --from=prep /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY collector-config.yaml /etc/otel/config.yaml -COPY collector-loki/castai-collector-loki / +COPY ./collector-config.yaml /etc/otel/config.yaml +COPY ./collector-loki/castai-collector-loki / EXPOSE 4317 55680 55679 ENTRYPOINT ["/castai-collector-loki"] CMD ["--config", "/etc/otel/config.yaml"] From 885872c908a82d94bcc892b3e480efcb6d0ca9a2 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 16:29:44 +0300 Subject: [PATCH 13/14] Fix context --- examples/loki/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/loki/Dockerfile b/examples/loki/Dockerfile index 830f803..d5e2ed3 100644 --- a/examples/loki/Dockerfile +++ b/examples/loki/Dockerfile @@ -9,8 +9,8 @@ ARG USER_UID=10001 USER ${USER_UID} COPY --from=prep /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY ./collector-config.yaml /etc/otel/config.yaml -COPY ./collector-loki/castai-collector-loki / +COPY collector-config.yaml /etc/otel/config.yaml +COPY collector-loki/castai-collector-loki / EXPOSE 4317 55680 55679 ENTRYPOINT ["/castai-collector-loki"] CMD ["--config", "/etc/otel/config.yaml"] From 038ccee73702a32b89bde76c0b794aa2b01992d2 Mon Sep 17 00:00:00 2001 From: Julius Giriunas Date: Thu, 13 Jul 2023 16:32:41 +0300 Subject: [PATCH 14/14] Fix context --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cb6cebc..5620bbb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -62,7 +62,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} uses: docker/build-push-action@v2 with: - context: ./examples/loki/collector-loki + context: ./examples/loki/ file: ./examples/loki/Dockerfile platforms: linux/arm64,linux/amd64 push: ${{ github.event_name == 'pull_request' }}