Merge branch 'Kong:master' into master

.bazelrc

@@ -13,6 +13,9 @@ run --color=yes
 common --color=yes
 common --curses=auto
 
+# TODO: remove after bump to bazel >= 8
+common --enable_workspace
+
 build --experimental_ui_max_stdouterr_bytes=10485760
 
 build --show_progress_rate_limit=0
@@ -21,16 +24,15 @@ build --worker_verbose
 
 build --incompatible_strict_action_env
 
-# Enable --platforms API based cpu,compiler,crosstool_top selection; remove this in 7.0.0 as it's enabled by default
-build --incompatible_enable_cc_toolchain_resolution
+# make output files and directories 0755 instead of 0555
+build --experimental_writable_outputs
+
 
 # Pass PATH, CC, CXX variables from the environment.
 build --action_env=CC --host_action_env=CC
 build --action_env=CXX --host_action_env=CXX
 build --action_env=PATH --host_action_env=PATH
 
-build --action_env=BAZEL_BUILD=1
-
 # temporary fix for https://github.com/bazelbuild/bazel/issues/12905 on macOS
 build --features=-debug_prefix_map_pwd_is_dot
 

.bazelversion

@@ -1 +1 @@
-6.1.0
+7.3.1

.devcontainer/Dockerfile

@@ -9,4 +9,5 @@ RUN apt-get install -y \
         unzip \
         git \
         m4 \
-        libyaml-dev
+        libyaml-dev \
+        curl

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,7 @@ https://github.com/Kong/kong/blob/master/COMMUNITY_PLEDGE.md
 ### Checklist
 
 - [ ] The Pull Request has tests
-- [ ] A changelog file has been created under `changelog/unreleased/kong` or `skip-changelog` label added on PR if changelog is unnecessary. [README.md](https://github.com/Kong/gateway-changelog/README.md)
+- [ ] A changelog file has been created under `changelog/unreleased/kong` or `skip-changelog` label added on PR if changelog is unnecessary. [README.md](https://github.com/Kong/gateway-changelog/blob/main/README.md)
 - [ ] There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE
 
 ### Issue reference

.github/labeler.yml

@@ -1,3 +1,7 @@
+'cherry-pick kong-ee':
+- changed-files:
+  - any-glob-to-any-file: ['kong/**/*', 'spec/**/*', 'build/**/*', 'bin/**/*', 'scripts/**/*', 'changelog/**/*']
+
 core/admin-api:
 - changed-files:
   - any-glob-to-any-file: kong/api/**/*
@@ -72,7 +76,7 @@ core/templates:
 
 core/tracing:
 - changed-files:
-  - any-glob-to-any-file: ['kong/tracing/**/*', 'kong/pdk/tracing.lua']
+  - any-glob-to-any-file: ['kong/observability/tracing/**/*', 'kong/pdk/tracing.lua']
 
 core/wasm:
 - changed-files:
@@ -250,9 +254,16 @@ plugins/opentelemetry:
 - changed-files:
   - any-glob-to-any-file: kong/plugins/opentelemetry/**/*
 
+plugins/standard-webhooks:
+- changed-files:
+  - any-glob-to-any-file: kong/plugins/standard-webhooks/**/*
+
 schema-change-noteworthy:
 - changed-files:
-  - any-glob-to-any-file: ['kong/db/schema/**/*.lua', 'kong/**/schema.lua', 'kong/plugins/**/daos.lua', 'plugins-ee/**/daos.lua', 'plugins-ee/**/schema.lua', 'kong/db/dao/*.lua', 'kong/enterprise_edition/redis/init.lua']
+  - any-glob-to-any-file: [
+      'kong/db/schema/**/*.lua', 'kong/**/schema.lua', 'kong/plugins/**/daos.lua', 'plugins-ee/**/daos.lua', 'plugins-ee/**/schema.lua', 'kong/db/dao/*.lua', 'kong/enterprise_edition/redis/init.lua',
+      'kong/llm/init.lua', 'kong/llm/schemas/*.lua',
+    ]
 
 build/bazel:
 - changed-files:

.github/matrix-commitly.yml

@@ -1,15 +1,16 @@
 # please see matrix-full.yml for meaning of each field
 build-packages:
-- label: ubuntu-22.04
-  os: ubuntu-22.04
+- label: ubuntu-24.04
+  image: ubuntu:24.04
   package: deb
-  check-manifest-suite: ubuntu-22.04-amd64
+  check-manifest-suite: ubuntu-24.04-amd64
 
 build-images:
 - label: ubuntu
-  base-image: ubuntu:22.04
+  base-image: ubuntu:24.04
   package: deb
-  artifact-from: ubuntu-22.04
+  artifact-from: ubuntu-24.04
+  check-manifest-suite: docker-image-ubuntu-24.04
 
 smoke-tests:
 - label: ubuntu

.github/matrix-full.yml

@@ -12,18 +12,25 @@ build-packages:
   package: deb
   check-manifest-suite: ubuntu-20.04-amd64
 - label: ubuntu-22.04
+  image: ubuntu:22.04
   package: deb
   check-manifest-suite: ubuntu-22.04-amd64
 - label: ubuntu-22.04-arm64
+  image: ubuntu:22.04
   package: deb
   bazel-args: --platforms=//:generic-crossbuild-aarch64
   check-manifest-suite: ubuntu-22.04-arm64
+- label: ubuntu-24.04
+  image: ubuntu:24.04
+  package: deb
+  check-manifest-suite: ubuntu-24.04-amd64
+- label: ubuntu-24.04-arm64
+  image: ubuntu:24.04
+  package: deb
+  bazel-args: --platforms=//:generic-crossbuild-aarch64
+  check-manifest-suite: ubuntu-24.04-arm64
 
 # Debian
-- label: debian-10
-  image: debian:10
-  package: deb
-  check-manifest-suite: debian-10-amd64
 - label: debian-11
   image: debian:11
   package: deb
@@ -34,12 +41,6 @@ build-packages:
   check-manifest-suite: debian-12-amd64
 
 # RHEL
-- label: rhel-7
-  image: centos:7
-  package: rpm
-  package-type: el7
-  bazel-args: --//:wasmx_el7_workaround=true --//:brotli=False
-  check-manifest-suite: el7-amd64
 - label: rhel-8
   image: rockylinux:8
   package: rpm
@@ -58,10 +59,11 @@ build-packages:
 
   # Amazon Linux
 - label: amazonlinux-2
-  image: amazonlinux:2
   package: rpm
   package-type: aws2
   check-manifest-suite: amazonlinux-2-amd64
+  # simdjson doesn't compile on gcc7.3.1 (needs 7.4)
+  bazel-args: --platforms=//:aws2-crossbuild-x86_64 --//:simdjson=False
 - label: amazonlinux-2023
   image: amazonlinux:2023
   package: rpm
@@ -85,11 +87,12 @@ build-images:
 
 # Ubuntu
 - label: ubuntu
-  base-image: ubuntu:22.04
+  base-image: ubuntu:24.04
   package: deb
-  artifact-from: ubuntu-22.04
-  artifact-from-alt: ubuntu-22.04-arm64
+  artifact-from: ubuntu-24.04
+  artifact-from-alt: ubuntu-24.04-arm64
   docker-platforms: linux/amd64, linux/arm64
+  check-manifest-suite: docker-image-ubuntu-24.04
 
 # Debian
 - label: debian
@@ -136,14 +139,20 @@ release-packages:
   artifact-version: 22.04
   artifact-type: ubuntu
   artifact: kong.arm64.deb
-
-# Debian
-- label: debian-10
+- label: ubuntu-24.04
   package: deb
-  artifact-from: debian-10
-  artifact-version: 10
-  artifact-type: debian
+  artifact-from: ubuntu-24.04
+  artifact-version: 24.04
+  artifact-type: ubuntu
   artifact: kong.amd64.deb
+- label: ubuntu-24.04-arm64
+  package: deb
+  artifact-from: ubuntu-24.04-arm64
+  artifact-version: 24.04
+  artifact-type: ubuntu
+  artifact: kong.arm64.deb
+
+# Debian
 - label: debian-11
   package: deb
   artifact-from: debian-11
@@ -158,12 +167,6 @@ release-packages:
   artifact: kong.amd64.deb
 
 # RHEL
-- label: rhel-7
-  package: rpm
-  artifact-from: rhel-7
-  artifact-version: 7
-  artifact-type: rhel
-  artifact: kong.el7.amd64.rpm
 - label: rhel-8
   package: rpm
   artifact-from: rhel-8

.github/workflows/add-release-pongo.yml

@@ -0,0 +1,58 @@
+name: Add New Release to Pongo
+
+on:
+  push:
+    tags:
+    - '[1-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  set_vars:
+    name: Set Vars
+    runs-on: ubuntu-latest-kong
+    outputs:
+      code_base: ${{ steps.define_vars.outputs.CODE_BASE }}
+      tag_version: ${{ steps.define_vars.outputs.TAG_VERSION }}
+    steps:
+    - name: Define Vars
+      id: define_vars
+      shell: bash
+      run: |
+        if [[ "${GITHUB_REPOSITORY,,}" = "kong/kong" ]] ; then
+          CODE_BASE=CE
+        elif [[ "${GITHUB_REPOSITORY,,}" = "kong/kong-ee" ]] ; then
+          CODE_BASE=EE
+        fi
+        echo "CODE_BASE=$CODE_BASE" >> "$GITHUB_OUTPUT"
+
+        if [[ "${{ github.event_name }}" == "push" ]] ; then
+          TAG_VERSION="${{ github.ref_name }}"
+        elif [[ "${{ github.event_name }}" == "release" ]] ; then
+          TAG_VERSION="${{ github.event.release.tag_name }}"
+        fi
+        echo "TAG_VERSION=$TAG_VERSION" >> "$GITHUB_OUTPUT"
+  add_release_to_pongo:
+    name: Add Release to Pongo
+    runs-on: ubuntu-latest-kong
+    needs:
+    - set_vars
+    env:
+      GITHUB_TOKEN: ${{ secrets.PAT }}
+    steps:
+    - name: Checkout Pongo
+      id: checkout_pongo
+      uses: actions/checkout@v4
+      with:
+        token: ${{ env.GITHUB_TOKEN }}
+        repository: kong/kong-pongo
+        ref: master
+    - name: Set git Env
+      id: set_git_env
+      shell: bash
+      run: |
+        git config --global user.email "[email protected]"
+        git config --global user.name "CI Bot"
+    - name: Create PR
+      id: create_pr
+      shell: bash
+      run: |
+        ./assets/add_version.sh "${{ needs.set_vars.outputs.code_base }}" "${{ needs.set_vars.outputs.tag_version }}"

.github/workflows/auto-assignee.yml

@@ -11,5 +11,5 @@ jobs:
       - name: assign-author
         # ignore the pull requests opened from PR because token is not correct
         if: github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]'
-        uses: toshimaru/auto-author-assign@c1ffd6f64e20f8f5f61f4620a1e5f0b0908790ef
+        uses: toshimaru/auto-author-assign@ebd30f10fb56e46eb0759a14951f36991426fed0
 

.github/workflows/autodocs.yml

@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Lookup build cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-deps
         with:
           path: ${{ env.INSTALL_ROOT }}
@@ -94,7 +94,7 @@ jobs:
           ref: ${{ github.event.inputs.target_branch }}
 
       - name: Lookup build cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-deps
         with:
           path: ${{ env.INSTALL_ROOT }}

.github/workflows/backport-fail-bot.yml

@@ -44,7 +44,7 @@ jobs:
         result-encoding: string
 
     - name: Send Slack Message
-      uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+      uses: slackapi/slack-github-action@70cd7be8e40a46e8b0eced40b0de447bdb42f68e # v1.26.0
       with:
         payload: ${{ steps.generate-payload.outputs.result }}
       env:

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Create backport pull requests
-        uses: korthout/backport-action@6e72f987c115430f6abc2fa92a74cdbf3e14b956 # v2.4.1
+        uses: korthout/backport-action@924c8170740fa1e3685f69014971f7f251633f53 # v2.4.1
         id: backport
         with:
           github_token: ${{ secrets.PAT }}

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
 
     - name: Lookup build cache
       id: cache-deps
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ env.BUILD_ROOT }}
         key: ${{ steps.cache-key.outputs.cache-key }}