Merge branch 'master' into ppc64le-ci

Signed-off-by: Pat <[email protected]>

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,16 +7,18 @@ Enter `[N/A]` in the box, if an item is not applicable to your change.
 
 **Testing**
 Before we can approve your change; please submit the following in a comment:
+
 - [ ] Example configuration file for the change
 - [ ] Debug log output from testing the change
-<!--  
-Please refer to the Developer Guide for instructions on building Fluent Bit with Valgrind support: 
+<!--
+Please refer to the Developer Guide for instructions on building Fluent Bit with Valgrind support:
 https://github.com/fluent/fluent-bit/blob/master/DEVELOPER_GUIDE.md#valgrind
 Invoke Fluent Bit and Valgrind as: $ valgrind --leak-check=full ./bin/fluent-bit <args>
 -->
 - [ ] Attached [Valgrind](https://valgrind.org/docs/manual/quick-start.html) output that shows no leaks or memory corruption was found
 
 If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
+
 - [ ] Run [local packaging test](./packaging/local-build-all.sh) showing all targets (including any new ones) build.
 - [ ] Set `ok-package-test` label to test for all targets (requires maintainer to do).
 

.github/actionlint.yml

@@ -1,4 +1,3 @@
 self-hosted-runner:
   labels:
-    - actuated
-    - actuated-aarch64
+    - actuated-arm64-8cpu-16gb

.github/workflows/README.md

@@ -184,13 +184,13 @@ Take the checksums from the release process above, the AppVeyor stage provides t
 ## Unstable/nightly builds
 
 These happen every 24 hours and [reuse the same workflow](./cron-unstable-build.yaml) as the staging build so are identical except they skip the upload to S3 step.
-This means all targets are built nightly for `master` and `2.0` branches including container images and Linux, macOS and Windows packages.
+This means all targets are built nightly for `master` and `2.1` branches including container images and Linux, macOS and Windows packages.
 
 The container images are available here (the tag refers to the branch):
 
-* [ghcr.io/fluent/fluent-bit/unstable:2.0](ghcr.io/fluent/fluent-bit/unstable:2.0)
+* [ghcr.io/fluent/fluent-bit/unstable:2.1](ghcr.io/fluent/fluent-bit/unstable:2.1)
 * [ghcr.io/fluent/fluent-bit/unstable:master](ghcr.io/fluent/fluent-bit/unstable:master)
-* [ghcr.io/fluent/fluent-bit/unstable:windows-2019-2.0](ghcr.io/fluent/fluent-bit/unstable:windows-2019-2.0)
+* [ghcr.io/fluent/fluent-bit/unstable:windows-2019-2.1](ghcr.io/fluent/fluent-bit/unstable:windows-2019-2.1)
 * [ghcr.io/fluent/fluent-bit/unstable:windows-2019-master](ghcr.io/fluent/fluent-bit/unstable:windows-2019-master)
 
 The Linux, macOS and Windows packages are available to download from the specific workflow run.

.github/workflows/build-legacy-branch.yaml

@@ -17,7 +17,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
 
@@ -53,39 +53,40 @@ jobs:
       packages: write
     steps:
       - name: Checkout the docker build repo for legacy builds
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: fluent/fluent-bit-docker-image
           ref: "1.8" # Fixed to this branch
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - id: debug-meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.IMAGE_NAME }}
           tags: |
             raw,${{ inputs.ref }}-debug
 
       - name: Build the legacy x86_64 debug image
         if: matrix.arch == 'amd64'
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           file: ./Dockerfile.x86_64.debug
           context: .
           tags: ${{ steps.debug-meta.outputs.tags }}
           labels: ${{ steps.debug-meta.outputs.labels }}
+          provenance: false
           platforms: linux/amd64
           push: true
           load: false
@@ -94,20 +95,21 @@ jobs:
 
       - name: Extract metadata from Github
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.IMAGE_NAME }}
           tags: |
             raw,${{ matrix.suffix }}-${{ inputs.ref }}
 
       - name: Build the legacy ${{ matrix.arch }} image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           file: ./Dockerfile.${{ matrix.suffix }}
           context: .
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/${{ matrix.arch }}
+          provenance: false
           push: true
           load: false
           build-args: |
@@ -125,10 +127,10 @@ jobs:
       - build-legacy-images-matrix
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/call-build-images.yaml

@@ -54,15 +54,15 @@ jobs:
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
 
       # For main branch/releases we want to tag with the major version.
       # E.g. if we build version 1.9.2 we want to tag with 1.9.2 and 1.9.
       - name: Determine major version tag
         id: determine-major-version
-        uses: frabert/replace-string-action@v2.4
+        uses: frabert/replace-string-action@v2.5
         with:
           pattern: '^(\d+\.\d+).*$'
           string: ${{ inputs.version }}
@@ -85,26 +85,26 @@ jobs:
       debug-digest: ${{ steps.debug_build_push.outputs.digest }}
     steps:
       - name: Checkout code for modern style builds
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ inputs.registry }}
           username: ${{ inputs.username }}
           password: ${{ secrets.token }}
 
       - name: Extract metadata from Github
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ inputs.registry }}/${{ inputs.image }}
           tags: |
@@ -114,22 +114,24 @@ jobs:
 
       - name: Build the production images
         id: build_push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           file: ./dockerfiles/Dockerfile
           context: .
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/ppc64le
+          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/s390x, linux/ppc64le
           target: production
+          # Must be disabled to provide legacy format images from the registry
+          provenance: false
           push: true
           load: false
           build-args: |
             FLB_NIGHTLY_BUILD=${{ inputs.unstable }}
             RELEASE_VERSION=${{ inputs.version }}
 
       - id: debug-meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ inputs.registry }}/${{ inputs.image }}
           tags: |
@@ -139,13 +141,15 @@ jobs:
 
       - name: Build the debug multi-arch images
         id: debug_build_push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           file: ./dockerfiles/Dockerfile
           context: .
           tags: ${{ steps.debug-meta.outputs.tags }}
           labels: ${{ steps.debug-meta.outputs.labels }}
-          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/ppc64le
+          platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/s390x, linux/ppc64le
+          # Must be disabled to provide legacy format images from the registry
+          provenance: false
           target: debug
           push: true
           load: false
@@ -164,7 +168,7 @@ jobs:
       packages: read
     steps:
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ inputs.registry }}
           username: ${{ inputs.username }}
@@ -177,7 +181,7 @@ jobs:
         shell: bash
 
       - name: Upload the schema
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ./fluent-bit-schema*.json
           name: fluent-bit-schema-${{ inputs.version }}
@@ -195,7 +199,7 @@ jobs:
       packages: read
     steps:
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ inputs.registry }}
           username: ${{ inputs.username }}
@@ -285,20 +289,20 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        windows-base-version: 
+        windows-base-version:
           - '2019'
           - '2022'
     permissions:
       contents: read
       packages: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.ref }}
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ inputs.registry }}
           username: ${{ inputs.username }}
@@ -308,9 +312,9 @@ jobs:
         run: |
           docker build -t ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }} --build-arg FLB_NIGHTLY_BUILD=${{ inputs.unstable }} --build-arg WINDOWS_VERSION=ltsc${{ matrix.windows-base-version }} -f ./dockerfiles/Dockerfile.windows .
           docker push ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }}
-        
+
         # We cannot use this action as it requires privileged mode
-        # uses: docker/build-push-action@v4
+        # uses: docker/build-push-action@v5
         # with:
         #   file: ./dockerfiles/Dockerfile.windows
         #   context: .