Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dummy draft PR, Please ignore] Test versioning issue 0.108 #1724

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

[Dummy draft PR, Please ignore] Test versioning issue 0.108 #1724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd3007e
fix(ci): use correct artifact path
amdprophet Dec 6, 2024
82d0409
fix(ci): fetch non-fips artifacts too
amdprophet Dec 6, 2024
2667da3
Merge branch 'main' into fix-docker-releases
amdprophet Dec 11, 2024
bcd6f78
Update extension.go
jagan2221 Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions .github/workflows/releases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Publish release'
name: "Publish release"

run-name: >
${{ format('Publish Release for Workflow: {0}', inputs.workflow_id) }}
Expand Down Expand Up @@ -112,22 +112,30 @@ jobs:
- name: Download platform otelcol-sumo artifacts from workflow
uses: actions/download-artifact@v4
with:
pattern: otelcol-sumo-*-${{ matrix.arch_os }}
pattern: otelcol-sumo-${{ matrix.arch_os }}
path: artifacts/
github-token: ${{ secrets.GITHUB_TOKEN }}
run-id: ${{ inputs.workflow_id }}

- name: Download platform fips otelcol-sumo artifacts from workflow
uses: actions/download-artifact@v4
with:
pattern: otelcol-sumo-fips-${{ matrix.arch_os }}
path: artifacts/
github-token: ${{ secrets.GITHUB_TOKEN }}
run-id: ${{ inputs.workflow_id }}

- name: Build and push FIPS image to Open Source ECR
run: |
cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
make build-push-container-multiplatform \
BUILD_TAG=${{ needs.get-version.outputs.version }} \
PLATFORM=${{ matrix.arch_os }} \
BUILD_TYPE_SUFFIX="-fips"

- name: Build and push FIPS image to DockerHub
run: |
cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
make build-push-container-multiplatform \
BUILD_TAG=${{ needs.get-version.outputs.version }} \
PLATFORM=${{ matrix.arch_os }} \
Expand All @@ -136,15 +144,15 @@ jobs:

- name: Build and push UBI-based FIPS image to Open Source ECR
run: |
cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
make build-push-container-ubi \
BUILD_TAG=${{ needs.get-version.outputs.version }} \
PLATFORM=${{ matrix.arch_os }} \
BUILD_TYPE_SUFFIX="-ubi-fips"

- name: Build and push UBI-based FIPS image to DockerHub
run: |
cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
cp artifacts/otelcol-sumo-fips-${{matrix.arch_os}}/otelcol-sumo-fips-${{matrix.arch_os}} otelcol-sumo
make build-push-container-ubi \
BUILD_TAG=${{ needs.get-version.outputs.version }} \
PLATFORM=${{ matrix.arch_os }} \
Expand All @@ -153,30 +161,30 @@ jobs:

- name: Build and push image to Open Source ECR
run: |
cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
make build-push-container-multiplatform \
BUILD_TAG=${{ needs.get-version.outputs.version }} \
PLATFORM=${{ matrix.arch_os }}

- name: Build and push image to DockerHub
run: |
cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
make build-push-container-multiplatform \
BUILD_TAG=${{ needs.get-version.outputs.version }} \
PLATFORM=${{ matrix.arch_os }} \
REPO_URL=sumologic/sumologic-otel-collector

- name: Build and push UBI-based image to Open Source ECR
run: |
cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
make build-push-container-ubi \
BUILD_TAG=${{ needs.get-version.outputs.version }} \
PLATFORM=${{ matrix.arch_os }} \
BUILD_TYPE_SUFFIX="-ubi"

- name: Build and push UBI-based image to DockerHub
run: |
cp artifacts/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
cp artifacts/otelcol-sumo-${{matrix.arch_os}}/otelcol-sumo-${{matrix.arch_os}} otelcol-sumo
make build-push-container-ubi \
BUILD_TAG=${{ needs.get-version.outputs.version }} \
PLATFORM=${{ matrix.arch_os }} \
Expand Down
2 changes: 1 addition & 1 deletion pkg/extension/sumologicextension/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ func (se *SumologicExtension) updateMetadataWithHTTPClient(ctx context.Context,

addJSONHeaders(req)

se.logger.Info("Updating collector metadata",
se.logger.Info("Updating collector metadata-1",
zap.String("URL", u.String()),
zap.String("body", buff.String()))

Expand Down
Loading