From 79614d4cac983d0806c7d7a8187a1d6c16a060dc Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 27 May 2026 12:54:45 -0400 Subject: [PATCH 1/7] Standardize dep update commit messages. Signed-off-by: Josh Baird --- .github/dependabot.yml | 6 ++++++ .github/release-please-config.json | 15 +++++++++++++++ .github/renovate-config.js | 3 ++- .github/workflows/bump-fluent-bit-version.yaml | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7ff4d480c..7d847307c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,9 @@ updates: directory: "/" schedule: interval: "monthly" + commit-message: + prefix: ci + include: scope - package-ecosystem: "docker" directories: @@ -21,6 +24,9 @@ updates: - package-ecosystem: "gomod" directories: - "/" + commit-message: + prefix: build + include: scope groups: k8s.io/*: patterns: diff --git a/.github/release-please-config.json b/.github/release-please-config.json index 3666167f8..b43d0a952 100644 --- a/.github/release-please-config.json +++ b/.github/release-please-config.json @@ -1,6 +1,21 @@ { "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", "release-type": "simple", + "changelog-sections": [ + { "type": "feat", "section": "Features" }, + { "type": "feature", "section": "Features" }, + { "type": "fix", "section": "Bug Fixes" }, + { "type": "perf", "section": "Performance Improvements" }, + { "type": "revert", "section": "Reverts" }, + { "type": "build", "section": "Dependencies", "hidden": false }, + { "type": "deps", "section": "Dependencies", "hidden": false }, + { "type": "chore", "section": "Miscellaneous Chores", "hidden": true }, + { "type": "ci", "section": "Continuous Integration", "hidden": true }, + { "type": "docs", "section": "Documentation", "hidden": true }, + { "type": "refactor", "section": "Code Refactoring", "hidden": true }, + { "type": "test", "section": "Tests", "hidden": true }, + { "type": "style", "section": "Styles", "hidden": true } + ], "packages": { ".": { "extra-files": [ diff --git a/.github/renovate-config.js b/.github/renovate-config.js index 1a683779a..d51dce1c6 100644 --- a/.github/renovate-config.js +++ b/.github/renovate-config.js @@ -17,7 +17,8 @@ module.exports = { dryRun: null, repositories: ["fluent/fluent-operator"], enabledManagers: ["custom.regex"], - extends: ["config:recommended"], + // Match Dependabot / release-please: build(deps): update … + extends: ["config:recommended", ":semanticCommitTypeAll(build)"], customManagers: [ { customType: "regex", diff --git a/.github/workflows/bump-fluent-bit-version.yaml b/.github/workflows/bump-fluent-bit-version.yaml index 820c2b003..ce2cf4a52 100644 --- a/.github/workflows/bump-fluent-bit-version.yaml +++ b/.github/workflows/bump-fluent-bit-version.yaml @@ -75,7 +75,7 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v8 with: - commit-message: "chore(deps): bump fluent-bit to ${{ github.event.inputs.version }} + commit-message: "build(deps): bump fluent-bit to ${{ github.event.inputs.version }} - Updated VERSION file - Updated manifest files From c3d2e3c8b98768598c05cdc27d0627c6a615acf8 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 27 May 2026 13:03:58 -0400 Subject: [PATCH 2/7] Fix values bump. Signed-off-by: Josh Baird --- .github/workflows/bump-fluent-bit-version.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bump-fluent-bit-version.yaml b/.github/workflows/bump-fluent-bit-version.yaml index ce2cf4a52..8a598da48 100644 --- a/.github/workflows/bump-fluent-bit-version.yaml +++ b/.github/workflows/bump-fluent-bit-version.yaml @@ -65,10 +65,16 @@ jobs: fi done - - name: Update version in values.yaml + - name: Update fluent-bit tag in chart values.yaml run: | - if ! sed -i '/repository: "ghcr.io\/fluent\/fluent-operator\/fluent-bit"/!b;n;s/tag: .*/tag: "${{ github.event.inputs.version }}"/' charts/fluent-operator/values.yaml; then - echo "Failed to update values.yaml" + file="charts/fluent-operator/values.yaml" + # Match fluentbit.image (registry + repository); not the old single-line repository form + if ! sed -i '/depName=ghcr.io\/fluent\/fluent-operator\/fluent-bit/,+1 s|tag: .*|tag: "${{ github.event.inputs.version }}"|' "$file"; then + echo "Failed to update fluent-bit tag in $file" + exit 1 + fi + if ! grep -q "tag: \"${{ github.event.inputs.version }}\"" "$file"; then + echo "fluent-bit tag not updated in $file" exit 1 fi @@ -81,7 +87,7 @@ jobs: - Updated manifest files - Updated values.yaml in Helm chart" signoff: true - title: "chore(deps): bump fluent-bit to ${{ github.event.inputs.version }}" + title: "build(deps): bump fluent-bit to ${{ github.event.inputs.version }}" body: | This PR updates the version to ${{ github.event.inputs.version }} in the following files: - cmd/fluent-watcher/fluentbit/VERSION From 5f6700d6e1aa5c7269b4fc3b8e1abe1ddd8366ef Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 27 May 2026 13:12:57 -0400 Subject: [PATCH 3/7] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Josh Baird --- .github/workflows/bump-fluent-bit-version.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-fluent-bit-version.yaml b/.github/workflows/bump-fluent-bit-version.yaml index 8a598da48..280d55510 100644 --- a/.github/workflows/bump-fluent-bit-version.yaml +++ b/.github/workflows/bump-fluent-bit-version.yaml @@ -73,8 +73,8 @@ jobs: echo "Failed to update fluent-bit tag in $file" exit 1 fi - if ! grep -q "tag: \"${{ github.event.inputs.version }}\"" "$file"; then - echo "fluent-bit tag not updated in $file" + if ! grep -A1 'depName=ghcr.io/fluent/fluent-operator/fluent-bit' "$file" | tail -n1 | grep -q '^ *tag: "${{ github.event.inputs.version }}"$'; then + echo "fluent-bit tag not updated in the depName=ghcr.io/fluent/fluent-operator/fluent-bit block of $file" exit 1 fi From 9840fc3b043564f22a16d30635c0c4492c15b26e Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 27 May 2026 13:17:06 -0400 Subject: [PATCH 4/7] Update docs. Signed-off-by: Josh Baird --- RELEASE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE.md b/RELEASE.md index e7215f168..7f342ba68 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -62,6 +62,7 @@ Version bumps are driven automatically by [Conventional Commits](https://www.con | `feat:` | Minor version bump | | `fix:` | Patch version bump | | `feat!:` or `BREAKING CHANGE:` | Major version bump | +| `build` | Patch version bump | | `chore:`, `docs:`, `ci:`, etc. | No version bump (excluded from changelog) | ## How to cut a new release From 27b418c4d5f640281714ac53de84ff2f027b3a8f Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 27 May 2026 13:18:12 -0400 Subject: [PATCH 5/7] Specify scope for docker. Signed-off-by: Josh Baird --- .github/dependabot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7d847307c..02057598d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,6 +15,9 @@ updates: - "/cmd/fluent-watcher/fluentd" schedule: interval: "daily" + commit-message: + prefix: build + include: scope - package-ecosystem: "docker" directory: "/docs/best-practice/forwarding-logs-via-http" From 1c3fc95996eeadf43738f01cc11f7bbbda580831 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 27 May 2026 13:22:38 -0400 Subject: [PATCH 6/7] Fix Dockerfile. Signed-off-by: Josh Baird --- docs/best-practice/forwarding-logs-via-http/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/best-practice/forwarding-logs-via-http/Dockerfile b/docs/best-practice/forwarding-logs-via-http/Dockerfile index db83c6441..c541e27fa 100644 --- a/docs/best-practice/forwarding-logs-via-http/Dockerfile +++ b/docs/best-practice/forwarding-logs-via-http/Dockerfile @@ -1,4 +1,4 @@ -GO_VERSION=1.26.2 +ARG GO_VERSION=1.26.2 # Build the manager binary FROM golang:${GO_VERSION} AS builder From 948fa33d45770ebdf2d1a04281dd08fd78b67f32 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 27 May 2026 13:28:45 -0400 Subject: [PATCH 7/7] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Signed-off-by: Josh Baird --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 7f342ba68..d7753855a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -62,7 +62,7 @@ Version bumps are driven automatically by [Conventional Commits](https://www.con | `feat:` | Minor version bump | | `fix:` | Patch version bump | | `feat!:` or `BREAKING CHANGE:` | Major version bump | -| `build` | Patch version bump | +| `build:` or `build(deps):` | Patch version bump | | `chore:`, `docs:`, `ci:`, etc. | No version bump (excluded from changelog) | ## How to cut a new release