From 3ef3d0420b678fe6d48746d453ff7cea1faaa48c Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Thu, 3 Jul 2025 11:24:54 +0200 Subject: [PATCH 01/26] add nightly release setup with pipeline and goreleaser settings update goreleaser config with nightly settings use different token to push nightly tag revert core ci, change to pushing nightly tags prepare otelcol goreleaser setup for testing add new pipeline --- .github/workflows/base-release.yaml | 82 ++++--- .github/workflows/ci-goreleaser-core.yaml | 14 +- .github/workflows/nightly-release.yaml | 42 ++++ .github/workflows/release-core.yaml | 20 +- cmd/goreleaser/internal/configure.go | 41 ++-- .../otelcol-contrib/.goreleaser.yaml | 4 + distributions/otelcol-k8s/.goreleaser.yaml | 4 + distributions/otelcol-otlp/.goreleaser.yaml | 4 + distributions/otelcol/.goreleaser.yaml | 205 +----------------- 9 files changed, 154 insertions(+), 262 deletions(-) create mode 100644 .github/workflows/nightly-release.yaml diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 834f0a384..72f5d6473 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -23,6 +23,8 @@ env: jobs: prepare: + outputs: + GORELEASER_PREVIOUS_TAG: ${{ steps.prev-tag.outputs.GORELEASER_PREVIOUS_TAG }} strategy: matrix: GOOS: ${{ fromJSON(inputs.goos) }} @@ -70,21 +72,38 @@ jobs: go-version: "~1.24" check-latest: true - - name: Generate distribution sources - run: make generate-sources + - name: Set GORELEASER_PREVIOUS_TAG in actual release + id: prev-tag + if: ${{ !contains(github.ref, '-nightly') }} + # find previous tag by filtering out nightly tags and choosing the + # second to last tag (last one is the current release) + run: | + prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) + echo "GORELEASER_PREVIOUS_TAG=$prev_tag" >> "$GITHUB_OUTPUT" - - name: Log into Docker.io - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + - name: Set nightly enabled + id: nightly-check + if: contains(github.ref, '-nightly') + run: | + echo "NIGHTLY_FLAG=--nightly" >> "$GITHUB_OUTPUT" - - name: Login to GitHub Package Registry - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + - name: Generate distribution sources + run: make generate-sources + env: + DISTRIBUTIONS: ${{ inputs.distribution }} + +# - name: Log into Docker.io +# uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 +# with: +# username: ${{ secrets.DOCKER_USERNAME }} +# password: ${{ secrets.DOCKER_PASSWORD }} +# +# - name: Login to GitHub Package Registry +# uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 +# with: +# registry: ghcr.io +# username: ${{ github.repository_owner }} +# password: ${{ secrets.GITHUB_TOKEN }} - name: Create artifacts directory to store build artifacts if: inputs.distribution == 'otelcol-contrib' @@ -99,7 +118,7 @@ jobs: distribution: goreleaser-pro version: ${{ env.GORELEASER_PRO_VERSION }} workdir: distributions/${{ inputs.distribution }} - args: release --clean --split --timeout 2h --config .goreleaser-build.yaml --release-header-tmpl=../../.github/release-template.md + args: release --clean --split --timeout 2h --config .goreleaser-build.yaml --release-header-tmpl=../../.github/release-template.md ${{ steps.nightly-check.outputs.NIGHTLY_FLAG }} env: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} @@ -107,8 +126,9 @@ jobs: GOAMD64: v1 GOPPC64: power8 GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - GITHUB_TOKEN: ${{ secrets.GH_PAT }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true + GORELEASER_CURRENT_TAG: ${{ github.ref_name }} - name: Move built artifacts if: inputs.distribution == 'otelcol-contrib' @@ -125,12 +145,12 @@ jobs: distribution: goreleaser-pro version: ${{ env.GORELEASER_PRO_VERSION }} workdir: distributions/${{ inputs.distribution }} - args: release --clean --split --timeout 2h --release-header-tmpl=../../.github/release-template.md + args: release --clean --split --timeout 2h --release-header-tmpl=../../.github/release-template.md ${{ steps.nightly-check.outputs.NIGHTLY_FLAG }} env: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} GOARM: 7 # Default is 6 - GITHUB_TOKEN: ${{ secrets.GH_PAT }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} @@ -141,7 +161,7 @@ jobs: if-no-files-found: error release: - name: ${{ inputs.distribution }} Release + name: Release runs-on: ${{ inputs.runner_os }} needs: prepare @@ -207,18 +227,18 @@ jobs: shell: bash run: ls -R distributions/${{ inputs.distribution }}/dist - - name: Log into Docker.io - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Login to GitHub Package Registry - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} +# - name: Log into Docker.io +# uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 +# with: +# username: ${{ secrets.DOCKER_USERNAME }} +# password: ${{ secrets.DOCKER_PASSWORD }} +# +# - name: Login to GitHub Package Registry +# uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 +# with: +# registry: ghcr.io +# username: ${{ github.repository_owner }} +# password: ${{ secrets.GITHUB_TOKEN }} - uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0 with: @@ -230,3 +250,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} + GORELEASER_PREVIOUS_TAG: ${{ needs.prepare.outputs.GORELEASER_PREVIOUS_TAG }} + GORELEASER_CURRENT_TAG: ${{ github.ref_name }} diff --git a/.github/workflows/ci-goreleaser-core.yaml b/.github/workflows/ci-goreleaser-core.yaml index 361e2fe90..2527a90fa 100644 --- a/.github/workflows/ci-goreleaser-core.yaml +++ b/.github/workflows/ci-goreleaser-core.yaml @@ -1,7 +1,7 @@ name: CI - Core - GoReleaser on: - merge_group: + merge_group: push: branches: [main] paths: @@ -34,12 +34,12 @@ jobs: secrets: inherit package-tests: - name: Package tests - needs: check-goreleaser - uses: ./.github/workflows/base-package-tests.yaml - with: - distribution: otelcol - type: '[ "deb", "rpm" ]' + name: Package tests + needs: check-goreleaser + uses: ./.github/workflows/base-package-tests.yaml + with: + distribution: otelcol + type: '[ "deb", "rpm" ]' msi-tests: name: MSI tests diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml new file mode 100644 index 000000000..3d35b2d44 --- /dev/null +++ b/.github/workflows/nightly-release.yaml @@ -0,0 +1,42 @@ +name: Nightly Release + +on: + workflow_dispatch: + # schedule + +permissions: + contents: read + +env: + # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro + GORELEASER_PRO_VERSION: v2.7.0 + +jobs: + nightly-release: + name: Nightly Release + runs-on: ubuntu-latest + + permissions: + contents: write + + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + fetch-depth: 0 + token: ${{ secrets.GH_PAT }} + + - name: 'Push new tag' + run: | + git config user.name "${GITHUB_ACTOR}" + git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" + + # A previous release was created using a lightweight tag + # git describe by default includes only annotated tags + # git describe --tags includes lightweight tags as well + DESCRIBE=`git tag -l --sort=-v:refname | grep -v nightly | head -n 1` + MAJOR_VERSION=`echo $DESCRIBE | awk '{split($0,a,"."); print a[1]}'` + MINOR_VERSION=`echo $DESCRIBE | awk '{split($0,a,"."); print a[2]}'` + MINOR_VERSION="$((${MINOR_VERSION} + 1))" + TAG="${MAJOR_VERSION}.${MINOR_VERSION}.0-nightly.$(date +'%Y%m%d%H%M')" + git tag -a $TAG -m "$TAG: nightly build" + git push origin $TAG diff --git a/.github/workflows/release-core.yaml b/.github/workflows/release-core.yaml index 81699906f..d2f77c6ba 100644 --- a/.github/workflows/release-core.yaml +++ b/.github/workflows/release-core.yaml @@ -14,13 +14,13 @@ jobs: goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' secrets: inherit permissions: write-all - release-windows: - name: Release Core (Windows) - uses: ./.github/workflows/base-release.yaml - with: - distribution: otelcol - goos: '[ "windows" ]' - goarch: '[ "386", "amd64" ]' - runner_os: windows-2022 - secrets: inherit - permissions: write-all +# release-windows: +# name: Release Core (Windows) +# uses: ./.github/workflows/base-release.yaml +# with: +# distribution: otelcol +# goos: '[ "windows" ]' +# goarch: '[ "386", "amd64" ]' +# runner_os: windows-2022 +# secrets: inherit +# permissions: write-all diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index 0cfb49d33..1b76b1327 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -35,10 +35,10 @@ const ( k8sDistro = "otelcol-k8s" otlpDistro = "otelcol-otlp" ebpfProfilerDistro = "otelcol-ebpf-profiler" - dockerHub = "otel" - ghcr = "ghcr.io/open-telemetry/opentelemetry-collector-releases" - binaryNamePrefix = "otelcol" - imageNamePrefix = "opentelemetry-collector" + dockerHub = "otel" + ghcr = "ghcr.io/open-telemetry/opentelemetry-collector-releases" + binaryNamePrefix = "otelcol" + imageNamePrefix = "opentelemetry-collector" ) var ( @@ -58,14 +58,8 @@ var ( &fullBuildConfig{targetOS: "darwin", targetArch: darwinArchs}, &fullBuildConfig{targetOS: "windows", targetArch: winArchs}, } - d.containerImages = slices.Concat( - newContainerImages(d.name, "linux", baseArchs, containerImageOptions{armVersion: "7"}), - newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2019"}), - newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2022"}), - ) - d.containerImageManifests = slices.Concat( - newContainerImageManifests(d.name, "linux", baseArchs, containerImageOptions{}), - ) + d.containerImages = nil + d.containerImageManifests = nil }).WithPackagingDefaults().WithDefaultConfigIncluded().Build() // otlp distro @@ -143,7 +137,7 @@ var ( d.containerImageManifests = slices.Concat( newContainerImageManifests(d.name, "linux", k8sArchs, containerImageOptions{}), ) - }).WithDefaultArchives().WithDefaultChecksum().WithDefaultSigns().WithDefaultDockerSigns().WithDefaultSBOMs().Build() + }).WithDefaultArchives().WithDefaultChecksum().WithDefaultSigns().WithDefaultDockerSigns().WithDefaultSBOMs().WithNightlyConfig().Build() // ebpf-profiler distro ebpfProfilerDist = newDistributionBuilder(ebpfProfilerDistro).WithConfigFunc(func(d *distribution) { @@ -315,6 +309,22 @@ func (b *distributionBuilder) dockerSigns() []config.Sign { } } +func (b *distributionBuilder) WithNightlyConfig() *distributionBuilder { + b.configFuncs = append(b.configFuncs, func(d *distribution) { + b.dist.nightly = b.nightly() + }) + return b +} + +func (b *distributionBuilder) nightly() config.Nightly { + return config.Nightly{ + VersionTemplate: "{{ incpatch .Version}}-nightly.{{ .Now.Format \"200601021504\" }}", + TagName: "nightly", + PublishRelease: true, + KeepSingleRelease: false, + } +} + func (b *distributionBuilder) WithDefaultSBOMs() *distributionBuilder { b.configFuncs = append(b.configFuncs, func(d *distribution) { d.sboms = b.sboms() @@ -351,7 +361,8 @@ func (b *distributionBuilder) WithPackagingDefaults() *distributionBuilder { WithDefaultMSIConfig(). WithDefaultSigns(). WithDefaultDockerSigns(). - WithDefaultSBOMs() + WithDefaultSBOMs(). + WithNightlyConfig() } func (b *distributionBuilder) WithConfigFunc(configFunc func(*distribution)) *distributionBuilder { @@ -402,6 +413,7 @@ type distribution struct { signs []config.Sign dockerSigns []config.Sign sboms []config.SBOM + nightly config.Nightly checksum config.Checksum enableCgo bool ldFlags string @@ -447,6 +459,7 @@ func (d *distribution) BuildProject() config.Project { Signs: d.signs, DockerSigns: d.dockerSigns, SBOMs: d.sboms, + Nightly: d.nightly, Version: 2, Monorepo: config.Monorepo{ TagPrefix: "v", diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml index 38381d674..b2401e018 100644 --- a/distributions/otelcol-contrib/.goreleaser.yaml +++ b/distributions/otelcol-contrib/.goreleaser.yaml @@ -329,3 +329,7 @@ monorepo: tag_prefix: v partial: by: target +nightly: + version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' + tag_name: nightly + publish_release: true diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml index 7c59706b7..c20e595e0 100644 --- a/distributions/otelcol-k8s/.goreleaser.yaml +++ b/distributions/otelcol-k8s/.goreleaser.yaml @@ -209,3 +209,7 @@ monorepo: tag_prefix: v partial: by: target +nightly: + version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' + tag_name: nightly + publish_release: true diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml index e38835f1b..a8c1bee18 100644 --- a/distributions/otelcol-otlp/.goreleaser.yaml +++ b/distributions/otelcol-otlp/.goreleaser.yaml @@ -304,3 +304,7 @@ monorepo: tag_prefix: v partial: by: target +nightly: + version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' + tag_name: nightly + publish_release: true diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml index 73e474193..87f535bf1 100644 --- a/distributions/otelcol/.goreleaser.yaml +++ b/distributions/otelcol/.goreleaser.yaml @@ -97,207 +97,6 @@ nfpms: license: Apache 2.0 checksum: name_template: '{{ .ProjectName }}_otelcol_checksums.txt' -dockers: - - goos: linux - goarch: "386" - dockerfile: Dockerfile - image_templates: - - otel/opentelemetry-collector:{{ .Version }}-386 - - otel/opentelemetry-collector:latest-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-386 - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --platform=linux/386 - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - - --label=org.opencontainers.image.licenses=Apache-2.0 - use: buildx - - goos: linux - goarch: amd64 - dockerfile: Dockerfile - image_templates: - - otel/opentelemetry-collector:{{ .Version }}-amd64 - - otel/opentelemetry-collector:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-amd64 - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --platform=linux/amd64 - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - - --label=org.opencontainers.image.licenses=Apache-2.0 - use: buildx - - goos: linux - goarch: arm - goarm: "7" - dockerfile: Dockerfile - image_templates: - - otel/opentelemetry-collector:{{ .Version }}-armv7 - - otel/opentelemetry-collector:latest-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-armv7 - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --platform=linux/arm/v7 - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - - --label=org.opencontainers.image.licenses=Apache-2.0 - use: buildx - - goos: linux - goarch: arm64 - dockerfile: Dockerfile - image_templates: - - otel/opentelemetry-collector:{{ .Version }}-arm64 - - otel/opentelemetry-collector:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm64 - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --platform=linux/arm64 - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - - --label=org.opencontainers.image.licenses=Apache-2.0 - use: buildx - - goos: linux - goarch: ppc64le - dockerfile: Dockerfile - image_templates: - - otel/opentelemetry-collector:{{ .Version }}-ppc64le - - otel/opentelemetry-collector:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-ppc64le - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --platform=linux/ppc64le - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - - --label=org.opencontainers.image.licenses=Apache-2.0 - use: buildx - - goos: linux - goarch: s390x - dockerfile: Dockerfile - image_templates: - - otel/opentelemetry-collector:{{ .Version }}-s390x - - otel/opentelemetry-collector:latest-s390x - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-s390x - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-s390x - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --platform=linux/s390x - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - - --label=org.opencontainers.image.licenses=Apache-2.0 - use: buildx - - goos: windows - goarch: amd64 - dockerfile: Windows.dockerfile - image_templates: - - otel/opentelemetry-collector:{{ .Version }}-windows-2019-amd64 - - otel/opentelemetry-collector:latest-windows-2019-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-windows-2019-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-windows-2019-amd64 - skip_build: '{{ not (eq .Runtime.Goos "windows") }}' - skip_push: '{{ not (eq .Runtime.Goos "windows") }}' - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --build-arg=WIN_VERSION=2019 - - --platform=windows/amd64 - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - - --label=org.opencontainers.image.licenses=Apache-2.0 - use: docker - - goos: windows - goarch: amd64 - dockerfile: Windows.dockerfile - image_templates: - - otel/opentelemetry-collector:{{ .Version }}-windows-2022-amd64 - - otel/opentelemetry-collector:latest-windows-2022-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-windows-2022-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-windows-2022-amd64 - skip_build: '{{ not (eq .Runtime.Goos "windows") }}' - skip_push: '{{ not (eq .Runtime.Goos "windows") }}' - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --build-arg=WIN_VERSION=2022 - - --platform=windows/amd64 - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - - --label=org.opencontainers.image.licenses=Apache-2.0 - use: docker -docker_manifests: - - name_template: otel/opentelemetry-collector:{{ .Version }} - image_templates: - - otel/opentelemetry-collector:{{ .Version }}-386 - - otel/opentelemetry-collector:{{ .Version }}-amd64 - - otel/opentelemetry-collector:{{ .Version }}-armv7 - - otel/opentelemetry-collector:{{ .Version }}-arm64 - - otel/opentelemetry-collector:{{ .Version }}-ppc64le - - otel/opentelemetry-collector:{{ .Version }}-s390x - - name_template: otel/opentelemetry-collector:latest - image_templates: - - otel/opentelemetry-collector:latest-386 - - otel/opentelemetry-collector:latest-amd64 - - otel/opentelemetry-collector:latest-armv7 - - otel/opentelemetry-collector:latest-arm64 - - otel/opentelemetry-collector:latest-ppc64le - - otel/opentelemetry-collector:latest-s390x - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }} - image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-s390x - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest - image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-s390x signs: - cmd: cosign args: @@ -324,3 +123,7 @@ monorepo: tag_prefix: v partial: by: target +nightly: + version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' + tag_name: nightly + publish_release: true From b772ef3f70931679a3a0d872be1f0b662f476a03 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Wed, 16 Jul 2025 11:47:39 +0200 Subject: [PATCH 02/26] revert otelcol dockers --- cmd/goreleaser/internal/configure.go | 10 +- distributions/otelcol/.goreleaser.yaml | 201 +++++++++++++++++++++++++ 2 files changed, 209 insertions(+), 2 deletions(-) diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index 1b76b1327..da99b75a2 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -58,8 +58,14 @@ var ( &fullBuildConfig{targetOS: "darwin", targetArch: darwinArchs}, &fullBuildConfig{targetOS: "windows", targetArch: winArchs}, } - d.containerImages = nil - d.containerImageManifests = nil + d.containerImages = slices.Concat( + newContainerImages(d.name, "linux", baseArchs, containerImageOptions{armVersion: "7"}), + newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2019"}), + newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2022"}), + ) + d.containerImageManifests = slices.Concat( + newContainerImageManifests(d.name, "linux", baseArchs, containerImageOptions{}), + ) }).WithPackagingDefaults().WithDefaultConfigIncluded().Build() // otlp distro diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml index 87f535bf1..f6f4076c1 100644 --- a/distributions/otelcol/.goreleaser.yaml +++ b/distributions/otelcol/.goreleaser.yaml @@ -97,6 +97,207 @@ nfpms: license: Apache 2.0 checksum: name_template: '{{ .ProjectName }}_otelcol_checksums.txt' +dockers: + - goos: linux + goarch: "386" + dockerfile: Dockerfile + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-386 + - otel/opentelemetry-collector:latest-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-386 + extra_files: + - config.yaml + build_flag_templates: + - --pull + - --platform=linux/386 + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + - --label=org.opencontainers.image.licenses=Apache-2.0 + use: buildx + - goos: linux + goarch: amd64 + dockerfile: Dockerfile + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-amd64 + - otel/opentelemetry-collector:latest-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-amd64 + extra_files: + - config.yaml + build_flag_templates: + - --pull + - --platform=linux/amd64 + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + - --label=org.opencontainers.image.licenses=Apache-2.0 + use: buildx + - goos: linux + goarch: arm + goarm: "7" + dockerfile: Dockerfile + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-armv7 + - otel/opentelemetry-collector:latest-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-armv7 + extra_files: + - config.yaml + build_flag_templates: + - --pull + - --platform=linux/arm/v7 + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + - --label=org.opencontainers.image.licenses=Apache-2.0 + use: buildx + - goos: linux + goarch: arm64 + dockerfile: Dockerfile + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-arm64 + - otel/opentelemetry-collector:latest-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm64 + extra_files: + - config.yaml + build_flag_templates: + - --pull + - --platform=linux/arm64 + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + - --label=org.opencontainers.image.licenses=Apache-2.0 + use: buildx + - goos: linux + goarch: ppc64le + dockerfile: Dockerfile + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-ppc64le + - otel/opentelemetry-collector:latest-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-ppc64le + extra_files: + - config.yaml + build_flag_templates: + - --pull + - --platform=linux/ppc64le + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + - --label=org.opencontainers.image.licenses=Apache-2.0 + use: buildx + - goos: linux + goarch: s390x + dockerfile: Dockerfile + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-s390x + - otel/opentelemetry-collector:latest-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-s390x + extra_files: + - config.yaml + build_flag_templates: + - --pull + - --platform=linux/s390x + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + - --label=org.opencontainers.image.licenses=Apache-2.0 + use: buildx + - goos: windows + goarch: amd64 + dockerfile: Windows.dockerfile + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-windows-2019-amd64 + - otel/opentelemetry-collector:latest-windows-2019-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-windows-2019-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-windows-2019-amd64 + skip_build: '{{ not (eq .Runtime.Goos "windows") }}' + skip_push: '{{ not (eq .Runtime.Goos "windows") }}' + extra_files: + - config.yaml + build_flag_templates: + - --pull + - --build-arg=WIN_VERSION=2019 + - --platform=windows/amd64 + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + - --label=org.opencontainers.image.licenses=Apache-2.0 + use: docker + - goos: windows + goarch: amd64 + dockerfile: Windows.dockerfile + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-windows-2022-amd64 + - otel/opentelemetry-collector:latest-windows-2022-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-windows-2022-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-windows-2022-amd64 + skip_build: '{{ not (eq .Runtime.Goos "windows") }}' + skip_push: '{{ not (eq .Runtime.Goos "windows") }}' + extra_files: + - config.yaml + build_flag_templates: + - --pull + - --build-arg=WIN_VERSION=2022 + - --platform=windows/amd64 + - --label=org.opencontainers.image.created={{.Date}} + - --label=org.opencontainers.image.name={{.ProjectName}} + - --label=org.opencontainers.image.revision={{.FullCommit}} + - --label=org.opencontainers.image.version={{.Version}} + - --label=org.opencontainers.image.source={{.GitURL}} + - --label=org.opencontainers.image.licenses=Apache-2.0 + use: docker +docker_manifests: + - name_template: otel/opentelemetry-collector:{{ .Version }} + image_templates: + - otel/opentelemetry-collector:{{ .Version }}-386 + - otel/opentelemetry-collector:{{ .Version }}-amd64 + - otel/opentelemetry-collector:{{ .Version }}-armv7 + - otel/opentelemetry-collector:{{ .Version }}-arm64 + - otel/opentelemetry-collector:{{ .Version }}-ppc64le + - otel/opentelemetry-collector:{{ .Version }}-s390x + - name_template: otel/opentelemetry-collector:latest + image_templates: + - otel/opentelemetry-collector:latest-386 + - otel/opentelemetry-collector:latest-amd64 + - otel/opentelemetry-collector:latest-armv7 + - otel/opentelemetry-collector:latest-arm64 + - otel/opentelemetry-collector:latest-ppc64le + - otel/opentelemetry-collector:latest-s390x + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }} + image_templates: + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-s390x + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest + image_templates: + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-s390x signs: - cmd: cosign args: From 97465d30ad9386bef23320541078a86f945c1d6b Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Wed, 16 Jul 2025 11:32:29 +0200 Subject: [PATCH 03/26] fix pipeline try to move nightly check to distro release pipelines enable otelcol windows re-enable container manifests try disabling image manifests fix env var remove quotes switch to env var for ephermal tag try to exchange latest image tag when building nightly enable container images with personal user only keep a single pre-release add nightly setup to contrib build-only config remove otelcol and otelcol-contrib dockers see if otelcol-contrib works restore otelcol dockers --- .github/workflows/base-release.yaml | 56 ++++---- .github/workflows/release-contrib.yaml | 15 +++ .github/workflows/release-core.yaml | 35 +++-- cmd/goreleaser/internal/configure.go | 13 +- .../otelcol-contrib/.goreleaser-build.yaml | 6 + .../otelcol-contrib/.goreleaser.yaml | 122 +++++++++--------- .../otelcol-ebpf-profiler/.goreleaser.yaml | 25 ++-- distributions/otelcol-k8s/.goreleaser.yaml | 90 ++++++------- distributions/otelcol-otlp/.goreleaser.yaml | 122 +++++++++--------- distributions/otelcol/.goreleaser.yaml | 62 ++++----- 10 files changed, 298 insertions(+), 248 deletions(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 72f5d6473..f9cb0b4eb 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -16,6 +16,10 @@ on: required: false type: string default: ubuntu-24.04 + nightly: + required: false + type: string + default: false env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro @@ -74,7 +78,7 @@ jobs: - name: Set GORELEASER_PREVIOUS_TAG in actual release id: prev-tag - if: ${{ !contains(github.ref, '-nightly') }} + if: inputs.nightly != 'true' # find previous tag by filtering out nightly tags and choosing the # second to last tag (last one is the current release) run: | @@ -83,7 +87,7 @@ jobs: - name: Set nightly enabled id: nightly-check - if: contains(github.ref, '-nightly') + if: inputs.nightly == 'true' run: | echo "NIGHTLY_FLAG=--nightly" >> "$GITHUB_OUTPUT" @@ -92,18 +96,18 @@ jobs: env: DISTRIBUTIONS: ${{ inputs.distribution }} -# - name: Log into Docker.io -# uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 -# with: -# username: ${{ secrets.DOCKER_USERNAME }} -# password: ${{ secrets.DOCKER_PASSWORD }} -# -# - name: Login to GitHub Package Registry -# uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 -# with: -# registry: ghcr.io -# username: ${{ github.repository_owner }} -# password: ${{ secrets.GITHUB_TOKEN }} + - name: Log into Docker.io + uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Login to GitHub Package Registry + uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Create artifacts directory to store build artifacts if: inputs.distribution == 'otelcol-contrib' @@ -227,18 +231,18 @@ jobs: shell: bash run: ls -R distributions/${{ inputs.distribution }}/dist -# - name: Log into Docker.io -# uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 -# with: -# username: ${{ secrets.DOCKER_USERNAME }} -# password: ${{ secrets.DOCKER_PASSWORD }} -# -# - name: Login to GitHub Package Registry -# uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 -# with: -# registry: ghcr.io -# username: ${{ github.repository_owner }} -# password: ${{ secrets.GITHUB_TOKEN }} + - name: Log into Docker.io + uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Login to GitHub Package Registry + uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0 with: diff --git a/.github/workflows/release-contrib.yaml b/.github/workflows/release-contrib.yaml index a0eb233fe..d87375cfa 100644 --- a/.github/workflows/release-contrib.yaml +++ b/.github/workflows/release-contrib.yaml @@ -5,17 +5,32 @@ on: tags: ["v*"] jobs: + prepare: + name: Prepare + runs-on: ubuntu-latest + outputs: + NIGHTLY: ${{ steps.nightly-check.outputs.NIGHTLY }} + steps: + - name: Set nightly enabled + id: nightly-check + if: contains(github.ref, '-nightly') + run: | + echo "NIGHTLY=true" >> "$GITHUB_OUTPUT" release: name: Release Contrib + needs: [prepare] uses: ./.github/workflows/base-release.yaml with: distribution: otelcol-contrib goos: '[ "linux", "darwin" ]' goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' + nightly: ${{ needs.prepare.outputs.NIGHTLY }} secrets: inherit permissions: write-all release-windows: name: Release Contrib (Windows) + needs: [prepare] + if: needs.prepare.outputs.NIGHTLY != 'true' uses: ./.github/workflows/base-release.yaml with: distribution: otelcol-contrib diff --git a/.github/workflows/release-core.yaml b/.github/workflows/release-core.yaml index d2f77c6ba..222a3e358 100644 --- a/.github/workflows/release-core.yaml +++ b/.github/workflows/release-core.yaml @@ -5,22 +5,37 @@ on: tags: ["v*"] jobs: + prepare: + name: Prepare + runs-on: ubuntu-latest + outputs: + NIGHTLY: ${{ steps.nightly-check.outputs.NIGHTLY }} + steps: + - name: Set nightly enabled + id: nightly-check + if: contains(github.ref, '-nightly') + run: | + echo "NIGHTLY=true" >> "$GITHUB_OUTPUT" release: name: Release Core + needs: [prepare] uses: ./.github/workflows/base-release.yaml with: distribution: otelcol goos: '[ "linux", "darwin" ]' goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' + nightly: ${{ needs.prepare.outputs.NIGHTLY }} + secrets: inherit + permissions: write-all + release-windows: + name: Release Core (Windows) + needs: [prepare] + if: needs.prepare.outputs.NIGHTLY != 'true' + uses: ./.github/workflows/base-release.yaml + with: + distribution: otelcol + goos: '[ "windows" ]' + goarch: '[ "386", "amd64" ]' + runner_os: windows-2022 secrets: inherit permissions: write-all -# release-windows: -# name: Release Core (Windows) -# uses: ./.github/workflows/base-release.yaml -# with: -# distribution: otelcol -# goos: '[ "windows" ]' -# goarch: '[ "386", "amd64" ]' -# runner_os: windows-2022 -# secrets: inherit -# permissions: write-all diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index da99b75a2..6ddcb265a 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -35,8 +35,8 @@ const ( k8sDistro = "otelcol-k8s" otlpDistro = "otelcol-otlp" ebpfProfilerDistro = "otelcol-ebpf-profiler" - dockerHub = "otel" - ghcr = "ghcr.io/open-telemetry/opentelemetry-collector-releases" + dockerHub = "mowies" + ghcr = "ghcr.io/mowies/opentelemetry-collector-releases" binaryNamePrefix = "otelcol" imageNamePrefix = "opentelemetry-collector" ) @@ -127,7 +127,7 @@ var ( &fullBuildConfig{targetOS: "darwin", targetArch: darwinArchs}, &fullBuildConfig{targetOS: "windows", targetArch: winArchs}, } - }).WithBinArchive().Build() + }).WithBinArchive().WithNightlyConfig().Build() // k8s distro k8sDist = newDistributionBuilder(k8sDistro).WithConfigFunc(func(d *distribution) { @@ -327,7 +327,7 @@ func (b *distributionBuilder) nightly() config.Nightly { VersionTemplate: "{{ incpatch .Version}}-nightly.{{ .Now.Format \"200601021504\" }}", TagName: "nightly", PublishRelease: true, - KeepSingleRelease: false, + KeepSingleRelease: true, } } @@ -441,6 +441,7 @@ func (d *distribution) BuildProject() config.Project { "COSIGN_YES=true", "LD_FLAGS=" + ldFlags, "BUILD_FLAGS=-trimpath", + "CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }}", } if d.goTags != "" { env = append(env, "GO_TAGS="+d.goTags) @@ -475,7 +476,7 @@ func (d *distribution) BuildProject() config.Project { } func newContainerImageManifests(dist, os string, archs []string, opts containerImageOptions) []config.DockerManifest { - tags := []string{`{{ .Version }}`, "latest"} + tags := []string{`{{ .Version }}`, "{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}"} if os == "windows" { for i, tag := range tags { tags[i] = fmt.Sprintf("%s-%s-%s", tag, os, opts.winVersion) @@ -570,7 +571,7 @@ func dockerImageWithOS(dist, os, arch string, opts containerImageOptions) config imageTemplates = append( imageTemplates, fmt.Sprintf("%s/%s:{{ .Version }}-%s", prefix, imageName(dist), osArch.imageTag()), - fmt.Sprintf("%s/%s:latest-%s", prefix, imageName(dist), osArch.imageTag()), + fmt.Sprintf("%s/%s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-%s", prefix, imageName(dist), osArch.imageTag()), ) } diff --git a/distributions/otelcol-contrib/.goreleaser-build.yaml b/distributions/otelcol-contrib/.goreleaser-build.yaml index 4202522b0..bef880371 100644 --- a/distributions/otelcol-contrib/.goreleaser-build.yaml +++ b/distributions/otelcol-contrib/.goreleaser-build.yaml @@ -4,6 +4,7 @@ env: - COSIGN_YES=true - LD_FLAGS=-s -w - BUILD_FLAGS=-trimpath + - CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }} - CGO_ENABLED=0 release: replace_existing_artifacts: true @@ -58,3 +59,8 @@ monorepo: tag_prefix: v partial: by: target +nightly: + version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' + tag_name: nightly + publish_release: true + keep_single_release: true diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml index b2401e018..bc71ec643 100644 --- a/distributions/otelcol-contrib/.goreleaser.yaml +++ b/distributions/otelcol-contrib/.goreleaser.yaml @@ -4,6 +4,7 @@ env: - COSIGN_YES=true - LD_FLAGS=-s -w - BUILD_FLAGS=-trimpath + - CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }} - CGO_ENABLED=0 release: replace_existing_artifacts: true @@ -107,10 +108,10 @@ dockers: goarch: "386" dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-contrib:{{ .Version }}-386 - - otel/opentelemetry-collector-contrib:latest-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-386 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 extra_files: - config.yaml build_flag_templates: @@ -127,10 +128,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - otel/opentelemetry-collector-contrib:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 extra_files: - config.yaml build_flag_templates: @@ -148,10 +149,10 @@ dockers: goarm: "7" dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7 - - otel/opentelemetry-collector-contrib:latest-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-armv7 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 extra_files: - config.yaml build_flag_templates: @@ -168,10 +169,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - otel/opentelemetry-collector-contrib:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 extra_files: - config.yaml build_flag_templates: @@ -188,10 +189,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le - - otel/opentelemetry-collector-contrib:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le + - mowies/opentelemetry-collector-contrib:{{ .Version }}-ppc64le + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le extra_files: - config.yaml build_flag_templates: @@ -208,10 +209,10 @@ dockers: goarch: s390x dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x - - otel/opentelemetry-collector-contrib:latest-s390x - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x + - mowies/opentelemetry-collector-contrib:{{ .Version }}-s390x + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x extra_files: - config.yaml build_flag_templates: @@ -228,10 +229,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - otel/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64 - - otel/opentelemetry-collector-contrib:latest-windows-2019-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-windows-2019-amd64 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' extra_files: @@ -251,10 +252,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - otel/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64 - - otel/opentelemetry-collector-contrib:latest-windows-2022-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-windows-2022-amd64 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' extra_files: @@ -271,38 +272,38 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: docker docker_manifests: - - name_template: otel/opentelemetry-collector-contrib:{{ .Version }} + - name_template: mowies/opentelemetry-collector-contrib:{{ .Version }} image_templates: - - otel/opentelemetry-collector-contrib:{{ .Version }}-386 - - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7 - - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le - - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x - - name_template: otel/opentelemetry-collector-contrib:latest + - mowies/opentelemetry-collector-contrib:{{ .Version }}-386 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-armv7 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - mowies/opentelemetry-collector-contrib:{{ .Version }}-ppc64le + - mowies/opentelemetry-collector-contrib:{{ .Version }}-s390x + - name_template: mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - otel/opentelemetry-collector-contrib:latest-386 - - otel/opentelemetry-collector-contrib:latest-amd64 - - otel/opentelemetry-collector-contrib:latest-armv7 - - otel/opentelemetry-collector-contrib:latest-arm64 - - otel/opentelemetry-collector-contrib:latest-ppc64le - - otel/opentelemetry-collector-contrib:latest-s390x - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }} + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x signs: - cmd: cosign args: @@ -333,3 +334,4 @@ nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' tag_name: nightly publish_release: true + keep_single_release: true diff --git a/distributions/otelcol-ebpf-profiler/.goreleaser.yaml b/distributions/otelcol-ebpf-profiler/.goreleaser.yaml index 9c52ec2df..22e22061d 100644 --- a/distributions/otelcol-ebpf-profiler/.goreleaser.yaml +++ b/distributions/otelcol-ebpf-profiler/.goreleaser.yaml @@ -4,6 +4,7 @@ env: - COSIGN_YES=true - LD_FLAGS=-extldflags=-static - BUILD_FLAGS=-trimpath + - CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }} - GO_TAGS=osusergo,netgo release: replace_existing_artifacts: true @@ -31,10 +32,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 - - otel/opentelemetry-collector-ebpf-profiler:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:latest-amd64 + - mowies/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 + - mowies/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -46,18 +47,18 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: buildx docker_manifests: - - name_template: otel/opentelemetry-collector-ebpf-profiler:{{ .Version }} + - name_template: mowies/opentelemetry-collector-ebpf-profiler:{{ .Version }} image_templates: - - otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 - - name_template: otel/opentelemetry-collector-ebpf-profiler:latest + - mowies/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 + - name_template: mowies/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - otel/opentelemetry-collector-ebpf-profiler:latest-amd64 - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }} + - mowies/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:latest + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:latest-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 signs: - cmd: cosign args: diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml index c20e595e0..8b165beb7 100644 --- a/distributions/otelcol-k8s/.goreleaser.yaml +++ b/distributions/otelcol-k8s/.goreleaser.yaml @@ -4,6 +4,7 @@ env: - COSIGN_YES=true - LD_FLAGS=-s -w - BUILD_FLAGS=-trimpath + - CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }} - CGO_ENABLED=0 release: replace_existing_artifacts: true @@ -48,10 +49,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - otel/opentelemetry-collector-k8s:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-amd64 + - mowies/opentelemetry-collector-k8s:{{ .Version }}-amd64 + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -66,10 +67,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-arm64 - - otel/opentelemetry-collector-k8s:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-arm64 + - mowies/opentelemetry-collector-k8s:{{ .Version }}-arm64 + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 build_flag_templates: - --pull - --platform=linux/arm64 @@ -84,10 +85,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - - otel/opentelemetry-collector-k8s:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-ppc64le + - mowies/opentelemetry-collector-k8s:{{ .Version }}-ppc64le + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le build_flag_templates: - --pull - --platform=linux/ppc64le @@ -102,10 +103,10 @@ dockers: goarch: s390x dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-s390x - - otel/opentelemetry-collector-k8s:latest-s390x - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-s390x + - mowies/opentelemetry-collector-k8s:{{ .Version }}-s390x + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x build_flag_templates: - --pull - --platform=linux/s390x @@ -120,10 +121,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64 - - otel/opentelemetry-collector-k8s:latest-windows-2019-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-windows-2019-amd64 + - mowies/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64 + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' build_flag_templates: @@ -141,10 +142,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64 - - otel/opentelemetry-collector-k8s:latest-windows-2022-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-windows-2022-amd64 + - mowies/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64 + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' build_flag_templates: @@ -159,30 +160,30 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: docker docker_manifests: - - name_template: otel/opentelemetry-collector-k8s:{{ .Version }} + - name_template: mowies/opentelemetry-collector-k8s:{{ .Version }} image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - otel/opentelemetry-collector-k8s:{{ .Version }}-arm64 - - otel/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - - otel/opentelemetry-collector-k8s:{{ .Version }}-s390x - - name_template: otel/opentelemetry-collector-k8s:latest + - mowies/opentelemetry-collector-k8s:{{ .Version }}-amd64 + - mowies/opentelemetry-collector-k8s:{{ .Version }}-arm64 + - mowies/opentelemetry-collector-k8s:{{ .Version }}-ppc64le + - mowies/opentelemetry-collector-k8s:{{ .Version }}-s390x + - name_template: mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - otel/opentelemetry-collector-k8s:latest-amd64 - - otel/opentelemetry-collector-k8s:latest-arm64 - - otel/opentelemetry-collector-k8s:latest-ppc64le - - otel/opentelemetry-collector-k8s:latest-s390x - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }} + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-s390x + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x signs: - cmd: cosign args: @@ -213,3 +214,4 @@ nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' tag_name: nightly publish_release: true + keep_single_release: true diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml index a8c1bee18..627da6cc5 100644 --- a/distributions/otelcol-otlp/.goreleaser.yaml +++ b/distributions/otelcol-otlp/.goreleaser.yaml @@ -4,6 +4,7 @@ env: - COSIGN_YES=true - LD_FLAGS=-s -w - BUILD_FLAGS=-trimpath + - CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }} - CGO_ENABLED=0 release: replace_existing_artifacts: true @@ -98,10 +99,10 @@ dockers: goarch: "386" dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-otlp:{{ .Version }}-386 - - otel/opentelemetry-collector-otlp:latest-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-386 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-386 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 build_flag_templates: - --pull - --platform=linux/386 @@ -116,10 +117,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-otlp:{{ .Version }}-amd64 - - otel/opentelemetry-collector-otlp:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-amd64 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-amd64 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -135,10 +136,10 @@ dockers: goarm: "7" dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-otlp:{{ .Version }}-armv7 - - otel/opentelemetry-collector-otlp:latest-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-armv7 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-armv7 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 build_flag_templates: - --pull - --platform=linux/arm/v7 @@ -153,10 +154,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-otlp:{{ .Version }}-arm64 - - otel/opentelemetry-collector-otlp:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-arm64 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-arm64 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 build_flag_templates: - --pull - --platform=linux/arm64 @@ -171,10 +172,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-otlp:{{ .Version }}-ppc64le - - otel/opentelemetry-collector-otlp:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-ppc64le + - mowies/opentelemetry-collector-otlp:{{ .Version }}-ppc64le + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le build_flag_templates: - --pull - --platform=linux/ppc64le @@ -189,10 +190,10 @@ dockers: goarch: s390x dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-otlp:{{ .Version }}-s390x - - otel/opentelemetry-collector-otlp:latest-s390x - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-s390x + - mowies/opentelemetry-collector-otlp:{{ .Version }}-s390x + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x build_flag_templates: - --pull - --platform=linux/s390x @@ -207,10 +208,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - otel/opentelemetry-collector-otlp:{{ .Version }}-windows-2019-amd64 - - otel/opentelemetry-collector-otlp:latest-windows-2019-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-windows-2019-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-windows-2019-amd64 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-windows-2019-amd64 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-windows-2019-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' build_flag_templates: @@ -228,10 +229,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - otel/opentelemetry-collector-otlp:{{ .Version }}-windows-2022-amd64 - - otel/opentelemetry-collector-otlp:latest-windows-2022-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-windows-2022-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-windows-2022-amd64 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-windows-2022-amd64 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-windows-2022-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' build_flag_templates: @@ -246,38 +247,38 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: docker docker_manifests: - - name_template: otel/opentelemetry-collector-otlp:{{ .Version }} + - name_template: mowies/opentelemetry-collector-otlp:{{ .Version }} image_templates: - - otel/opentelemetry-collector-otlp:{{ .Version }}-386 - - otel/opentelemetry-collector-otlp:{{ .Version }}-amd64 - - otel/opentelemetry-collector-otlp:{{ .Version }}-armv7 - - otel/opentelemetry-collector-otlp:{{ .Version }}-arm64 - - otel/opentelemetry-collector-otlp:{{ .Version }}-ppc64le - - otel/opentelemetry-collector-otlp:{{ .Version }}-s390x - - name_template: otel/opentelemetry-collector-otlp:latest + - mowies/opentelemetry-collector-otlp:{{ .Version }}-386 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-amd64 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-armv7 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-arm64 + - mowies/opentelemetry-collector-otlp:{{ .Version }}-ppc64le + - mowies/opentelemetry-collector-otlp:{{ .Version }}-s390x + - name_template: mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - otel/opentelemetry-collector-otlp:latest-386 - - otel/opentelemetry-collector-otlp:latest-amd64 - - otel/opentelemetry-collector-otlp:latest-armv7 - - otel/opentelemetry-collector-otlp:latest-arm64 - - otel/opentelemetry-collector-otlp:latest-ppc64le - - otel/opentelemetry-collector-otlp:latest-s390x - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }} + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-s390x + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x signs: - cmd: cosign args: @@ -308,3 +309,4 @@ nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' tag_name: nightly publish_release: true + keep_single_release: true diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml index f6f4076c1..b20404a96 100644 --- a/distributions/otelcol/.goreleaser.yaml +++ b/distributions/otelcol/.goreleaser.yaml @@ -4,6 +4,7 @@ env: - COSIGN_YES=true - LD_FLAGS=-s -w - BUILD_FLAGS=-trimpath + - CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }} - CGO_ENABLED=0 release: replace_existing_artifacts: true @@ -103,9 +104,9 @@ dockers: dockerfile: Dockerfile image_templates: - otel/opentelemetry-collector:{{ .Version }}-386 - - otel/opentelemetry-collector:latest-386 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 extra_files: - config.yaml build_flag_templates: @@ -123,9 +124,9 @@ dockers: dockerfile: Dockerfile image_templates: - otel/opentelemetry-collector:{{ .Version }}-amd64 - - otel/opentelemetry-collector:latest-amd64 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 extra_files: - config.yaml build_flag_templates: @@ -144,9 +145,9 @@ dockers: dockerfile: Dockerfile image_templates: - otel/opentelemetry-collector:{{ .Version }}-armv7 - - otel/opentelemetry-collector:latest-armv7 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 extra_files: - config.yaml build_flag_templates: @@ -164,9 +165,9 @@ dockers: dockerfile: Dockerfile image_templates: - otel/opentelemetry-collector:{{ .Version }}-arm64 - - otel/opentelemetry-collector:latest-arm64 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 extra_files: - config.yaml build_flag_templates: @@ -184,9 +185,9 @@ dockers: dockerfile: Dockerfile image_templates: - otel/opentelemetry-collector:{{ .Version }}-ppc64le - - otel/opentelemetry-collector:latest-ppc64le + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le extra_files: - config.yaml build_flag_templates: @@ -204,9 +205,9 @@ dockers: dockerfile: Dockerfile image_templates: - otel/opentelemetry-collector:{{ .Version }}-s390x - - otel/opentelemetry-collector:latest-s390x + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-s390x - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x extra_files: - config.yaml build_flag_templates: @@ -224,9 +225,9 @@ dockers: dockerfile: Windows.dockerfile image_templates: - otel/opentelemetry-collector:{{ .Version }}-windows-2019-amd64 - - otel/opentelemetry-collector:latest-windows-2019-amd64 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-windows-2019-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-windows-2019-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' extra_files: @@ -247,9 +248,9 @@ dockers: dockerfile: Windows.dockerfile image_templates: - otel/opentelemetry-collector:{{ .Version }}-windows-2022-amd64 - - otel/opentelemetry-collector:latest-windows-2022-amd64 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-windows-2022-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-windows-2022-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' extra_files: @@ -274,14 +275,14 @@ docker_manifests: - otel/opentelemetry-collector:{{ .Version }}-arm64 - otel/opentelemetry-collector:{{ .Version }}-ppc64le - otel/opentelemetry-collector:{{ .Version }}-s390x - - name_template: otel/opentelemetry-collector:latest + - name_template: otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - otel/opentelemetry-collector:latest-386 - - otel/opentelemetry-collector:latest-amd64 - - otel/opentelemetry-collector:latest-armv7 - - otel/opentelemetry-collector:latest-arm64 - - otel/opentelemetry-collector:latest-ppc64le - - otel/opentelemetry-collector:latest-s390x + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }} image_templates: - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-386 @@ -290,14 +291,14 @@ docker_manifests: - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-arm64 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-ppc64le - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-s390x - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:latest-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x signs: - cmd: cosign args: @@ -328,3 +329,4 @@ nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' tag_name: nightly publish_release: true + keep_single_release: true From 770e212518a51b20cdc184d4efcaa1b8297f145d Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Thu, 17 Jul 2025 08:33:00 +0200 Subject: [PATCH 04/26] cherry pick fixes? --- cmd/goreleaser/internal/configure.go | 4 +- .../otelcol-contrib/.goreleaser.yaml | 120 +++++++++--------- .../otelcol-ebpf-profiler/.goreleaser.yaml | 24 ++-- distributions/otelcol-k8s/.goreleaser.yaml | 88 ++++++------- distributions/otelcol-otlp/.goreleaser.yaml | 120 +++++++++--------- 5 files changed, 178 insertions(+), 178 deletions(-) diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index 6ddcb265a..b45a2c181 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -35,8 +35,8 @@ const ( k8sDistro = "otelcol-k8s" otlpDistro = "otelcol-otlp" ebpfProfilerDistro = "otelcol-ebpf-profiler" - dockerHub = "mowies" - ghcr = "ghcr.io/mowies/opentelemetry-collector-releases" + dockerHub = "otel" + ghcr = "ghcr.io/open-telemetry/opentelemetry-collector-releases" binaryNamePrefix = "otelcol" imageNamePrefix = "opentelemetry-collector" ) diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml index bc71ec643..9cede9fc0 100644 --- a/distributions/otelcol-contrib/.goreleaser.yaml +++ b/distributions/otelcol-contrib/.goreleaser.yaml @@ -108,10 +108,10 @@ dockers: goarch: "386" dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Version }}-386 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - otel/opentelemetry-collector-contrib:{{ .Version }}-386 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 extra_files: - config.yaml build_flag_templates: @@ -128,10 +128,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 extra_files: - config.yaml build_flag_templates: @@ -149,10 +149,10 @@ dockers: goarm: "7" dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Version }}-armv7 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 extra_files: - config.yaml build_flag_templates: @@ -169,10 +169,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 extra_files: - config.yaml build_flag_templates: @@ -189,10 +189,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Version }}-ppc64le - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le extra_files: - config.yaml build_flag_templates: @@ -209,10 +209,10 @@ dockers: goarch: s390x dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Version }}-s390x - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x extra_files: - config.yaml build_flag_templates: @@ -229,10 +229,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 + - otel/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' extra_files: @@ -252,10 +252,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 + - otel/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' extra_files: @@ -272,38 +272,38 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: docker docker_manifests: - - name_template: mowies/opentelemetry-collector-contrib:{{ .Version }} + - name_template: otel/opentelemetry-collector-contrib:{{ .Version }} image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Version }}-386 - - mowies/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - mowies/opentelemetry-collector-contrib:{{ .Version }}-armv7 - - mowies/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - mowies/opentelemetry-collector-contrib:{{ .Version }}-ppc64le - - mowies/opentelemetry-collector-contrib:{{ .Version }}-s390x - - name_template: mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - otel/opentelemetry-collector-contrib:{{ .Version }}-386 + - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7 + - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le + - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x + - name_template: otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - mowies/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }} + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x signs: - cmd: cosign args: diff --git a/distributions/otelcol-ebpf-profiler/.goreleaser.yaml b/distributions/otelcol-ebpf-profiler/.goreleaser.yaml index 22e22061d..1aaa9a983 100644 --- a/distributions/otelcol-ebpf-profiler/.goreleaser.yaml +++ b/distributions/otelcol-ebpf-profiler/.goreleaser.yaml @@ -32,10 +32,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 - - mowies/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 + - otel/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -47,18 +47,18 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: buildx docker_manifests: - - name_template: mowies/opentelemetry-collector-ebpf-profiler:{{ .Version }} + - name_template: otel/opentelemetry-collector-ebpf-profiler:{{ .Version }} image_templates: - - mowies/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 - - name_template: mowies/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - otel/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 + - name_template: otel/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - mowies/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }} + - otel/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Version }}-amd64 + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-ebpf-profiler:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 signs: - cmd: cosign args: diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml index 8b165beb7..729c285a7 100644 --- a/distributions/otelcol-k8s/.goreleaser.yaml +++ b/distributions/otelcol-k8s/.goreleaser.yaml @@ -49,10 +49,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-k8s:{{ .Version }}-amd64 + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -67,10 +67,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-k8s:{{ .Version }}-arm64 - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-k8s:{{ .Version }}-arm64 + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 build_flag_templates: - --pull - --platform=linux/arm64 @@ -85,10 +85,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-k8s:{{ .Version }}-ppc64le + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le build_flag_templates: - --pull - --platform=linux/ppc64le @@ -103,10 +103,10 @@ dockers: goarch: s390x dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-k8s:{{ .Version }}-s390x - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - otel/opentelemetry-collector-k8s:{{ .Version }}-s390x + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x build_flag_templates: - --pull - --platform=linux/s390x @@ -121,10 +121,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - mowies/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64 - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 + - otel/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64 + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' build_flag_templates: @@ -142,10 +142,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - mowies/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64 - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 + - otel/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64 + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' build_flag_templates: @@ -160,30 +160,30 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: docker docker_manifests: - - name_template: mowies/opentelemetry-collector-k8s:{{ .Version }} + - name_template: otel/opentelemetry-collector-k8s:{{ .Version }} image_templates: - - mowies/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - mowies/opentelemetry-collector-k8s:{{ .Version }}-arm64 - - mowies/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - - mowies/opentelemetry-collector-k8s:{{ .Version }}-s390x - - name_template: mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - otel/opentelemetry-collector-k8s:{{ .Version }}-amd64 + - otel/opentelemetry-collector-k8s:{{ .Version }}-arm64 + - otel/opentelemetry-collector-k8s:{{ .Version }}-ppc64le + - otel/opentelemetry-collector-k8s:{{ .Version }}-s390x + - name_template: otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - mowies/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }} + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x signs: - cmd: cosign args: diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml index 627da6cc5..3b98ae4d4 100644 --- a/distributions/otelcol-otlp/.goreleaser.yaml +++ b/distributions/otelcol-otlp/.goreleaser.yaml @@ -99,10 +99,10 @@ dockers: goarch: "386" dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Version }}-386 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - otel/opentelemetry-collector-otlp:{{ .Version }}-386 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 build_flag_templates: - --pull - --platform=linux/386 @@ -117,10 +117,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Version }}-amd64 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-otlp:{{ .Version }}-amd64 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -136,10 +136,10 @@ dockers: goarm: "7" dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Version }}-armv7 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - otel/opentelemetry-collector-otlp:{{ .Version }}-armv7 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 build_flag_templates: - --pull - --platform=linux/arm/v7 @@ -154,10 +154,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Version }}-arm64 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-otlp:{{ .Version }}-arm64 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 build_flag_templates: - --pull - --platform=linux/arm64 @@ -172,10 +172,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Version }}-ppc64le - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-otlp:{{ .Version }}-ppc64le + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le build_flag_templates: - --pull - --platform=linux/ppc64le @@ -190,10 +190,10 @@ dockers: goarch: s390x dockerfile: Dockerfile image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Version }}-s390x - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - otel/opentelemetry-collector-otlp:{{ .Version }}-s390x + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x build_flag_templates: - --pull - --platform=linux/s390x @@ -208,10 +208,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Version }}-windows-2019-amd64 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-windows-2019-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 + - otel/opentelemetry-collector-otlp:{{ .Version }}-windows-2019-amd64 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-windows-2019-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2019-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' build_flag_templates: @@ -229,10 +229,10 @@ dockers: goarch: amd64 dockerfile: Windows.dockerfile image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Version }}-windows-2022-amd64 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-windows-2022-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 + - otel/opentelemetry-collector-otlp:{{ .Version }}-windows-2022-amd64 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-windows-2022-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2022-amd64 skip_build: '{{ not (eq .Runtime.Goos "windows") }}' skip_push: '{{ not (eq .Runtime.Goos "windows") }}' build_flag_templates: @@ -247,38 +247,38 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: docker docker_manifests: - - name_template: mowies/opentelemetry-collector-otlp:{{ .Version }} + - name_template: otel/opentelemetry-collector-otlp:{{ .Version }} image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Version }}-386 - - mowies/opentelemetry-collector-otlp:{{ .Version }}-amd64 - - mowies/opentelemetry-collector-otlp:{{ .Version }}-armv7 - - mowies/opentelemetry-collector-otlp:{{ .Version }}-arm64 - - mowies/opentelemetry-collector-otlp:{{ .Version }}-ppc64le - - mowies/opentelemetry-collector-otlp:{{ .Version }}-s390x - - name_template: mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - otel/opentelemetry-collector-otlp:{{ .Version }}-386 + - otel/opentelemetry-collector-otlp:{{ .Version }}-amd64 + - otel/opentelemetry-collector-otlp:{{ .Version }}-armv7 + - otel/opentelemetry-collector-otlp:{{ .Version }}-arm64 + - otel/opentelemetry-collector-otlp:{{ .Version }}-ppc64le + - otel/opentelemetry-collector-otlp:{{ .Version }}-s390x + - name_template: otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - mowies/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }} + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-386 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-armv7 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-s390x signs: - cmd: cosign args: From 97c5a1d87ff605b0687ef799da78ea431ec16103 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Thu, 17 Jul 2025 09:03:11 +0200 Subject: [PATCH 05/26] more setup things --- .github/workflows/base-release.yaml | 4 +- .github/workflows/nightly-release.yaml | 3 +- .github/workflows/release-builder.yaml | 42 ++++++++++- .github/workflows/release-contrib.yaml | 17 +---- .github/workflows/release-core.yaml | 17 +---- .github/workflows/release-k8s.yaml | 2 + .../workflows/release-opampsupervisor.yaml | 42 ++++++++++- .github/workflows/release-otlp.yaml | 2 + cmd/builder/.goreleaser.yml | 73 ++++++++++--------- cmd/builder/Dockerfile | 4 +- cmd/goreleaser/internal/configure.go | 31 ++++---- cmd/opampsupervisor/.goreleaser.yml | 70 +++++++++--------- .../otelcol-contrib/.goreleaser-build.yaml | 2 +- 13 files changed, 182 insertions(+), 127 deletions(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index f9cb0b4eb..107a34607 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -122,7 +122,7 @@ jobs: distribution: goreleaser-pro version: ${{ env.GORELEASER_PRO_VERSION }} workdir: distributions/${{ inputs.distribution }} - args: release --clean --split --timeout 2h --config .goreleaser-build.yaml --release-header-tmpl=../../.github/release-template.md ${{ steps.nightly-check.outputs.NIGHTLY_FLAG }} + args: release --clean --split --timeout 2h --verbose --config .goreleaser-build.yaml --release-header-tmpl=../../.github/release-template.md ${{ steps.nightly-check.outputs.NIGHTLY_FLAG }} env: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} @@ -249,7 +249,7 @@ jobs: distribution: goreleaser-pro version: ${{ env.GORELEASER_PRO_VERSION }} workdir: distributions/${{ inputs.distribution }} - args: continue --merge --timeout 2h + args: continue --merge --timeout 2h --verbose env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index 3d35b2d44..f98841e7a 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -2,7 +2,8 @@ name: Nightly Release on: workflow_dispatch: - # schedule + schedule: + - cron: "0 2 * * *" # release nightly at 2AM permissions: contents: read diff --git a/.github/workflows/release-builder.yaml b/.github/workflows/release-builder.yaml index fc33fceba..e257a92ac 100644 --- a/.github/workflows/release-builder.yaml +++ b/.github/workflows/release-builder.yaml @@ -22,23 +22,52 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 + + - name: Set GORELEASER_PREVIOUS_TAG in actual release + id: prev-tag + if: ${{ !contains(github.ref, '-nightly') }} + # find previous tag by filtering out nightly tags and choosing the + # second to last tag (last one is the current release) + # TODO fix this filter to only filter builder tags + run: | + prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) + echo "GORELEASER_PREVIOUS_TAG=$prev_tag" >> "$GITHUB_OUTPUT" + + - name: Set nightly enabled + id: nightly-check + if: ${{ contains(github.ref, '-nightly') }} + run: | + echo "NIGHTLY_FLAG=--nightly" >> "$GITHUB_OUTPUT" + + - name: Set COLLECTOR_REF + id: collector-ref + run: | + if [ '${{ contains(github.ref, '-nightly') }}' == 'true' ]; then + echo "COLLECTOR_REF=main" >> "$GITHUB_OUTPUT" + else + echo "COLLECTOR_TAG=${{ github.ref }}" >> "$GITHUB_OUTPUT" + fi + - name: Push cmd/builder Tag run: | tag="cmd/builder/${{ github.ref_name }}" - message="Releasing ocb binaries for ${{ github.ref_name }}" + message="Releasing ocb binaries for ${{ steps.collector-ref.outputs.COLLECTOR_REF }}" git config user.name "${GITHUB_ACTOR}" git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" git tag -a "${tag}" -m "${message}" - git push origin "${tag}" + git push origin "${tag}" --force-with-lease + - name: Checkout Core Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 repository: "open-telemetry/opentelemetry-collector" - ref: ${{ github.ref_name }} + ref: ${{ steps.collector-ref.outputs.COLLECTOR_REF }} path: ".core" + - name: Copy Dockerfile to Core Repo directory run: cp cmd/builder/Dockerfile .core/cmd/builder/Dockerfile + - uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2 - uses: anchore/sbom-action/download-syft@cee1b8e05ae5b2593a75e197229729eabaa9f8ec # v0.20.2 - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0 @@ -49,25 +78,30 @@ jobs: uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version: "~1.24" + - name: Log into Docker.io uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Login to GitHub Package Registry uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Run GoReleaser uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0 with: distribution: goreleaser-pro version: ${{ env.GORELEASER_PRO_VERSION }} - args: release --clean -f cmd/builder/.goreleaser.yml + args: release --clean -f cmd/builder/.goreleaser.yml ${{ steps.nightly-check.outputs.NIGHTLY_FLAG }} env: GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true SKIP_SIGNS: false + GORELEASER_PREVIOUS_TAG: ${{ steps.prev-tag.outputs.GORELEASER_PREVIOUS_TAG }} + GORELEASER_CURRENT_TAG: ${{ github.ref_name }} diff --git a/.github/workflows/release-contrib.yaml b/.github/workflows/release-contrib.yaml index d87375cfa..bcfe4faf4 100644 --- a/.github/workflows/release-contrib.yaml +++ b/.github/workflows/release-contrib.yaml @@ -5,32 +5,19 @@ on: tags: ["v*"] jobs: - prepare: - name: Prepare - runs-on: ubuntu-latest - outputs: - NIGHTLY: ${{ steps.nightly-check.outputs.NIGHTLY }} - steps: - - name: Set nightly enabled - id: nightly-check - if: contains(github.ref, '-nightly') - run: | - echo "NIGHTLY=true" >> "$GITHUB_OUTPUT" release: name: Release Contrib - needs: [prepare] uses: ./.github/workflows/base-release.yaml with: distribution: otelcol-contrib goos: '[ "linux", "darwin" ]' goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' - nightly: ${{ needs.prepare.outputs.NIGHTLY }} + nightly: ${{ contains(github.ref, '-nightly') }} secrets: inherit permissions: write-all release-windows: name: Release Contrib (Windows) - needs: [prepare] - if: needs.prepare.outputs.NIGHTLY != 'true' + if: ${{ !contains(github.ref, '-nightly') }} uses: ./.github/workflows/base-release.yaml with: distribution: otelcol-contrib diff --git a/.github/workflows/release-core.yaml b/.github/workflows/release-core.yaml index 222a3e358..58f82d4fd 100644 --- a/.github/workflows/release-core.yaml +++ b/.github/workflows/release-core.yaml @@ -5,32 +5,19 @@ on: tags: ["v*"] jobs: - prepare: - name: Prepare - runs-on: ubuntu-latest - outputs: - NIGHTLY: ${{ steps.nightly-check.outputs.NIGHTLY }} - steps: - - name: Set nightly enabled - id: nightly-check - if: contains(github.ref, '-nightly') - run: | - echo "NIGHTLY=true" >> "$GITHUB_OUTPUT" release: name: Release Core - needs: [prepare] uses: ./.github/workflows/base-release.yaml with: distribution: otelcol goos: '[ "linux", "darwin" ]' goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' - nightly: ${{ needs.prepare.outputs.NIGHTLY }} + nightly: ${{ contains(github.ref, '-nightly') }} secrets: inherit permissions: write-all release-windows: name: Release Core (Windows) - needs: [prepare] - if: needs.prepare.outputs.NIGHTLY != 'true' + if: ${{ !contains(github.ref, '-nightly') }} uses: ./.github/workflows/base-release.yaml with: distribution: otelcol diff --git a/.github/workflows/release-k8s.yaml b/.github/workflows/release-k8s.yaml index b26500e5c..2fe3679bb 100644 --- a/.github/workflows/release-k8s.yaml +++ b/.github/workflows/release-k8s.yaml @@ -12,10 +12,12 @@ jobs: distribution: otelcol-k8s goos: '[ "linux" ]' goarch: '[ "amd64", "arm64", "ppc64le", "s390x" ]' + nightly: ${{ contains(github.ref, '-nightly') }} secrets: inherit permissions: write-all release-windows: name: Release k8s (Windows) + if: ${{ !contains(github.ref, '-nightly') }} uses: ./.github/workflows/base-release.yaml with: distribution: otelcol-k8s diff --git a/.github/workflows/release-opampsupervisor.yaml b/.github/workflows/release-opampsupervisor.yaml index 3c8824fa5..fb9497072 100644 --- a/.github/workflows/release-opampsupervisor.yaml +++ b/.github/workflows/release-opampsupervisor.yaml @@ -22,23 +22,52 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 + + - name: Set GORELEASER_PREVIOUS_TAG in actual release + id: prev-tag + if: ${{ !contains(github.ref, '-nightly') }} + # find previous tag by filtering out nightly tags and choosing the + # second to last tag (last one is the current release) + # TODO fix this filter to only filter builder tags + run: | + prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) + echo "GORELEASER_PREVIOUS_TAG=$prev_tag" >> "$GITHUB_OUTPUT" + + - name: Set nightly enabled + id: nightly-check + if: ${{ contains(github.ref, '-nightly') }} + run: | + echo "NIGHTLY_FLAG=--nightly" >> "$GITHUB_OUTPUT" + + - name: Set COLLECTOR_REF + id: collector-ref + run: | + if [ '${{ contains(github.ref, '-nightly') }}' == 'true' ]; then + echo "COLLECTOR_REF=main" >> "$GITHUB_OUTPUT" + else + echo "COLLECTOR_TAG=${{ github.ref }}" >> "$GITHUB_OUTPUT" + fi + - name: Push cmd/opampsupervisor Tag run: | tag="cmd/opampsupervisor/${{ github.ref_name }}" - message="Releasing OpAMP supervisor binaries for ${{ github.ref_name }}" + message="Releasing OpAMP supervisor binaries for ${{ steps.collector-ref.outputs.COLLECTOR_REF }}" git config user.name "${GITHUB_ACTOR}" git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" git tag -a "${tag}" -m "${message}" - git push origin "${tag}" + git push origin "${tag}" --force-with-lease + - name: Checkout Contrib Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 repository: "open-telemetry/opentelemetry-collector-contrib" - ref: ${{ github.ref_name }} + ref: ${{ steps.collector-ref.outputs.COLLECTOR_REF }} path: ".contrib" + - name: Copy Dockerfile to Contrib Repo directory run: cp cmd/opampsupervisor/Dockerfile .contrib/cmd/opampsupervisor/Dockerfile + - uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2 - uses: anchore/sbom-action/download-syft@cee1b8e05ae5b2593a75e197229729eabaa9f8ec # v0.20.2 - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0 @@ -49,25 +78,30 @@ jobs: uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0 with: go-version: "~1.24" + - name: Log into Docker.io uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Login to GitHub Package Registry uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Run GoReleaser uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0 with: distribution: goreleaser-pro version: ${{ env.GORELEASER_PRO_VERSION }} - args: release --clean -f cmd/opampsupervisor/.goreleaser.yml + args: release --clean -f cmd/opampsupervisor/.goreleaser.yml ${{ steps.nightly-check.outputs.NIGHTLY_FLAG }} env: GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true SKIP_SIGNS: false + GORELEASER_PREVIOUS_TAG: ${{ steps.prev-tag.outputs.GORELEASER_PREVIOUS_TAG }} + GORELEASER_CURRENT_TAG: ${{ github.ref_name }} diff --git a/.github/workflows/release-otlp.yaml b/.github/workflows/release-otlp.yaml index df0de7300..88d460d0a 100644 --- a/.github/workflows/release-otlp.yaml +++ b/.github/workflows/release-otlp.yaml @@ -12,10 +12,12 @@ jobs: distribution: otelcol-otlp goos: '[ "linux", "darwin" ]' goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' + nightly: ${{ contains(github.ref, '-nightly') }} secrets: inherit permissions: write-all release-windows: name: Release OTLP (Windows) + if: ${{ !contains(github.ref, '-nightly') }} uses: ./.github/workflows/base-release.yaml with: distribution: otelcol-otlp diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml index 680905dd1..4205c8903 100644 --- a/cmd/builder/.goreleaser.yml +++ b/cmd/builder/.goreleaser.yml @@ -1,7 +1,9 @@ +version: 2 monorepo: tag_prefix: cmd/builder/ dir: .core/cmd/builder -version: 2 +env: + - CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }} builds: - flags: - -trimpath @@ -30,10 +32,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-builder:{{ .Version }}-amd64 - - otel/opentelemetry-collector-builder:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64 +# - mowies/opentelemetry-collector-builder:{{ .Version }}-amd64 +# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -47,10 +49,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-builder:{{ .Version }}-arm64 - - otel/opentelemetry-collector-builder:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64 +# - mowies/opentelemetry-collector-builder:{{ .Version }}-arm64 +# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 build_flag_templates: - --pull - --platform=linux/arm64 @@ -64,10 +66,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le - - otel/opentelemetry-collector-builder:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le +# - mowies/opentelemetry-collector-builder:{{ .Version }}-ppc64le +# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le build_flag_templates: - --pull - --platform=linux/ppc64le @@ -79,31 +81,28 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: buildx docker_manifests: - - name_template: otel/opentelemetry-collector-builder:{{ .Version }} - image_templates: - - otel/opentelemetry-collector-builder:{{ .Version }}-amd64 - - otel/opentelemetry-collector-builder:{{ .Version }}-arm64 - - otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le - - name_template: otel/opentelemetry-collector-builder:latest - image_templates: - - otel/opentelemetry-collector-builder:latest-amd64 - - otel/opentelemetry-collector-builder:latest-arm64 - - otel/opentelemetry-collector-builder:latest-ppc64le - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }} +# - name_template: mowies/opentelemetry-collector-builder:{{ .Version }} +# image_templates: +# - mowies/opentelemetry-collector-builder:{{ .Version }}-amd64 +# - mowies/opentelemetry-collector-builder:{{ .Version }}-arm64 +# - mowies/opentelemetry-collector-builder:{{ .Version }}-ppc64le +# - name_template: mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} +# image_templates: +# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 +# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 +# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le release: make_latest: false - github: - owner: open-telemetry - name: opentelemetry-collector-releases header: | ### Images and binaries for collector distributions here: https://github.com/open-telemetry/opentelemetry-collector-releases/releases/tag/{{ .Tag }} archives: @@ -139,4 +138,8 @@ sboms: artifacts: archive - id: package artifacts: package - +nightly: + version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' + tag_name: nightly-builder + publish_release: true + keep_single_release: true diff --git a/cmd/builder/Dockerfile b/cmd/builder/Dockerfile index 3b25cf3e1..eacbf51cf 100644 --- a/cmd/builder/Dockerfile +++ b/cmd/builder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24-alpine3.20@sha256:9f98e9893fbc798c710f3432baa1e0ac6127799127c3101d2c263c3a954f0abe +FROM ghcr.io/linuxcontainers/alpine:3.20 RUN apk --update add ca-certificates ARG SERVICE_NAME=ocb @@ -11,4 +11,4 @@ USER ${SERVICE_NAME} WORKDIR /home/${SERVICE_NAME} COPY --chmod=755 ocb /usr/local/bin/ocb -ENTRYPOINT [ "ocb" ] \ No newline at end of file +ENTRYPOINT [ "ocb" ] diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index b45a2c181..ef10fa5be 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -49,7 +49,8 @@ var ( k8sArchs = []string{"amd64", "arm64", "ppc64le", "s390x"} ebpfProfilerArchs = []string{"amd64"} - imageRepos = []string{dockerHub, ghcr} + // imageRepos = []string{dockerHub, ghcr} + imageRepos = []string{ghcr} // otelcol (core) distro otelColDist = newDistributionBuilder(coreDistro).WithConfigFunc(func(d *distribution) { @@ -325,7 +326,7 @@ func (b *distributionBuilder) WithNightlyConfig() *distributionBuilder { func (b *distributionBuilder) nightly() config.Nightly { return config.Nightly{ VersionTemplate: "{{ incpatch .Version}}-nightly.{{ .Now.Format \"200601021504\" }}", - TagName: "nightly", + TagName: fmt.Sprintf("nightly-%s", b.dist.name), PublishRelease: true, KeepSingleRelease: true, } @@ -455,19 +456,19 @@ func (d *distribution) BuildProject() config.Project { Release: config.Release{ ReplaceExistingArtifacts: true, }, - Checksum: d.checksum, - Env: env, - Builds: builds, - Archives: d.archives, - MSI: d.msiConfig, - NFPMs: d.nfpms, - Dockers: d.containerImages, - DockerManifests: d.containerImageManifests, - Signs: d.signs, - DockerSigns: d.dockerSigns, - SBOMs: d.sboms, - Nightly: d.nightly, - Version: 2, + Checksum: d.checksum, + Env: env, + Builds: builds, + Archives: d.archives, + MSI: d.msiConfig, + NFPMs: d.nfpms, + Dockers: d.containerImages, + // DockerManifests: d.containerImageManifests, + Signs: d.signs, + DockerSigns: d.dockerSigns, + SBOMs: d.sboms, + Nightly: d.nightly, + Version: 2, Monorepo: config.Monorepo{ TagPrefix: "v", }, diff --git a/cmd/opampsupervisor/.goreleaser.yml b/cmd/opampsupervisor/.goreleaser.yml index c8b06c79e..60bfade23 100644 --- a/cmd/opampsupervisor/.goreleaser.yml +++ b/cmd/opampsupervisor/.goreleaser.yml @@ -2,6 +2,8 @@ monorepo: tag_prefix: cmd/opampsupervisor/ dir: .contrib/cmd/opampsupervisor version: 2 +env: + - CONTAINER_IMAGE_EPHEMERAL_TAG={{ if .IsNightly }}nightly{{ else }}latest{{ end }} builds: - flags: - -trimpath @@ -30,10 +32,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 - - otel/opentelemetry-collector-opampsupervisor:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-amd64 +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -47,10 +49,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 - - otel/opentelemetry-collector-opampsupervisor:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-arm64 +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 build_flag_templates: - --pull - --platform=linux/arm64 @@ -64,10 +66,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: - - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le - - otel/opentelemetry-collector-opampsupervisor:latest-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-ppc64le +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le build_flag_templates: - --pull - --platform=linux/ppc64le @@ -79,31 +81,28 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: buildx docker_manifests: - - name_template: otel/opentelemetry-collector-opampsupervisor:{{ .Version }} +# - name_template: mowies/opentelemetry-collector-opampsupervisor:{{ .Version }} +# image_templates: +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le +# - name_template: mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} +# image_templates: +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 +# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }} image_templates: - - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 - - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 - - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le - - name_template: otel/opentelemetry-collector-opampsupervisor:latest + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le + - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - otel/opentelemetry-collector-opampsupervisor:latest-amd64 - - otel/opentelemetry-collector-opampsupervisor:latest-arm64 - - otel/opentelemetry-collector-opampsupervisor:latest-ppc64le - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }} - image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le - - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest - image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-arm64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-ppc64le + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le release: make_latest: false - github: - owner: open-telemetry - name: opentelemetry-collector-releases header: | ### Release of OpAMP supervisor artifacts archives: @@ -139,4 +138,9 @@ sboms: artifacts: archive - id: package artifacts: package +nightly: + version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' + tag_name: nightly-opamp-supervisor + publish_release: true + keep_single_release: true diff --git a/distributions/otelcol-contrib/.goreleaser-build.yaml b/distributions/otelcol-contrib/.goreleaser-build.yaml index bef880371..5d94a9fce 100644 --- a/distributions/otelcol-contrib/.goreleaser-build.yaml +++ b/distributions/otelcol-contrib/.goreleaser-build.yaml @@ -61,6 +61,6 @@ partial: by: target nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' - tag_name: nightly + tag_name: nightly-otelcol-contrib publish_release: true keep_single_release: true From e7e421b6751aed307dbb6fdce57d2a8942346847 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 22 Jul 2025 13:22:32 +0200 Subject: [PATCH 06/26] revert some debugging changes --- .github/workflows/base-release.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 107a34607..262c1568a 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -81,6 +81,7 @@ jobs: if: inputs.nightly != 'true' # find previous tag by filtering out nightly tags and choosing the # second to last tag (last one is the current release) + # TODO fix this filter to only filter builder tags run: | prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) echo "GORELEASER_PREVIOUS_TAG=$prev_tag" >> "$GITHUB_OUTPUT" @@ -122,7 +123,7 @@ jobs: distribution: goreleaser-pro version: ${{ env.GORELEASER_PRO_VERSION }} workdir: distributions/${{ inputs.distribution }} - args: release --clean --split --timeout 2h --verbose --config .goreleaser-build.yaml --release-header-tmpl=../../.github/release-template.md ${{ steps.nightly-check.outputs.NIGHTLY_FLAG }} + args: release --clean --split --timeout 2h --config .goreleaser-build.yaml --release-header-tmpl=../../.github/release-template.md ${{ steps.nightly-check.outputs.NIGHTLY_FLAG }} env: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} @@ -249,7 +250,7 @@ jobs: distribution: goreleaser-pro version: ${{ env.GORELEASER_PRO_VERSION }} workdir: distributions/${{ inputs.distribution }} - args: continue --merge --timeout 2h --verbose + args: continue --merge --timeout 2h env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true From 46c364b496395046fd395bfaebc4418c0a53db7f Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 22 Jul 2025 13:22:40 +0200 Subject: [PATCH 07/26] revert goreleaser debugging changes --- cmd/goreleaser/internal/configure.go | 29 +++++++++---------- .../otelcol-contrib/.goreleaser.yaml | 2 +- distributions/otelcol-k8s/.goreleaser.yaml | 2 +- distributions/otelcol-otlp/.goreleaser.yaml | 2 +- distributions/otelcol/.goreleaser.yaml | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index ef10fa5be..e338ac182 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -49,8 +49,7 @@ var ( k8sArchs = []string{"amd64", "arm64", "ppc64le", "s390x"} ebpfProfilerArchs = []string{"amd64"} - // imageRepos = []string{dockerHub, ghcr} - imageRepos = []string{ghcr} + imageRepos = []string{dockerHub, ghcr} // otelcol (core) distro otelColDist = newDistributionBuilder(coreDistro).WithConfigFunc(func(d *distribution) { @@ -456,19 +455,19 @@ func (d *distribution) BuildProject() config.Project { Release: config.Release{ ReplaceExistingArtifacts: true, }, - Checksum: d.checksum, - Env: env, - Builds: builds, - Archives: d.archives, - MSI: d.msiConfig, - NFPMs: d.nfpms, - Dockers: d.containerImages, - // DockerManifests: d.containerImageManifests, - Signs: d.signs, - DockerSigns: d.dockerSigns, - SBOMs: d.sboms, - Nightly: d.nightly, - Version: 2, + Checksum: d.checksum, + Env: env, + Builds: builds, + Archives: d.archives, + MSI: d.msiConfig, + NFPMs: d.nfpms, + Dockers: d.containerImages, + DockerManifests: d.containerImageManifests, + Signs: d.signs, + DockerSigns: d.dockerSigns, + SBOMs: d.sboms, + Nightly: d.nightly, + Version: 2, Monorepo: config.Monorepo{ TagPrefix: "v", }, diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml index 9cede9fc0..26c89b117 100644 --- a/distributions/otelcol-contrib/.goreleaser.yaml +++ b/distributions/otelcol-contrib/.goreleaser.yaml @@ -332,6 +332,6 @@ partial: by: target nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' - tag_name: nightly + tag_name: nightly-otelcol-contrib publish_release: true keep_single_release: true diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml index 729c285a7..89c9dda20 100644 --- a/distributions/otelcol-k8s/.goreleaser.yaml +++ b/distributions/otelcol-k8s/.goreleaser.yaml @@ -212,6 +212,6 @@ partial: by: target nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' - tag_name: nightly + tag_name: nightly-otelcol-k8s publish_release: true keep_single_release: true diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml index 3b98ae4d4..68701a836 100644 --- a/distributions/otelcol-otlp/.goreleaser.yaml +++ b/distributions/otelcol-otlp/.goreleaser.yaml @@ -307,6 +307,6 @@ partial: by: target nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' - tag_name: nightly + tag_name: nightly-otelcol-otlp publish_release: true keep_single_release: true diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml index b20404a96..db5b557a2 100644 --- a/distributions/otelcol/.goreleaser.yaml +++ b/distributions/otelcol/.goreleaser.yaml @@ -327,6 +327,6 @@ partial: by: target nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' - tag_name: nightly + tag_name: nightly-otelcol publish_release: true keep_single_release: true From 680618b4fbb3bb2f769e07b2274f581d9347e246 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 22 Jul 2025 13:27:12 +0200 Subject: [PATCH 08/26] revert debugging changes for builder and opamp --- cmd/builder/.goreleaser.yml | 60 ++++++++++++++--------------- cmd/opampsupervisor/.goreleaser.yml | 60 ++++++++++++++--------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml index 4205c8903..7ef0c7954 100644 --- a/cmd/builder/.goreleaser.yml +++ b/cmd/builder/.goreleaser.yml @@ -32,10 +32,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: -# - mowies/opentelemetry-collector-builder:{{ .Version }}-amd64 -# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-builder:{{ .Version }}-amd64 + - otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -49,10 +49,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: -# - mowies/opentelemetry-collector-builder:{{ .Version }}-arm64 -# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-builder:{{ .Version }}-arm64 + - otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 build_flag_templates: - --pull - --platform=linux/arm64 @@ -66,10 +66,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: -# - mowies/opentelemetry-collector-builder:{{ .Version }}-ppc64le -# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le + - otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le build_flag_templates: - --pull - --platform=linux/ppc64le @@ -81,26 +81,26 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: buildx docker_manifests: -# - name_template: mowies/opentelemetry-collector-builder:{{ .Version }} -# image_templates: -# - mowies/opentelemetry-collector-builder:{{ .Version }}-amd64 -# - mowies/opentelemetry-collector-builder:{{ .Version }}-arm64 -# - mowies/opentelemetry-collector-builder:{{ .Version }}-ppc64le -# - name_template: mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} -# image_templates: -# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 -# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 -# - mowies/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }} + - name_template: otel/opentelemetry-collector-builder:{{ .Version }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - otel/opentelemetry-collector-builder:{{ .Version }}-amd64 + - otel/opentelemetry-collector-builder:{{ .Version }}-arm64 + - otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le + - name_template: otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }} + image_templates: + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + image_templates: + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le release: make_latest: false header: | diff --git a/cmd/opampsupervisor/.goreleaser.yml b/cmd/opampsupervisor/.goreleaser.yml index 60bfade23..31c66d7ed 100644 --- a/cmd/opampsupervisor/.goreleaser.yml +++ b/cmd/opampsupervisor/.goreleaser.yml @@ -32,10 +32,10 @@ dockers: goarch: amd64 dockerfile: Dockerfile image_templates: -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 + - otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 build_flag_templates: - --pull - --platform=linux/amd64 @@ -49,10 +49,10 @@ dockers: goarch: arm64 dockerfile: Dockerfile image_templates: -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 + - otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 build_flag_templates: - --pull - --platform=linux/arm64 @@ -66,10 +66,10 @@ dockers: goarch: ppc64le dockerfile: Dockerfile image_templates: -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le + - otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le build_flag_templates: - --pull - --platform=linux/ppc64le @@ -81,26 +81,26 @@ dockers: - --label=org.opencontainers.image.licenses=Apache-2.0 use: buildx docker_manifests: -# - name_template: mowies/opentelemetry-collector-opampsupervisor:{{ .Version }} -# image_templates: -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le -# - name_template: mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} -# image_templates: -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 -# - mowies/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }} + - name_template: otel/opentelemetry-collector-opampsupervisor:{{ .Version }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le - - name_template: ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 + - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 + - otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le + - name_template: otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} image_templates: - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 - - ghcr.io/mowies/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - otel/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }} + image_templates: + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le + - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }} + image_templates: + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-amd64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-arm64 + - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-ppc64le release: make_latest: false header: | From ee1450472e26ab8c79e3cd46b9d8132b954269ea Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 22 Jul 2025 13:36:03 +0200 Subject: [PATCH 09/26] revert debugging changes in dockerfiles --- cmd/builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/builder/Dockerfile b/cmd/builder/Dockerfile index eacbf51cf..25b5fe6ed 100644 --- a/cmd/builder/Dockerfile +++ b/cmd/builder/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxcontainers/alpine:3.20 +FROM golang:1.24-alpine3.20@sha256:9f98e9893fbc798c710f3432baa1e0ac6127799127c3101d2c263c3a954f0abe RUN apk --update add ca-certificates ARG SERVICE_NAME=ocb From 0f319c4d1641f6adafdfb46a0776659759aee422 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Wed, 23 Jul 2025 08:36:56 +0200 Subject: [PATCH 10/26] remove force pushes --- .github/workflows/release-builder.yaml | 2 +- .github/workflows/release-opampsupervisor.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-builder.yaml b/.github/workflows/release-builder.yaml index e257a92ac..b4e89fb00 100644 --- a/.github/workflows/release-builder.yaml +++ b/.github/workflows/release-builder.yaml @@ -55,7 +55,7 @@ jobs: git config user.name "${GITHUB_ACTOR}" git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" git tag -a "${tag}" -m "${message}" - git push origin "${tag}" --force-with-lease + git push origin "${tag}" - name: Checkout Core Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/release-opampsupervisor.yaml b/.github/workflows/release-opampsupervisor.yaml index fb9497072..f785ea335 100644 --- a/.github/workflows/release-opampsupervisor.yaml +++ b/.github/workflows/release-opampsupervisor.yaml @@ -55,7 +55,7 @@ jobs: git config user.name "${GITHUB_ACTOR}" git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" git tag -a "${tag}" -m "${message}" - git push origin "${tag}" --force-with-lease + git push origin "${tag}" - name: Checkout Contrib Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 From abe369f3ca52b7e4fa241ed3cd38ece2fcd17f43 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Thu, 24 Jul 2025 08:14:00 +0200 Subject: [PATCH 11/26] rename GORELEASER_PREVIOUS_TAG --- .github/workflows/base-release.yaml | 8 ++++---- .github/workflows/release-builder.yaml | 6 +++--- .github/workflows/release-opampsupervisor.yaml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 6e58aee0a..2840d3bab 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -28,7 +28,7 @@ env: jobs: prepare: outputs: - GORELEASER_PREVIOUS_TAG: ${{ steps.prev-tag.outputs.GORELEASER_PREVIOUS_TAG }} + PREVIOUS_RELEASE_TAG: ${{ steps.prev-tag.outputs.PREVIOUS_RELEASE_TAG }} strategy: matrix: GOOS: ${{ fromJSON(inputs.goos) }} @@ -76,7 +76,7 @@ jobs: go-version: "~1.24" check-latest: true - - name: Set GORELEASER_PREVIOUS_TAG in actual release + - name: Set goreleaser last tag reference in case of non-nightly release id: prev-tag if: inputs.nightly != 'true' # find previous tag by filtering out nightly tags and choosing the @@ -84,7 +84,7 @@ jobs: # TODO fix this filter to only filter builder tags run: | prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) - echo "GORELEASER_PREVIOUS_TAG=$prev_tag" >> "$GITHUB_OUTPUT" + echo "PREVIOUS_RELEASE_TAG=$prev_tag" >> "$GITHUB_OUTPUT" - name: Set nightly enabled id: nightly-check @@ -255,5 +255,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - GORELEASER_PREVIOUS_TAG: ${{ needs.prepare.outputs.GORELEASER_PREVIOUS_TAG }} + GORELEASER_PREVIOUS_TAG: ${{ needs.prepare.outputs.PREVIOUS_RELEASE_TAG }} GORELEASER_CURRENT_TAG: ${{ github.ref_name }} diff --git a/.github/workflows/release-builder.yaml b/.github/workflows/release-builder.yaml index 44bf44826..f33e4300b 100644 --- a/.github/workflows/release-builder.yaml +++ b/.github/workflows/release-builder.yaml @@ -23,7 +23,7 @@ jobs: with: fetch-depth: 0 - - name: Set GORELEASER_PREVIOUS_TAG in actual release + - name: Set goreleaser last tag reference in case of non-nightly release id: prev-tag if: ${{ !contains(github.ref, '-nightly') }} # find previous tag by filtering out nightly tags and choosing the @@ -31,7 +31,7 @@ jobs: # TODO fix this filter to only filter builder tags run: | prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) - echo "GORELEASER_PREVIOUS_TAG=$prev_tag" >> "$GITHUB_OUTPUT" + echo "PREVIOUS_RELEASE_TAG=$prev_tag" >> "$GITHUB_OUTPUT" - name: Set nightly enabled id: nightly-check @@ -102,5 +102,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true SKIP_SIGNS: false - GORELEASER_PREVIOUS_TAG: ${{ steps.prev-tag.outputs.GORELEASER_PREVIOUS_TAG }} + GORELEASER_PREVIOUS_TAG: ${{ steps.prev-tag.outputs.PREVIOUS_RELEASE_TAG }} GORELEASER_CURRENT_TAG: ${{ github.ref_name }} diff --git a/.github/workflows/release-opampsupervisor.yaml b/.github/workflows/release-opampsupervisor.yaml index b85ae6e06..433f21393 100644 --- a/.github/workflows/release-opampsupervisor.yaml +++ b/.github/workflows/release-opampsupervisor.yaml @@ -23,7 +23,7 @@ jobs: with: fetch-depth: 0 - - name: Set GORELEASER_PREVIOUS_TAG in actual release + - name: Set goreleaser last tag reference in case of non-nightly release id: prev-tag if: ${{ !contains(github.ref, '-nightly') }} # find previous tag by filtering out nightly tags and choosing the @@ -31,7 +31,7 @@ jobs: # TODO fix this filter to only filter builder tags run: | prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) - echo "GORELEASER_PREVIOUS_TAG=$prev_tag" >> "$GITHUB_OUTPUT" + echo "PREVIOUS_RELEASE_TAG=$prev_tag" >> "$GITHUB_OUTPUT" - name: Set nightly enabled id: nightly-check @@ -102,5 +102,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COSIGN_YES: true SKIP_SIGNS: false - GORELEASER_PREVIOUS_TAG: ${{ steps.prev-tag.outputs.GORELEASER_PREVIOUS_TAG }} + GORELEASER_PREVIOUS_TAG: ${{ steps.prev-tag.outputs.PREVIOUS_RELEASE_TAG }} GORELEASER_CURRENT_TAG: ${{ github.ref_name }} From 52bb40d1b980ef50f3c334b5cd1499f1b75b85f1 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 22 Jul 2025 16:51:34 +0200 Subject: [PATCH 12/26] filter tags before taking the right one for all release pipelines --- .github/workflows/base-release.yaml | 3 +-- .github/workflows/nightly-release.yaml | 2 +- .github/workflows/release-builder.yaml | 3 +-- .github/workflows/release-opampsupervisor.yaml | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 2840d3bab..8ca4c7fdc 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -81,9 +81,8 @@ jobs: if: inputs.nightly != 'true' # find previous tag by filtering out nightly tags and choosing the # second to last tag (last one is the current release) - # TODO fix this filter to only filter builder tags run: | - prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) + prev_tag=$(git tag | grep -v "cmd" | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) echo "PREVIOUS_RELEASE_TAG=$prev_tag" >> "$GITHUB_OUTPUT" - name: Set nightly enabled diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index f98841e7a..05d5b1985 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -34,7 +34,7 @@ jobs: # A previous release was created using a lightweight tag # git describe by default includes only annotated tags # git describe --tags includes lightweight tags as well - DESCRIBE=`git tag -l --sort=-v:refname | grep -v nightly | head -n 1` + DESCRIBE=`git tag -l --sort=-v:refname | grep -v cmd | grep -v nightly | head -n 1` MAJOR_VERSION=`echo $DESCRIBE | awk '{split($0,a,"."); print a[1]}'` MINOR_VERSION=`echo $DESCRIBE | awk '{split($0,a,"."); print a[2]}'` MINOR_VERSION="$((${MINOR_VERSION} + 1))" diff --git a/.github/workflows/release-builder.yaml b/.github/workflows/release-builder.yaml index f33e4300b..5a0e36e48 100644 --- a/.github/workflows/release-builder.yaml +++ b/.github/workflows/release-builder.yaml @@ -28,9 +28,8 @@ jobs: if: ${{ !contains(github.ref, '-nightly') }} # find previous tag by filtering out nightly tags and choosing the # second to last tag (last one is the current release) - # TODO fix this filter to only filter builder tags run: | - prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) + prev_tag=$(git tag | grep "cmd/builder" | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) echo "PREVIOUS_RELEASE_TAG=$prev_tag" >> "$GITHUB_OUTPUT" - name: Set nightly enabled diff --git a/.github/workflows/release-opampsupervisor.yaml b/.github/workflows/release-opampsupervisor.yaml index 433f21393..b0cf13141 100644 --- a/.github/workflows/release-opampsupervisor.yaml +++ b/.github/workflows/release-opampsupervisor.yaml @@ -28,9 +28,8 @@ jobs: if: ${{ !contains(github.ref, '-nightly') }} # find previous tag by filtering out nightly tags and choosing the # second to last tag (last one is the current release) - # TODO fix this filter to only filter builder tags run: | - prev_tag=$(git tag | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) + prev_tag=$(git tag | grep "cmd/opampsupervisor" | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) echo "PREVIOUS_RELEASE_TAG=$prev_tag" >> "$GITHUB_OUTPUT" - name: Set nightly enabled From 637a143aa4721eafa8aa8bf3208a2ecf261e6aaf Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Thu, 24 Jul 2025 08:19:57 +0200 Subject: [PATCH 13/26] adjust doc comments --- .github/workflows/base-release.yaml | 2 +- .github/workflows/release-builder.yaml | 2 +- .github/workflows/release-opampsupervisor.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 8ca4c7fdc..e4a0038de 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -79,7 +79,7 @@ jobs: - name: Set goreleaser last tag reference in case of non-nightly release id: prev-tag if: inputs.nightly != 'true' - # find previous tag by filtering out nightly tags and choosing the + # find previous tag by filtering out nightly tags and binary release (OCB, OpAMP) tags and then choosing the # second to last tag (last one is the current release) run: | prev_tag=$(git tag | grep -v "cmd" | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) diff --git a/.github/workflows/release-builder.yaml b/.github/workflows/release-builder.yaml index 5a0e36e48..04b0736f8 100644 --- a/.github/workflows/release-builder.yaml +++ b/.github/workflows/release-builder.yaml @@ -26,7 +26,7 @@ jobs: - name: Set goreleaser last tag reference in case of non-nightly release id: prev-tag if: ${{ !contains(github.ref, '-nightly') }} - # find previous tag by filtering out nightly tags and choosing the + # find previous tag by taking only OCB tags, filtering out nightly tags and then choosing the # second to last tag (last one is the current release) run: | prev_tag=$(git tag | grep "cmd/builder" | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) diff --git a/.github/workflows/release-opampsupervisor.yaml b/.github/workflows/release-opampsupervisor.yaml index b0cf13141..6e0fc5d10 100644 --- a/.github/workflows/release-opampsupervisor.yaml +++ b/.github/workflows/release-opampsupervisor.yaml @@ -26,7 +26,7 @@ jobs: - name: Set goreleaser last tag reference in case of non-nightly release id: prev-tag if: ${{ !contains(github.ref, '-nightly') }} - # find previous tag by filtering out nightly tags and choosing the + # find previous tag by taking only OpAMP supervisor tags, filtering out nightly tags and then choosing the # second to last tag (last one is the current release) run: | prev_tag=$(git tag | grep "cmd/opampsupervisor" | grep -v "nightly" | sort -r --version-sort | head -n 2 | tail -n 1) From c4ef95808fd6c98fc44aaa0d33aa8a481adec20b Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Thu, 24 Jul 2025 09:34:17 +0200 Subject: [PATCH 14/26] add missing newlines --- .github/workflows/release-builder.yaml | 1 + .github/workflows/release-opampsupervisor.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/release-builder.yaml b/.github/workflows/release-builder.yaml index 04b0736f8..6bd7287c5 100644 --- a/.github/workflows/release-builder.yaml +++ b/.github/workflows/release-builder.yaml @@ -83,6 +83,7 @@ jobs: with: username: ${{ vars.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }} + - name: Login to GitHub Package Registry uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 with: diff --git a/.github/workflows/release-opampsupervisor.yaml b/.github/workflows/release-opampsupervisor.yaml index 6e0fc5d10..cd07618b4 100644 --- a/.github/workflows/release-opampsupervisor.yaml +++ b/.github/workflows/release-opampsupervisor.yaml @@ -83,6 +83,7 @@ jobs: with: username: ${{ vars.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN_COLLECTOR_RELEASES }} + - name: Login to GitHub Package Registry uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 with: From 9d010190307457f8aec1b93d548dd3ab5dd20e62 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Mon, 28 Jul 2025 08:22:29 +0200 Subject: [PATCH 15/26] update goreleaser to correct version Co-authored-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> --- .github/workflows/nightly-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index 05d5b1985..0a83eb8a6 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -10,7 +10,7 @@ permissions: env: # renovate: datasource=github-tags depName=goreleaser-pro packageName=goreleaser/goreleaser-pro - GORELEASER_PRO_VERSION: v2.7.0 + GORELEASER_PRO_VERSION: v2.11.0 jobs: nightly-release: From f929a2d4b035ea143b9458be378d22e79f567deb Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Mon, 28 Jul 2025 08:36:32 +0200 Subject: [PATCH 16/26] revert change of github token in base-release --- .github/workflows/base-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 9aba25a14..cca58415d 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -107,7 +107,7 @@ jobs: with: registry: ghcr.io username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.GH_PAT }} - name: Create artifacts directory to store build artifacts if: inputs.distribution == 'otelcol-contrib' @@ -130,7 +130,7 @@ jobs: GOAMD64: v1 GOPPC64: power8 GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GH_PAT }} COSIGN_YES: true GORELEASER_CURRENT_TAG: ${{ github.ref_name }} From 8a65a1b8d1d82620ffbe57ab0116d1f957dee533 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Mon, 28 Jul 2025 10:15:55 +0200 Subject: [PATCH 17/26] add comments --- .github/workflows/nightly-release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index 0a83eb8a6..6710d5a85 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -34,10 +34,10 @@ jobs: # A previous release was created using a lightweight tag # git describe by default includes only annotated tags # git describe --tags includes lightweight tags as well - DESCRIBE=`git tag -l --sort=-v:refname | grep -v cmd | grep -v nightly | head -n 1` - MAJOR_VERSION=`echo $DESCRIBE | awk '{split($0,a,"."); print a[1]}'` - MINOR_VERSION=`echo $DESCRIBE | awk '{split($0,a,"."); print a[2]}'` - MINOR_VERSION="$((${MINOR_VERSION} + 1))" + DESCRIBE=`git tag -l --sort=-v:refname | grep -v cmd | grep -v nightly | head -n 1` # list tags except the ones containing cmd or nightly and then take the latest one + MAJOR_VERSION=`echo $DESCRIBE | awk '{split($0,a,"."); print a[1]}'` # take just the major version digits, e.g. "v0" + MINOR_VERSION=`echo $DESCRIBE | awk '{split($0,a,"."); print a[2]}'` # take just the minor version digits, e.g. "130" + MINOR_VERSION="$((${MINOR_VERSION} + 1))" # bump minor version TAG="${MAJOR_VERSION}.${MINOR_VERSION}.0-nightly.$(date +'%Y%m%d%H%M')" git tag -a $TAG -m "$TAG: nightly build" git push origin $TAG From a7c1cb1a8ca3396a9897299ad525c531143e9528 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 29 Jul 2025 14:21:00 +0200 Subject: [PATCH 18/26] use otelbot short time token for pushing nightly tags --- .github/workflows/nightly-release.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index 6710d5a85..c838cf8f1 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -17,14 +17,17 @@ jobs: name: Nightly Release runs-on: ubuntu-latest - permissions: - contents: write - steps: + - uses: actions/create-github-app-token@df432ceedc7162793a195dd1713ff69aefc7379e # v2.0.6 + id: otelbot-token + with: + app-id: ${{ vars.OTELBOT_COLLECTOR_RELEASES_APP_ID }} + private-key: ${{ secrets.OTELBOT_COLLECTOR_RELEASES_PRIVATE_KEY }} + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - token: ${{ secrets.GH_PAT }} + token: ${{ steps.otelbot-token.outputs.token }} - name: 'Push new tag' run: | From 317a75578e272b8da1382baa4c2622ece4e1bf32 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 29 Jul 2025 14:31:43 +0200 Subject: [PATCH 19/26] set specific content write permission for new token --- .github/workflows/nightly-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index c838cf8f1..2a2946300 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -23,6 +23,7 @@ jobs: with: app-id: ${{ vars.OTELBOT_COLLECTOR_RELEASES_APP_ID }} private-key: ${{ secrets.OTELBOT_COLLECTOR_RELEASES_PRIVATE_KEY }} + permission-contents: write - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: From 33b71f6d61e6fd4c3e19c89ce66c92f96effb51e Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 29 Jul 2025 14:40:03 +0200 Subject: [PATCH 20/26] disable publishing nightly releases --- cmd/goreleaser/internal/configure.go | 2 +- distributions/otelcol-contrib/.goreleaser-build.yaml | 1 - distributions/otelcol-contrib/.goreleaser.yaml | 1 - distributions/otelcol-k8s/.goreleaser.yaml | 1 - distributions/otelcol-otlp/.goreleaser.yaml | 1 - distributions/otelcol/.goreleaser.yaml | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go index e338ac182..bc97166d9 100644 --- a/cmd/goreleaser/internal/configure.go +++ b/cmd/goreleaser/internal/configure.go @@ -326,7 +326,7 @@ func (b *distributionBuilder) nightly() config.Nightly { return config.Nightly{ VersionTemplate: "{{ incpatch .Version}}-nightly.{{ .Now.Format \"200601021504\" }}", TagName: fmt.Sprintf("nightly-%s", b.dist.name), - PublishRelease: true, + PublishRelease: false, KeepSingleRelease: true, } } diff --git a/distributions/otelcol-contrib/.goreleaser-build.yaml b/distributions/otelcol-contrib/.goreleaser-build.yaml index 5d94a9fce..4e246066e 100644 --- a/distributions/otelcol-contrib/.goreleaser-build.yaml +++ b/distributions/otelcol-contrib/.goreleaser-build.yaml @@ -62,5 +62,4 @@ partial: nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' tag_name: nightly-otelcol-contrib - publish_release: true keep_single_release: true diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml index 45fb0908a..c0eb0a5a7 100644 --- a/distributions/otelcol-contrib/.goreleaser.yaml +++ b/distributions/otelcol-contrib/.goreleaser.yaml @@ -333,5 +333,4 @@ partial: nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' tag_name: nightly-otelcol-contrib - publish_release: true keep_single_release: true diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml index 9864a3ed8..5aeb97b16 100644 --- a/distributions/otelcol-k8s/.goreleaser.yaml +++ b/distributions/otelcol-k8s/.goreleaser.yaml @@ -213,5 +213,4 @@ partial: nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' tag_name: nightly-otelcol-k8s - publish_release: true keep_single_release: true diff --git a/distributions/otelcol-otlp/.goreleaser.yaml b/distributions/otelcol-otlp/.goreleaser.yaml index 20cb35025..c85ecb7a3 100644 --- a/distributions/otelcol-otlp/.goreleaser.yaml +++ b/distributions/otelcol-otlp/.goreleaser.yaml @@ -308,5 +308,4 @@ partial: nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' tag_name: nightly-otelcol-otlp - publish_release: true keep_single_release: true diff --git a/distributions/otelcol/.goreleaser.yaml b/distributions/otelcol/.goreleaser.yaml index 30d5db711..1d6cb4360 100644 --- a/distributions/otelcol/.goreleaser.yaml +++ b/distributions/otelcol/.goreleaser.yaml @@ -328,5 +328,4 @@ partial: nightly: version_template: '{{ incpatch .Version}}-nightly.{{ .Now.Format "200601021504" }}' tag_name: nightly-otelcol - publish_release: true keep_single_release: true From 3fe58dd26b594439fa1ae1632e60e6a7a4d9404b Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 29 Jul 2025 15:11:25 +0200 Subject: [PATCH 21/26] revert changes of github tokens --- .github/workflows/base-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index e5f1f2450..b85a3403e 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -110,7 +110,7 @@ jobs: with: registry: ghcr.io username: ${{ github.repository_owner }} - password: ${{ secrets.GH_PAT }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Create artifacts directory to store build artifacts if: inputs.distribution == 'otelcol-contrib' From da81c5b4f0435bccdc412e8d7f8269b2d8e38934 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 29 Jul 2025 15:13:02 +0200 Subject: [PATCH 22/26] revert changes of github tokens --- .github/workflows/base-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index b85a3403e..9aeb5c589 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -157,7 +157,7 @@ jobs: GOOS: ${{ matrix.GOOS }} GOARCH: ${{ matrix.GOARCH }} GOARM: 7 # Default is 6 - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GH_PAT }} COSIGN_YES: true GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} From a0d386917b7e38d89f6e1315a2bbbca30d4dd258 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 29 Jul 2025 15:20:35 +0200 Subject: [PATCH 23/26] set up otelbot app committer name and email correctly --- .github/workflows/nightly-release.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index 2a2946300..ee3e5f2c3 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -25,6 +25,19 @@ jobs: private-key: ${{ secrets.OTELBOT_COLLECTOR_RELEASES_PRIVATE_KEY }} permission-contents: write + # The next 2 steps are taken from # from https://github.com/actions/create-github-app-token#create-a-git-committer-string-for-an-app-installation + - name: Get GitHub App User ID + id: get-user-id + run: echo "user-id=$(gh api "/users/${{ steps.otelbot-token.outputs.app-slug }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT" + env: + GH_TOKEN: ${{ steps.otelbot-token.outputs.token }} + + - name: Set up commit author name and email + id: committer + run: | + echo "name=${{ steps.otelbot-token.outputs.app-slug }}[bot]" >> "$GITHUB_OUTPUT" + echo "email=${{ steps.get-user-id.outputs.user-id }}+${{ steps.otelbot-token.outputs.app-slug }}[bot]@users.noreply.github.com>" >> "$GITHUB_OUTPUT" + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 @@ -32,8 +45,8 @@ jobs: - name: 'Push new tag' run: | - git config user.name "${GITHUB_ACTOR}" - git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" + git config user.name "${{ steps.committer.outputs.name }}" + git config user.email "${{ steps.committer.outputs.email }}" # A previous release was created using a lightweight tag # git describe by default includes only annotated tags From 4c6f2997fb0c147b6e3c1060af35f9a438f2e473 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 29 Jul 2025 16:27:22 +0200 Subject: [PATCH 24/26] create issue on failed nightly release --- .github/workflows/base-release.yaml | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index 9aeb5c589..ff8b26dc5 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -259,3 +259,35 @@ jobs: GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} GORELEASER_PREVIOUS_TAG: ${{ needs.prepare.outputs.PREVIOUS_RELEASE_TAG }} GORELEASER_CURRENT_TAG: ${{ github.ref_name }} + + create-issue: + name: Create GitHub issue on failed nightly release + runs-on: ubuntu-latest + needs: [release] + if: failure() && inputs.nightly == 'true' + permissions: + issues: write + env: + issue-file: "nightly-release-failure.md" + steps: + - name: Formulate issue + run: | + # create a markdown file that contains details about the failure + echo "---" > ${{ env.issue-file }} + echo "title: Nightly Release Failed" >> ${{ env.issue-file }} + echo "labels: release:blocker" >> ${{ env.issue-file }} + echo "---" >> ${{ env.issue-file }} + echo "The nightly release failed in the following GitHub actions run." >> ${{ env.issue-file }} + echo "* Link to run: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> ${{ env.issue-file }} + echo "* Triggered by: Nightly scheduled release" >> ${{ env.issue-file }} + echo "" >> ${{ env.issue-file }} + echo "Note: This issue was auto-generated from [base-release.yaml](https://github.com/open-telemetry/opentelemetry-collector-releases/blob/main/.github/workflows/base-release.yaml)" >> ${{ env.issue-file }} + + - name: Create or update issue + uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + update_existing: true + search_existing: open + filename: ${{ env.issue-file }} From 0beaca379acadc8e1a9e3abed7455df278377713 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Tue, 29 Jul 2025 16:51:31 +0200 Subject: [PATCH 25/26] add note about other distro releases --- .github/workflows/base-release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/base-release.yaml b/.github/workflows/base-release.yaml index ff8b26dc5..2419817a9 100644 --- a/.github/workflows/base-release.yaml +++ b/.github/workflows/base-release.yaml @@ -279,6 +279,7 @@ jobs: echo "---" >> ${{ env.issue-file }} echo "The nightly release failed in the following GitHub actions run." >> ${{ env.issue-file }} echo "* Link to run: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> ${{ env.issue-file }} + echo "* Please also check the other distro release runs related to this nightly release" >> ${{ env.issue-file }} echo "* Triggered by: Nightly scheduled release" >> ${{ env.issue-file }} echo "" >> ${{ env.issue-file }} echo "Note: This issue was auto-generated from [base-release.yaml](https://github.com/open-telemetry/opentelemetry-collector-releases/blob/main/.github/workflows/base-release.yaml)" >> ${{ env.issue-file }} From 48d0ede42f29b669447f5ebae036948f93d3175f Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Wed, 30 Jul 2025 13:11:16 +0200 Subject: [PATCH 26/26] add changelog entry --- .chloggen/mowies-nightly-releases.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .chloggen/mowies-nightly-releases.yaml diff --git a/.chloggen/mowies-nightly-releases.yaml b/.chloggen/mowies-nightly-releases.yaml new file mode 100644 index 000000000..9b89e9182 --- /dev/null +++ b/.chloggen/mowies-nightly-releases.yaml @@ -0,0 +1,26 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: releases + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Introduce nightly releases + +# One or more tracking issues or pull requests related to the change +issues: [1016] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [user] +