From 139cbefc118937915a3061c62a987e816200afdd Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 12:49:12 -0800 Subject: [PATCH 01/15] Release 0.25.2-rc0 This commit cuts the first RC release for 0.25.2. Minor changes are present here -- some telemetry changes, base OS image is updated -- and we believe now that the container images will be published properly. Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 20 ++++++++++---------- CHANGELOG.md | 5 +++-- Cargo.lock | 2 +- lading/Cargo.toml | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 9ca9b47ff..c2cc237b3 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -41,13 +41,13 @@ jobs: uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 id: meta with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | + type=ref,event=pr,prefix=pr- + type=semver,pattern={{version}},event=tag,prefix=v + type=semver,pattern={{major}}.{{minor}},event=tag,prefix=v + type=semver,pattern={{major}},event=tag,prefix=v type=sha,format=long - type=ref,prefix=pr-,event=pr - type=semver,pattern={{version}},event=tag - type=semver,pattern={{major}}.{{minor}},event=tag - type=semver,pattern={{major}},event=tag - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Build and push Docker image uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0 @@ -82,13 +82,13 @@ jobs: uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 id: meta with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | + type=ref,event=pr,prefix=pr- + type=semver,pattern={{version}},event=tag,prefix=v + type=semver,pattern={{major}}.{{minor}},event=tag,prefix=v + type=semver,pattern={{major}},event=tag,prefix=v type=sha,format=long - type=ref,prefix=pr-,event=pr - type=semver,pattern={{version}},event=tag - type=semver,pattern={{major}}.{{minor}},event=tag - type=semver,pattern={{major}},event=tag - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Create and Push Multiarch Manifest run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index e99d5973a..280752f3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] -- The `bytes_received` metric in the HTTP and splunk_hec blackholes now tracks +## [0.25.2-rc2] +## Changed +- The `bytes_received` metric in the HTTP and splunk_heck blackholes now tracks wire bytes, the former metric is preserved with `decoded_bytes_received`. - Base image is now bookworm, updated from bullseye. diff --git a/Cargo.lock b/Cargo.lock index 5b3d1de17..37b949d82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "lading" -version = "0.25.1" +version = "0.25.2-rc2" dependencies = [ "async-compression", "async-pidfd", diff --git a/lading/Cargo.toml b/lading/Cargo.toml index 1953eb014..ae2e0eb73 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lading" -version = "0.25.1" +version = "0.25.2-rc2" authors = [ "Brian L. Troutwine ", "George Hahn ", From 4717b3b08d5c9c3aa31b8aac684f7deb1f0f95a0 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 15:16:09 -0800 Subject: [PATCH 02/15] fiddle with container build again Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 12 ++++++------ CHANGELOG.md | 2 +- Cargo.lock | 2 +- lading/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index c2cc237b3..6bf439140 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -43,10 +43,10 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - type=ref,event=pr,prefix=pr- + # Tag event (pushing a git tag that starts with v), produce a + # semver tag type=semver,pattern={{version}},event=tag,prefix=v - type=semver,pattern={{major}}.{{minor}},event=tag,prefix=v - type=semver,pattern={{major}},event=tag,prefix=v + # All other push events (no PR, no semver tag), produce a SHA tag type=sha,format=long - name: Build and push Docker image @@ -84,10 +84,10 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - type=ref,event=pr,prefix=pr- + # Tag event (pushing a git tag that starts with v), produce a + # semver tag type=semver,pattern={{version}},event=tag,prefix=v - type=semver,pattern={{major}}.{{minor}},event=tag,prefix=v - type=semver,pattern={{major}},event=tag,prefix=v + # All other push events (no PR, no semver tag), produce a SHA tag type=sha,format=long - name: Create and Push Multiarch Manifest diff --git a/CHANGELOG.md b/CHANGELOG.md index 280752f3c..d52d91ad6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.25.2-rc2] +## [0.25.2-rc3] ## Changed - The `bytes_received` metric in the HTTP and splunk_heck blackholes now tracks wire bytes, the former metric is preserved with `decoded_bytes_received`. diff --git a/Cargo.lock b/Cargo.lock index 37b949d82..51ac56aa8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "lading" -version = "0.25.2-rc2" +version = "0.25.2-rc3" dependencies = [ "async-compression", "async-pidfd", diff --git a/lading/Cargo.toml b/lading/Cargo.toml index ae2e0eb73..9476e5cac 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lading" -version = "0.25.2-rc2" +version = "0.25.2-rc3" authors = [ "Brian L. Troutwine ", "George Hahn ", From fa3e683f79c588c7aaf0b07d63a055083bb730f2 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 15:29:52 -0800 Subject: [PATCH 03/15] more container flow fiddling Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 7 ++++--- CHANGELOG.md | 2 +- Cargo.lock | 2 +- lading/Cargo.toml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 6bf439140..c33025ccc 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -92,7 +92,8 @@ jobs: - name: Create and Push Multiarch Manifest run: | + FINAL_TAG=$(echo "${{ steps.meta.outputs.tags }}" | head -n 1) docker buildx imagetools create \ - --tag ${{ steps.meta.outputs.tags }} \ - ${{ steps.meta.outputs.tags }}-amd64 \ - ${{ steps.meta.outputs.tags }}-arm64 + --tag "$FINAL_TAG" \ + "$FINAL_TAG-amd64" \ + "$FINAL_TAG-arm64" diff --git a/CHANGELOG.md b/CHANGELOG.md index d52d91ad6..fe7da6890 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.25.2-rc3] +## [0.25.2-rc4] ## Changed - The `bytes_received` metric in the HTTP and splunk_heck blackholes now tracks wire bytes, the former metric is preserved with `decoded_bytes_received`. diff --git a/Cargo.lock b/Cargo.lock index 51ac56aa8..f8882fca3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "lading" -version = "0.25.2-rc3" +version = "0.25.2-rc4" dependencies = [ "async-compression", "async-pidfd", diff --git a/lading/Cargo.toml b/lading/Cargo.toml index 9476e5cac..a0f3d8300 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lading" -version = "0.25.2-rc3" +version = "0.25.2-rc4" authors = [ "Brian L. Troutwine ", "George Hahn ", From 6490ef0595a514f85b77cbc086aec2f2893a737d Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 17:24:46 -0800 Subject: [PATCH 04/15] more tagging attempts Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 30 +++++++++++++++++++++++------- CHANGELOG.md | 2 +- Cargo.lock | 2 +- lading/Cargo.toml | 2 +- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index c33025ccc..a493102b9 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -43,10 +43,7 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - # Tag event (pushing a git tag that starts with v), produce a - # semver tag - type=semver,pattern={{version}},event=tag,prefix=v - # All other push events (no PR, no semver tag), produce a SHA tag + # Produce a SHA tag type=sha,format=long - name: Build and push Docker image @@ -90,10 +87,29 @@ jobs: # All other push events (no PR, no semver tag), produce a SHA tag type=sha,format=long + - name: Determine Final Tag + run: | + ALL_TAGS="${{ steps.meta.outputs.tags }}" + SHA_TAG=$(echo "$ALL_TAGS" | grep sha-) + SEMVER_TAG=$(echo "$ALL_TAGS" | grep '^ghcr.io/.*:v') + + if [ -n "$SEMVER_TAG" ]; then + FINAL_TAG="$SEMVER_TAG" + else + FINAL_TAG="$SHA_TAG" + fi + + echo "SHA_TAG=$SHA_TAG" >> $GITHUB_ENV + echo "FINAL_TAG=$FINAL_TAG" >> $GITHUB_ENV + + - name: Debug Tags + run: | + echo "SHA_TAG: $SHA_TAG" + echo "FINAL_TAG: $FINAL_TAG" + - name: Create and Push Multiarch Manifest run: | - FINAL_TAG=$(echo "${{ steps.meta.outputs.tags }}" | head -n 1) docker buildx imagetools create \ --tag "$FINAL_TAG" \ - "$FINAL_TAG-amd64" \ - "$FINAL_TAG-arm64" + "$SHA_TAG-amd64" \ + "$SHA_TAG-arm64" diff --git a/CHANGELOG.md b/CHANGELOG.md index fe7da6890..9df0fe0e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.25.2-rc4] +## [0.25.2-rc5] ## Changed - The `bytes_received` metric in the HTTP and splunk_heck blackholes now tracks wire bytes, the former metric is preserved with `decoded_bytes_received`. diff --git a/Cargo.lock b/Cargo.lock index f8882fca3..bb8c20265 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "lading" -version = "0.25.2-rc4" +version = "0.25.2-rc5" dependencies = [ "async-compression", "async-pidfd", diff --git a/lading/Cargo.toml b/lading/Cargo.toml index a0f3d8300..ee29ed2d9 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lading" -version = "0.25.2-rc4" +version = "0.25.2-rc5" authors = [ "Brian L. Troutwine ", "George Hahn ", From c9a80b52913486d7ec4e7192e38c44d7a25aae15 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 17:31:22 -0800 Subject: [PATCH 05/15] more container build debugging Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 51 +++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index a493102b9..bbf3869f2 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -8,6 +8,57 @@ env: IMAGE_NAME: ${{ github.repository }} jobs: + tagging: + name: Debug Multi-Arch Manifest + needs: build + runs-on: ubuntu-20.04 + permissions: + contents: read + packages: write + + steps: + - name: Log in to Container Registry + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 + + - name: Extract Docker Metadata + uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 + id: meta + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + # Tag event (pushing a git tag that starts with v), produce a + # semver tag + type=semver,pattern={{version}},event=tag,prefix=v + # All other push events (no PR, no semver tag), produce a SHA tag + type=sha,format=long + + - name: Determine Final Tag + run: | + ALL_TAGS="${{ steps.meta.outputs.tags }}" + SHA_TAG=$(echo "$ALL_TAGS" | grep sha-) + SEMVER_TAG=$(echo "$ALL_TAGS" | grep '^ghcr.io/.*:v') + + if [ -n "$SEMVER_TAG" ]; then + FINAL_TAG="$SEMVER_TAG" + else + FINAL_TAG="$SHA_TAG" + fi + + echo "SHA_TAG=$SHA_TAG" >> $GITHUB_ENV + echo "FINAL_TAG=$FINAL_TAG" >> $GITHUB_ENV + + - name: Debug Tags + run: | + echo "SHA_TAG: $SHA_TAG" + echo "FINAL_TAG: $FINAL_TAG" + build: runs-on: ${{ matrix.runner }} strategy: From 1c854c414cc5754a1d52cc2dc0b25e4af09fb3b8 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 17:35:23 -0800 Subject: [PATCH 06/15] remove build depend Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index bbf3869f2..f8ed500e7 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -10,7 +10,6 @@ env: jobs: tagging: name: Debug Multi-Arch Manifest - needs: build runs-on: ubuntu-20.04 permissions: contents: read From 7ca25a4f653d3285221257b6872072dbb5e2ba96 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 17:46:10 -0800 Subject: [PATCH 07/15] more debugging Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index f8ed500e7..cf922e07e 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -41,8 +41,8 @@ jobs: - name: Determine Final Tag run: | ALL_TAGS="${{ steps.meta.outputs.tags }}" - SHA_TAG=$(echo "$ALL_TAGS" | grep sha-) - SEMVER_TAG=$(echo "$ALL_TAGS" | grep '^ghcr.io/.*:v') + SEMVER_TAG=$(echo "$ALL_TAGS" | grep '^ghcr.io/.*:v' || true) + SHA_TAG=$(echo "$ALL_TAGS" | grep sha- || true) if [ -n "$SEMVER_TAG" ]; then FINAL_TAG="$SEMVER_TAG" From 20c02de4c40a0cab883e5ce8c33f354990e10247 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 18:09:07 -0800 Subject: [PATCH 08/15] tagging work Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 63 ++++++++++----------------------- 1 file changed, 19 insertions(+), 44 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index cf922e07e..1fb05c0f5 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -13,7 +13,10 @@ jobs: runs-on: ubuntu-20.04 permissions: contents: read - packages: write + packages: read + outputs: + FINAL_TAG: ${{ steps.tags.outputs.FINAL_TAG }} + SHA_TAG: ${{ steps.tags.outputs.SHA_TAG }} steps: - name: Log in to Container Registry @@ -39,6 +42,7 @@ jobs: type=sha,format=long - name: Determine Final Tag + id: tags run: | ALL_TAGS="${{ steps.meta.outputs.tags }}" SEMVER_TAG=$(echo "$ALL_TAGS" | grep '^ghcr.io/.*:v' || true) @@ -50,15 +54,17 @@ jobs: FINAL_TAG="$SHA_TAG" fi - echo "SHA_TAG=$SHA_TAG" >> $GITHUB_ENV - echo "FINAL_TAG=$FINAL_TAG" >> $GITHUB_ENV + # Use output variables to pass to other jobs + echo "::set-output name=SHA_TAG::$SHA_TAG" + echo "::set-output name=FINAL_TAG::$FINAL_TAG" - name: Debug Tags run: | - echo "SHA_TAG: $SHA_TAG" - echo "FINAL_TAG: $FINAL_TAG" + echo "SHA_TAG: ${{ steps.tags.outputs.SHA_TAG }}" + echo "FINAL_TAG: ${{ steps.tags.outputs.FINAL_TAG }}" build: + needs: tagging runs-on: ${{ matrix.runner }} strategy: matrix: @@ -88,19 +94,18 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Extract metadata for Docker - uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 + uses: docker/metadata-action@v5.6.1 id: meta with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - # Produce a SHA tag type=sha,format=long - name: Build and push Docker image uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0 with: file: Dockerfile - tags: ${{ steps.meta.outputs.tags }}-${{ matrix.arch }} + tags: ${{ needs.tagging.outputs.SHA_TAG }}-${{ matrix.arch }} push: true labels: ${{ steps.meta.outputs.labels }} cache-from: type=registry,ref=ghcr.io/datadog/lading:cache @@ -108,7 +113,9 @@ jobs: manifest: name: Create Multi-Arch Manifest - needs: build + needs: + - tagging + - build runs-on: ubuntu-20.04 permissions: contents: read @@ -125,41 +132,9 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1 - - name: Extract Docker Metadata - uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 - id: meta - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: | - # Tag event (pushing a git tag that starts with v), produce a - # semver tag - type=semver,pattern={{version}},event=tag,prefix=v - # All other push events (no PR, no semver tag), produce a SHA tag - type=sha,format=long - - - name: Determine Final Tag - run: | - ALL_TAGS="${{ steps.meta.outputs.tags }}" - SHA_TAG=$(echo "$ALL_TAGS" | grep sha-) - SEMVER_TAG=$(echo "$ALL_TAGS" | grep '^ghcr.io/.*:v') - - if [ -n "$SEMVER_TAG" ]; then - FINAL_TAG="$SEMVER_TAG" - else - FINAL_TAG="$SHA_TAG" - fi - - echo "SHA_TAG=$SHA_TAG" >> $GITHUB_ENV - echo "FINAL_TAG=$FINAL_TAG" >> $GITHUB_ENV - - - name: Debug Tags - run: | - echo "SHA_TAG: $SHA_TAG" - echo "FINAL_TAG: $FINAL_TAG" - - name: Create and Push Multiarch Manifest run: | docker buildx imagetools create \ - --tag "$FINAL_TAG" \ - "$SHA_TAG-amd64" \ - "$SHA_TAG-arm64" + --tag "${{ needs.tagging.outputs.FINAL_TAG }}" \ + "${{ needs.tagging.outputs.SHA_TAG }}-amd64" \ + "${{ needs.tagging.outputs.SHA_TAG }}-arm64" From 1e9193e1ccdf857fcb1af435f696d522d7d896bf Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 18:15:00 -0800 Subject: [PATCH 09/15] use GITHUB_OUTPUT Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 1fb05c0f5..fab784414 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -9,7 +9,7 @@ env: jobs: tagging: - name: Debug Multi-Arch Manifest + name: Determine Tags runs-on: ubuntu-20.04 permissions: contents: read @@ -54,9 +54,8 @@ jobs: FINAL_TAG="$SHA_TAG" fi - # Use output variables to pass to other jobs - echo "::set-output name=SHA_TAG::$SHA_TAG" - echo "::set-output name=FINAL_TAG::$FINAL_TAG" + echo "SHA_TAG=$SHA_TAG" >> $GITHUB_OUTPUT + echo "FINAL_TAG=$FINAL_TAG" >> $GITHUB_OUTPUT - name: Debug Tags run: | From 01478e8ca1535e82f594da460290cc953b634d40 Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 18:16:25 -0800 Subject: [PATCH 10/15] lint Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index fab784414..f26d838e3 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -93,7 +93,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Extract metadata for Docker - uses: docker/metadata-action@v5.6.1 + uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1 id: meta with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} From 5dbee7f7008661d0bc8b1aacf02489b17041396c Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 18:28:32 -0800 Subject: [PATCH 11/15] -rc6 Signed-off-by: Brian L. Troutwine --- CHANGELOG.md | 2 +- Cargo.lock | 2 +- lading/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9df0fe0e7..e9ea1f43f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.25.2-rc5] +## [0.25.2-rc6] ## Changed - The `bytes_received` metric in the HTTP and splunk_heck blackholes now tracks wire bytes, the former metric is preserved with `decoded_bytes_received`. diff --git a/Cargo.lock b/Cargo.lock index bb8c20265..932f7e730 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "lading" -version = "0.25.2-rc5" +version = "0.25.2-rc6" dependencies = [ "async-compression", "async-pidfd", diff --git a/lading/Cargo.toml b/lading/Cargo.toml index ee29ed2d9..5dcfd9ef1 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lading" -version = "0.25.2-rc5" +version = "0.25.2-rc6" authors = [ "Brian L. Troutwine ", "George Hahn ", From 78749aa4b6773db44ebc8c7aaa8d826a0229cd6e Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Tue, 17 Dec 2024 18:39:40 -0800 Subject: [PATCH 12/15] 0.25.2 Signed-off-by: Brian L. Troutwine --- CHANGELOG.md | 2 +- Cargo.lock | 2 +- lading/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9ea1f43f..3cc9b9863 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.25.2-rc6] +## [0.25.2] ## Changed - The `bytes_received` metric in the HTTP and splunk_heck blackholes now tracks wire bytes, the former metric is preserved with `decoded_bytes_received`. diff --git a/Cargo.lock b/Cargo.lock index 932f7e730..df098478b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ dependencies = [ [[package]] name = "lading" -version = "0.25.2-rc6" +version = "0.25.2" dependencies = [ "async-compression", "async-pidfd", diff --git a/lading/Cargo.toml b/lading/Cargo.toml index 5dcfd9ef1..47567dbc6 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lading" -version = "0.25.2-rc6" +version = "0.25.2" authors = [ "Brian L. Troutwine ", "George Hahn ", From 7d0c6fd4c263a653b9c0be66aac0fe72e3b2713e Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Wed, 18 Dec 2024 07:36:21 -0800 Subject: [PATCH 13/15] remove v prefix from release tags Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index f26d838e3..87d783c14 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -35,9 +35,9 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - # Tag event (pushing a git tag that starts with v), produce a - # semver tag - type=semver,pattern={{version}},event=tag,prefix=v + # Tag event produce a semver tag. This will capture tags that begin + # vX.Y.Z and X.Y.Z. + type=semver,pattern={{version}},event=tag # All other push events (no PR, no semver tag), produce a SHA tag type=sha,format=long From 42cb17f2a301a11ba2df3aad643dab31df7b2dec Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Wed, 18 Dec 2024 07:42:50 -0800 Subject: [PATCH 14/15] update SEMVAR_TAG regex Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 87d783c14..c7987d5fa 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -45,7 +45,7 @@ jobs: id: tags run: | ALL_TAGS="${{ steps.meta.outputs.tags }}" - SEMVER_TAG=$(echo "$ALL_TAGS" | grep '^ghcr.io/.*:v' || true) + SEMVER_TAG=$(echo "$ALL_TAGS" | grep -E '^ghcr.io/.+:[0-9]+\.[0-9]+\.[0-9]+' || true) SHA_TAG=$(echo "$ALL_TAGS" | grep sha- || true) if [ -n "$SEMVER_TAG" ]; then From 5efa22d3819bbb40bd82e9169f3feebf1e6127ea Mon Sep 17 00:00:00 2001 From: "Brian L. Troutwine" Date: Wed, 18 Dec 2024 07:47:04 -0800 Subject: [PATCH 15/15] also handle -rcXYZ Signed-off-by: Brian L. Troutwine --- .github/workflows/container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index c7987d5fa..5ca40966a 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -45,7 +45,7 @@ jobs: id: tags run: | ALL_TAGS="${{ steps.meta.outputs.tags }}" - SEMVER_TAG=$(echo "$ALL_TAGS" | grep -E '^ghcr.io/.+:[0-9]+\.[0-9]+\.[0-9]+' || true) + SEMVER_TAG=$(echo "$ALL_TAGS" | grep -E '^ghcr.io/.+:[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?' || true) SHA_TAG=$(echo "$ALL_TAGS" | grep sha- || true) if [ -n "$SEMVER_TAG" ]; then