Merge branch 'main' into server-codec-fuzz-diff

yanavlasov · Jun 27, 2023 · 0e9b129 · 0e9b129
2 parents e670d96 + 23d6164
commit 0e9b129
Show file tree

Hide file tree

Showing 458 changed files with 10,258 additions and 1,747 deletions.
diff --git a/.azure-pipelines/env.yml b/.azure-pipelines/env.yml
@@ -38,7 +38,7 @@ jobs:
 - job: cache
   displayName: Cache
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - template: cached.yml
     parameters:
@@ -48,7 +48,7 @@ jobs:
   dependsOn: []
   displayName: Cache (arm64)
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - template: cached.yml
     parameters:
@@ -60,7 +60,7 @@ jobs:
   dependsOn: []
   displayName: Repository
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - checkout: self
     fetchDepth: 0
@@ -259,7 +259,7 @@ jobs:
   displayName: Test artifacts
   condition: ne(variables['Build.DefinitionName'], 'envoy-postsubmit')
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - script: $(Build.SourcesDirectory)/.azure-pipelines/gpg/generate-test-key.sh
     displayName: "Generate snakeoil GPG key for testing"

diff --git a/.azure-pipelines/pipelines.yml b/.azure-pipelines/pipelines.yml
@@ -13,6 +13,9 @@ pr: none
 
 
 variables:
+- name: agentUbuntu
+  value: ubuntu-20.04
+
 - name: isDev
   # This must be checked/set in a `step` from the VERSION.txt file, in order to be useful
   value: true

diff --git a/.azure-pipelines/stage/checks.yml b/.azure-pipelines/stage/checks.yml
@@ -68,7 +68,7 @@ jobs:
         CI_TARGET: "bazel.api"
   timeoutInMinutes: 180
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - template: ../bazel.yml
     parameters:
@@ -131,8 +131,7 @@ jobs:
 - job: complete
   displayName: "Checks complete"
   dependsOn: ["bazel", "coverage"]
-  pool:
-    vmImage: "ubuntu-20.04"
+  pool: x64-nano
   # This condition ensures that this (required) check passes if all of
   # the preceding checks either pass or are skipped
   # adapted from:

diff --git a/.azure-pipelines/stage/linux.yml b/.azure-pipelines/stage/linux.yml
@@ -47,8 +47,7 @@ jobs:
 - job: released
   displayName: Complete
   dependsOn: ["release"]
-  pool:
-    vmImage: "ubuntu-20.04"
+  pool: x64-nano
   # This condition ensures that this (required) job passes if all of
   # the preceeding jobs either pass or are skipped
   # adapted from:

diff --git a/.azure-pipelines/stage/macos.yml b/.azure-pipelines/stage/macos.yml
@@ -42,8 +42,7 @@ jobs:
 - job: tested
   displayName: Complete
   dependsOn: ["test"]
-  pool:
-    vmImage: "ubuntu-20.04"
+  pool: x64-nano
   # This condition ensures that this (required) job passes if all of
   # the preceeding jobs either pass or are skipped
   # adapted from:

diff --git a/.azure-pipelines/stage/prechecks.yml b/.azure-pipelines/stage/prechecks.yml
@@ -39,7 +39,7 @@ jobs:
   displayName: Precheck
   timeoutInMinutes: 30
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   variables:
     CI_TARGET: ""
   strategy:
@@ -165,7 +165,7 @@ jobs:
   displayName: Precheck dependencies
   timeoutInMinutes: 20
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   condition: |
     and(not(canceled()),
         eq(${{ parameters.checkDeps }}, 'true'))
@@ -182,8 +182,7 @@ jobs:
 - job: prechecked
   displayName: Prechecked
   dependsOn: ["prechecks", "dependencies"]
-  pool:
-    vmImage: "ubuntu-20.04"
+  pool: x64-nano
   # This condition ensures that this (required) job passes if all of
   # the preceeding jobs either pass or are skipped
   # adapted from:

diff --git a/.azure-pipelines/stage/publish.yml b/.azure-pipelines/stage/publish.yml
@@ -104,7 +104,7 @@ jobs:
         eq(${{ parameters.runDocker }}, 'true'))
   timeoutInMinutes: 120
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - task: DownloadBuildArtifacts@0
     inputs:
@@ -201,7 +201,7 @@ jobs:
         eq(${{ parameters.runPackaging }}, 'true'))
   timeoutInMinutes: 120
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - task: DownloadBuildArtifacts@0
     inputs:
@@ -268,7 +268,7 @@ jobs:
     and(not(canceled()),
         eq(${{ parameters.publishDocs }}, 'true'))
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - template: ../bazel.yml
     parameters:
@@ -348,7 +348,7 @@ jobs:
         eq(${{ parameters.runPackaging }}, 'true'))
   timeoutInMinutes: 120
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - task: DownloadBuildArtifacts@0
     inputs:
@@ -376,8 +376,7 @@ jobs:
 - job: success
   dependsOn: ["docker", "docs", "signed_release"]
   displayName: Success (linux artefacts)
-  pool:
-    vmImage: "ubuntu-20.04"
+  pool: x64-nano
   # This condition ensures that this (required) check passes if all of
   # the preceding checks either pass or are skipped
   # adapted from:
@@ -400,7 +399,7 @@ jobs:
         in(dependencies.success.result, 'Succeeded', 'SucceededWithIssues'),
         eq(${{ parameters.publishGithubRelease }}, 'true'))
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - task: DownloadBuildArtifacts@0
     inputs:

diff --git a/.azure-pipelines/stage/verify.yml b/.azure-pipelines/stage/verify.yml
@@ -13,7 +13,7 @@ jobs:
   condition: and(not(canceled()), succeeded(), ne(stageDependencies.env.repo.outputs['changed.mobileOnly'], 'true'), ne(stageDependencies.env.repo.outputs['changed.docsOnly'], 'true'), ne(stageDependencies.env.repo.outputs['changed.examplesOnly'], 'true'))
   timeoutInMinutes: 120
   pool:
-    vmImage: "ubuntu-20.04"
+    vmImage: $(agentUbuntu)
   steps:
   - task: DownloadBuildArtifacts@0
     inputs:
@@ -60,8 +60,7 @@ jobs:
 - job: verified
   displayName: Verification complete
   dependsOn: ["packages_x64", "packages_arm64"]
-  pool:
-    vmImage: "ubuntu-20.04"
+  pool: x64-nano
   # This condition ensures that this (required) check passes if all of
   # the preceding checks either pass or are skipped
   # adapted from:

diff --git a/.azure-pipelines/stage/windows.yml b/.azure-pipelines/stage/windows.yml
@@ -106,8 +106,7 @@ jobs:
 - job: released
   displayName: Complete
   dependsOn: ["release", "docker"]
-  pool:
-    vmImage: "ubuntu-20.04"
+  pool: x64-nano
   # This condition ensures that this (required) job passes if all of
   # the preceeding jobs either pass or are skipped
   # adapted from:

diff --git a/.github/actions/pr_notifier/requirements.txt b/.github/actions/pr_notifier/requirements.txt
@@ -171,9 +171,9 @@ pycparser==2.20 \
     --hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \
     --hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705
     # via cffi
-pygithub==1.58.2 \
-    --hash=sha256:1e6b1b7afe31f75151fb81f7ab6b984a7188a852bdb123dbb9ae90023c3ce60f \
-    --hash=sha256:f435884af617c6debaa76cbc355372d1027445a56fbc39972a3b9ed4968badc8
+pygithub==1.59.0 \
+    --hash=sha256:126bdbae72087d8d038b113aab6b059b4553cb59348e3024bb1a1cae406ace9e \
+    --hash=sha256:6e05ff49bac3caa7d1d6177a10c6e55a3e20c85b92424cc198571fd0cf786690
     # via -r requirements.in
 pyjwt[crypto]==2.4.0 \
     --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -238,6 +238,12 @@ updates:
     interval: daily
     time: "06:00"
 
+- package-ecosystem: "gomod"
+  directory: "/contrib/golang/filters/network/test/test_data"
+  schedule:
+    interval: daily
+    time: "06:00"
+
 - package-ecosystem: "gomod"
   directory: "/examples/ext_authz/auth/grpc-service"
   schedule:

diff --git a/.github/workflows/check-deps.yml b/.github/workflows/check-deps.yml
@@ -9,7 +9,7 @@ permissions: read-all
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: |
       ${{
           github.repository == 'envoyproxy/envoy'

diff --git a/.github/workflows/depsreview.yml b/.github/workflows/depsreview.yml
@@ -7,7 +7,7 @@ concurrency:
 
 jobs:
   dependency-review:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: github.repository == 'envoyproxy/envoy'
     steps:
     - name: 'Checkout Repository'

diff --git a/.github/workflows/env.yml b/.github/workflows/env.yml
@@ -3,6 +3,8 @@ name: Environment
 on:
   workflow_call:
     outputs:
+      agent_ubuntu:
+        value: ubuntu-22.04
       build_image_ubuntu:
         value: ${{ jobs.repo.outputs.build_image_ubuntu }}
       build_image_ubuntu_mobile:
@@ -41,7 +43,7 @@ concurrency:
 jobs:
   repo:
     if: github.repository == 'envoyproxy/envoy'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       build_image_ubuntu: ${{ steps.build_image.outputs.build_image_ubuntu }}
       build_image_ubuntu_mobile: ${{ steps.build_image.outputs.build_image_ubuntu_mobile }}

diff --git a/.github/workflows/envoy-sync.yml b/.github/workflows/envoy-sync.yml
@@ -4,15 +4,21 @@ on:
   push:
     branches:
     - main
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:
   sync:
-    runs-on: ubuntu-20.04
-    if: github.repository == 'envoyproxy/envoy'
+    runs-on: ubuntu-22.04
+    if: |
+      ${{
+          github.repository == 'envoyproxy/envoy'
+          && (github.event.push
+              || !contains(github.actor, '[bot]'))
+      }}
     strategy:
       fail-fast: false
       matrix:
@@ -21,7 +27,7 @@ jobs:
         - envoy-filter-example
         - data-plane-api
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/dispatch@actions-v0.0.2
+    - uses: envoyproxy/toolshed/gh-actions/dispatch@actions-v0.0.3
       with:
         repository: "envoyproxy/${{ matrix.downstream }}"
         ref: main

diff --git a/.github/workflows/envoy-verify.yml b/.github/workflows/envoy-verify.yml
@@ -35,7 +35,7 @@ jobs:
 
   # Runs untrusted code
   verify-examples:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: check
     steps:
     - run: |

diff --git a/.github/workflows/mobile-android_build.yml b/.github/workflows/mobile-android_build.yml
@@ -20,7 +20,7 @@ jobs:
     if: ${{ needs.env.outputs.mobile_android_build == 'true' }}
     needs: env
     name: android_build
-    runs-on: ubuntu-20.04
+    runs-on: ${{ needs.env.outputs.agent_ubuntu }}
     timeout-minutes: 90
     container:
       image: ${{ needs.env.outputs.build_image_ubuntu_mobile }}

diff --git a/.github/workflows/mobile-android_tests.yml b/.github/workflows/mobile-android_tests.yml
@@ -80,7 +80,7 @@ jobs:
     # Only kotlin tests are executed since with linux:
     # https://github.com/envoyproxy/envoy-mobile/issues/1418.
     name: kotlin_tests_linux
-    runs-on: ubuntu-20.04
+    runs-on: ${{ needs.env.outputs.agent_ubuntu }}
     timeout-minutes: 90
     container:
       image: ${{ needs.env.outputs.build_image_ubuntu_mobile }}

diff --git a/.github/workflows/mobile-asan.yml b/.github/workflows/mobile-asan.yml
@@ -20,7 +20,7 @@ jobs:
     if: ${{ needs.env.outputs.mobile_asan == 'true' }}
     needs: env
     name: asan
-    runs-on: ubuntu-20.04
+    runs-on: ${{ needs.env.outputs.agent_ubuntu }}
     timeout-minutes: 180
     container:
       image: ${{ needs.env.outputs.build_image_ubuntu_mobile }}

diff --git a/.github/workflows/mobile-cc_tests.yml b/.github/workflows/mobile-cc_tests.yml
@@ -20,7 +20,7 @@ jobs:
     if: ${{ needs.env.outputs.mobile_cc_tests == 'true' }}
     needs: env
     name: cc_tests
-    runs-on: ubuntu-20.04
+    runs-on: ${{ needs.env.outputs.agent_ubuntu }}
     timeout-minutes: 120
     container:
       image: ${{ needs.env.outputs.build_image_ubuntu }}