Skip to content

Commit

Permalink
Merge pull request #5807 from emissary-ingress/flynn/update
Browse files Browse the repository at this point in the history
Update Envoy, go-control-plane, Go, and dependencies
  • Loading branch information
kflynn authored Dec 5, 2024
2 parents 02e8831 + 2b124a9 commit 20e3f63
Show file tree
Hide file tree
Showing 739 changed files with 24,978 additions and 12,771 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-branch-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ name: Check branch version

jobs:
check-branch-version:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
with:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/execute-tests-and-promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: job-promote-to-passed

jobs:
lint: ########################################################################
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand All @@ -30,7 +30,7 @@ jobs:
if: always()

generate: ####################################################################
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
if: always()

check-envoy-protos: ####################################################################
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
if: always()

check-envoy-version: #########################################################
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:

# Tests ######################################################################
apiext-e2e:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
run: |
go test -p 1 -parallel 1 -v -tags=apiext ./test/apiext/... -timeout 15m
check-gotest:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand All @@ -193,7 +193,7 @@ jobs:
- uses: ./.github/actions/after-job
if: always()
check-pytest:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
with:
jobname: check-pytest-${{ matrix.test }}
check-pytest-unit:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand Down Expand Up @@ -277,7 +277,7 @@ jobs:
- uses: ./.github/actions/after-job
if: always()
check-chart:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
DEV_REGISTRY: ${{ secrets.DEV_REGISTRY }}
# See docker/base-python.docker.gen
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
if: always()

build: #######################################################################
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
DEV_REGISTRY: ${{ secrets.DEV_REGISTRY }}
# See docker/base-python.docker.gen
Expand Down Expand Up @@ -347,7 +347,7 @@ jobs:
######################################################################
######################### CVE Scanning ###############################
trivy-container-scan:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [build]
steps:
# upload of results to github uses git so checkout of code is needed
Expand Down Expand Up @@ -388,7 +388,7 @@ jobs:
- check-pytest-unit
- check-chart
- trivy-container-scan
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: No-Op
if: ${{ false }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-base-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- cron: '0 12 * * SUN'
jobs:
generate: ####################################################################
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/k8s-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: k8s-e2e

jobs:
acceptance_tests:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
# See docker/base-python.docker.gen
BASE_PYTHON_REPO: ${{ secrets.BASE_PYTHON_REPO }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/promote-ga.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: promote-to-ga
- 'v[0-9]+.[0-9]+.[0-9]+'
jobs:
promote-to-ga:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: promote-to-ga
env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
- uses: ./.github/actions/after-job
if: always()
create-gh-release:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [promote-to-ga]
name: "Create GitHub release"
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/promote-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: promote-to-rc
- 'v[0-9]+.[0-9]+.[0-9]+-dev'
jobs:
promote-to-rc:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: promote-to-rc
env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: chart-publish
- 'chart/v*'
jobs:
chart-publish:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: chart-publish
env:
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
if: always()
chart-create-gh-release:
if: ${{ ! contains(github.ref, '-') }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [chart-publish]
name: "Create GitHub release"
steps:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ it will be removed; but as it won't be user-visible this isn't considered a brea
releases, or a `Host` with or without a `TLSContext` as in prior 2.y releases.

- Bugfix: Prior releases of Emissary-ingress had the arbitrary limitation that a `TCPMapping` cannot
be used on the same port that HTTP is served on, even if TLS+SNI would make this possible.
be used on the same port that HTTP is served on, even if TLS+SNI would make this possible.
Emissary-ingress now allows `TCPMappings` to be used on the same `Listener` port as HTTP `Hosts`,
as long as that `Listener` terminates TLS.

Expand Down Expand Up @@ -567,7 +567,7 @@ it will be removed; but as it won't be user-visible this isn't considered a brea
releases, or a `Host` with or without a `TLSContext` as in prior 2.y releases.

- Bugfix: Prior releases of Emissary-ingress had the arbitrary limitation that a `TCPMapping` cannot
be used on the same port that HTTP is served on, even if TLS+SNI would make this possible.
be used on the same port that HTTP is served on, even if TLS+SNI would make this possible.
Emissary-ingress now allows `TCPMappings` to be used on the same `Listener` port as HTTP `Hosts`,
as long as that `Listener` terminates TLS.

Expand Down
Loading

0 comments on commit 20e3f63

Please sign in to comment.