Skip to content

Commit 77c6bfb

Browse files
Updates all versions, notably Go 1.25 and Envoy 1.37 (#490)
Signed-off-by: Adrian Cole <adrian@tetrate.io>
1 parent 336b012 commit 77c6bfb

File tree

15 files changed

+59
-56
lines changed

15 files changed

+59
-56
lines changed

.github/workflows/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#
3131
# e.g. Build func-e on Ubuntu, then end-to-end test on CentOS
3232
# ```bash
33-
# $ docker run --rm -v $PWD:/work func-e-internal:ubuntu-20.04 dist
33+
# $ docker run --rm -v $PWD:/work func-e-internal:ubuntu-24.04 dist
3434
# $ docker run --rm -v $PWD:/work func-e-internal:centos-9 -o build/func-e_linux_amd64/func-e e2e
3535
# ```
3636
#

.github/workflows/commit.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,23 @@ jobs:
4343

4444
steps:
4545
- name: "Checkout"
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v6
4747

48-
- uses: actions/setup-go@v5
48+
- uses: actions/setup-go@v6
4949
with:
5050
cache: false
5151
go-version-file: go.mod
5252

5353
- name: "Cache Go"
54-
uses: actions/cache@v4
54+
uses: actions/cache@v5
5555
with:
5656
path: ~/go/pkg/mod
5757
# go.mod for go release version, go.sum for modules used, and Tools.mk for 'go run' tools
5858
key: test-${{ runner.os }}-go-${{ hashFiles('go.mod', 'go.sum', 'Tools.mk') }}
5959
restore-keys: test-${{ runner.os }}-go-
6060

6161
- name: "Cache Envoy binaries"
62-
uses: actions/cache@v4
62+
uses: actions/cache@v5
6363
with: # ~/.local/share/func-e/envoy-versions is cached so that we only re-download once: for TestFuncEInstall
6464
path: ~/.local/share/func-e/envoy-versions
6565
key: test-${{ runner.os }}-envoy-${{ hashFiles('internal/version/last_known_envoy.txt') }}

.github/workflows/internal-images.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ on:
2323
# ```
2424
jobs:
2525
build-and-push-images:
26-
runs-on: ubuntu-20.04 # Hard-coding an LTS means maintenance, but only once each 2 years!
26+
runs-on: ubuntu-24.04 # Hard-coding an LTS means maintenance, but only once each 2 years!
2727
strategy:
2828
matrix:
2929
include:
3030
- parent_image: quay.io/centos/centos:stream9 # Envoy requires CentOS >=9.
3131
image_tag: centos-9
3232
- parent_image: ubuntu:20.04 # Always match runs-on!
33-
image_tag: ubuntu-20.04
33+
image_tag: ubuntu-24.04
3434

3535
steps:
3636
# Same as doing this locally: echo "${GHCR_TOKEN}" | docker login ghcr.io -u "${GHCR_TOKEN}" --password-stdin
3737
- name: "Login into GitHub Container Registry"
38-
uses: docker/login-action@v1
38+
uses: docker/login-action@v3
3939
with:
4040
registry: ghcr.io
4141
username: ${{ github.repository_owner }}
@@ -49,13 +49,13 @@ jobs:
4949
# We need QEMU and Buildx for multi-platform (amd64+arm64) image push.
5050
# Note: arm64 is run only by Travis. See RATIONALE.md
5151
- name: "Setup QEMU"
52-
uses: docker/setup-qemu-action@v2
52+
uses: docker/setup-qemu-action@v3
5353

5454
- name: "Setup Buildx"
55-
uses: docker/setup-buildx-action@v2
55+
uses: docker/setup-buildx-action@v3
5656

5757
- name: "Checkout"
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v6
5959

6060
# This finds the last two GOROOT variables and parses them into Docker
6161
# build args, so that the resulting image has them at the same location.

.github/workflows/packaging.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ jobs:
3939
runs-on: ubuntu-latest
4040
steps:
4141
- name: "Checkout"
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v6
4343

4444
- name: "Cache Go"
45-
uses: actions/cache@v4
45+
uses: actions/cache@v5
4646
with:
4747
path: ~/go/pkg/mod
4848
# go.mod for go release version, go.sum for modules used, and Tools.mk for 'go run' tools
@@ -58,7 +58,7 @@ jobs:
5858
# Downside of this is that, we pressure the cache capacity set per repository. We delete all caches created
5959
# on PRs on close. See .github/workflows/clear_cache.yaml. On main branch, in any way this cache will be deleted
6060
# in 7 days, also this at most a few MB, so this won't be an issue.
61-
- uses: actions/cache@v4
61+
- uses: actions/cache@v5
6262
id: cache
6363
with:
6464
# Use share the cache containing archives across OSes.
@@ -79,9 +79,9 @@ jobs:
7979
os: [ubuntu-latest, macos-latest]
8080

8181
steps:
82-
- uses: actions/checkout@v4
82+
- uses: actions/checkout@v6
8383

84-
- uses: actions/cache@v4
84+
- uses: actions/cache@v5
8585
id: cache
8686
with:
8787
# We need this cache to run tests.

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: "Checkout"
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v6
2323
with: # fetch all history for all tags and branches (needed for changelog)
2424
fetch-depth: 0
2525

@@ -66,7 +66,7 @@ jobs:
6666

6767
steps:
6868
- name: "Checkout"
69-
uses: actions/checkout@v4
69+
uses: actions/checkout@v6
7070

7171
- name: "Extract `func-e` binary from GitHub release assets"
7272
id: download # allows variables like ${{ steps.download.outputs.X }}

Tools.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# * This does not integrate as cleanly as `go tool`, and only works with make
66
# * This does not provide for a go.sum which would lock the versions of tools.
77

8-
golangci_lint := github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.4.0
9-
gofumpt := mvdan.cc/gofumpt@v0.9.1
8+
golangci_lint := github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.8.0
9+
gofumpt := mvdan.cc/gofumpt@v0.9.2
1010
gosimports := github.com/rinchsan/gosimports/cmd/gosimports@v0.3.8
1111
# sync this with netlify.toml!
1212
hugo := github.com/gohugoio/hugo@v0.148.1
13-
nwa := github.com/B1NARY-GR0UP/nwa@v0.7.5
14-
nfpm := github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.43.1
13+
nwa := github.com/B1NARY-GR0UP/nwa@v0.7.7
14+
nfpm := github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.44.2

USAGE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ To run Envoy, execute `func-e run -c your_envoy_config.yaml`. This
33
downloads and installs the latest version of Envoy for you.
44

55
To list versions of Envoy you can use, execute `func-e versions -a`. To
6-
choose one, invoke `func-e use 1.35.3`. This installs into
7-
`$FUNC_E_DATA_HOME/envoy-versions/1.35.3`, if not already present. You may
8-
also use minor version, such as `func-e use 1.35`.
6+
choose one, invoke `func-e use 1.37.0`. This installs into
7+
`$FUNC_E_DATA_HOME/envoy-versions/1.37.0`, if not already present. You may
8+
also use minor version, such as `func-e use 1.37`.
99

1010
You may want to override `$ENVOY_VERSIONS_URL` to supply custom builds or
1111
otherwise control the source of Envoy binaries. When overriding, validate

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/tetratelabs/func-e
22

3-
// Revlocked to go 1.24 until Envoy Gateway catches up
3+
// Before updating minor check compatibility with Envoy Gateway.
44
// See https://github.com/envoyproxy/gateway/blob/main/go.mod#L3
5-
go 1.24.8
5+
go 1.25.6
66

77
require (
8-
github.com/shirou/gopsutil/v4 v4.25.9
8+
github.com/shirou/gopsutil/v4 v4.25.12
99
github.com/stretchr/testify v1.11.1
1010
github.com/ulikunitz/xz v0.5.15
1111
github.com/urfave/cli/v2 v2.27.7
@@ -15,18 +15,18 @@ require (
1515
require (
1616
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
1717
github.com/davecgh/go-spew v1.1.1 // indirect
18-
github.com/ebitengine/purego v0.9.0 // indirect
18+
github.com/ebitengine/purego v0.9.1 // indirect
1919
github.com/go-ole/go-ole v1.2.6 // indirect
2020
github.com/kr/pretty v0.3.1 // indirect
2121
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
2222
github.com/pmezard/go-difflib v1.0.0 // indirect
2323
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
2424
github.com/rogpeppe/go-internal v1.14.1 // indirect
2525
github.com/russross/blackfriday/v2 v2.1.0 // indirect
26-
github.com/tklauser/go-sysconf v0.3.15 // indirect
27-
github.com/tklauser/numcpus v0.10.0 // indirect
26+
github.com/tklauser/go-sysconf v0.3.16 // indirect
27+
github.com/tklauser/numcpus v0.11.0 // indirect
2828
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
2929
github.com/yusufpapurcu/wmi v1.2.4 // indirect
30-
golang.org/x/sys v0.35.0 // indirect
30+
golang.org/x/sys v0.38.0 // indirect
3131
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
3232
)

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6N
33
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
44
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
55
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6-
github.com/ebitengine/purego v0.9.0 h1:mh0zpKBIXDceC63hpvPuGLiJ8ZAa3DfrFTudmfi8A4k=
7-
github.com/ebitengine/purego v0.9.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
6+
github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
7+
github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
88
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
99
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
1010
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -29,14 +29,14 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
2929
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
3030
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
3131
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
32-
github.com/shirou/gopsutil/v4 v4.25.9 h1:JImNpf6gCVhKgZhtaAHJ0serfFGtlfIlSC08eaKdTrU=
33-
github.com/shirou/gopsutil/v4 v4.25.9/go.mod h1:gxIxoC+7nQRwUl/xNhutXlD8lq+jxTgpIkEf3rADHL8=
32+
github.com/shirou/gopsutil/v4 v4.25.12 h1:e7PvW/0RmJ8p8vPGJH4jvNkOyLmbkXgXW4m6ZPic6CY=
33+
github.com/shirou/gopsutil/v4 v4.25.12/go.mod h1:EivAfP5x2EhLp2ovdpKSozecVXn1TmuG7SMzs/Wh4PU=
3434
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
3535
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
36-
github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
37-
github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
38-
github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
39-
github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ=
36+
github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA=
37+
github.com/tklauser/go-sysconf v0.3.16/go.mod h1:/qNL9xxDhc7tx3HSRsLWNnuzbVfh3e7gh/BmM179nYI=
38+
github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9RXw=
39+
github.com/tklauser/numcpus v0.11.0/go.mod h1:z+LwcLq54uWZTX0u/bGobaV34u6V7KNlTZejzM6/3MQ=
4040
github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
4141
github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
4242
github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
@@ -47,8 +47,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo
4747
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
4848
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4949
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
50-
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
51-
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
50+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
51+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
5252
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5353
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
5454
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

internal/cmd/testdata/func-e_help.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ USAGE:
66
downloads and installs the latest version of Envoy for you.
77

88
To list versions of Envoy you can use, execute `func-e versions -a`. To
9-
choose one, invoke `func-e use 1.35.3`. This installs into
10-
`$FUNC_E_DATA_HOME/envoy-versions/1.35.3`, if not already present. You may
11-
also use minor version, such as `func-e use 1.35`.
9+
choose one, invoke `func-e use 1.37.0`. This installs into
10+
`$FUNC_E_DATA_HOME/envoy-versions/1.37.0`, if not already present. You may
11+
also use minor version, such as `func-e use 1.37`.
1212

1313
You may want to override `$ENVOY_VERSIONS_URL` to supply custom builds or
1414
otherwise control the source of Envoy binaries. When overriding, validate

0 commit comments

Comments
 (0)