Builds with Go 1.19 (#437)

This updates the build to use Go 1.9 and addresses drift on the most recent Envoy version. This also addresses some build implications that came up recently, for example osslsigncode doesn't work at the moment on macos (at least not in homebrew). Also, Envoy no longer works on CentOS 8. Signed-off-by: Adrian Cole <[email protected]>
tetratelabs · Jan 6, 2023 · 68c7393 · 68c7393
1 parent f209f48
commit 68c7393
Show file tree

Hide file tree

Showing 13 changed files with 81 additions and 68 deletions.
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -14,29 +14,32 @@
 # intended to run arm64 with Travis (as opposed to via emulation). In any case,
 # all matrixes should be pushed for local debugging.
 #
-# Ex. Build the images:
+# e.g. Build the images:
 # ```bash
-# for parent_image in ubuntu:20.04 centos:8; do docker buildx build \
-#                --platform linux/amd64 \
-#                --build-arg parent_image=${parent_image} \
-#                --build-arg go_stable_release=1_18 \
-#                --build-arg go_stable_revision=1.18.1 \
-#                --build-arg go_prior_release=1_17 \
-#                --build-arg go_prior_revision=1.17.9 \
-#                -t func-e-internal:${parent_image//:/-} .github/workflows; done
+# parent_image=quay.io/centos/centos:stream9
+# image_tag=centos-9
+# docker-buildx build \
+#   --platform linux/amd64 \
+#   --build-arg parent_image=${parent_image} \
+#   --build-arg go_stable_release=1_19 \
+#   --build-arg go_stable_revision=1.19.4 \
+#   --build-arg go_prior_release=1_18 \
+#   --build-arg go_prior_revision=1.18.8 \
+#   -t func-e-internal:${image_tag} .github/workflows
 # ```
 #
-# Ex. Build func-e on Ubuntu, then end-to-end test on CentOS
+# e.g. Build func-e on Ubuntu, then end-to-end test on CentOS
 # ```bash
 # $ docker run --rm -v $PWD:/work func-e-internal:ubuntu-20.04 dist
-# $ docker run --rm -v $PWD:/work func-e-internal:centos-8 -o build/func-e_linux_amd64/func-e e2e
+# $ docker run --rm -v $PWD:/work func-e-internal:centos-9 -o build/func-e_linux_amd64/func-e e2e
 # ```
 #
 # You can troubleshoot like this:
 # ```bash
-# $ docker run --rm -v $PWD:/work -it --entrypoint /bin/bash func-e-internal:centos-8
+# $ docker run --rm -v $PWD:/work -it --entrypoint /bin/bash func-e-internal:centos-9
 # ```
-ARG parent_image=centos:8
+# https://quay.io/repository/centos/centos?tag=stream9&tab=tags
+ARG parent_image=quay.io/centos/centos:stream9
 
 # This section looks odd, but it is needed to match conventions of the GitHub
 # Actions runner. For example, TARGETARCH in Docker is "amd64" whereas GitHub
@@ -61,9 +64,6 @@ ARG centos_packages="make sudo"
 # Ubuntu runs check, dist, and e2e, so needs more packages.
 ARG ubuntu_packages="make sudo curl git zip wixl msitools osslsigncode"
 RUN if [ -f /etc/centos-release ]; then \
-    # Change mirrors to vault.centos.org because CentOS 8 went EOL.
-    sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \
-    sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && \
     # Use Dandified YUM on CentOS >=8.
     dnf="dnf -qy" && ${dnf} install ${centos_packages} && ${dnf} clean all; \
     else \
@@ -85,11 +85,11 @@ ARG TARGETARCH
 # normal runners and Docker, with version skew bounded by image push frequency.
 # See https://github.com/actions/virtual-environments for current versions.
 #
-# go_XXX_release is the underscore delimited release version. Ex. "1_17"
-# go_XXX_revision is the full version number. Ex. "1.17.1"
+# go_XXX_release is the underscore delimited release version. e.g. "1_19"
+# go_XXX_revision is the full version number. e.g. "1.19.4"
 #
 # These are used along with the architecture to build GOROOT variables.
-# Ex. GOROOT_1_17_X64=/opt/hostedtoolcache/go/1.17.1/x64
+# e.g. GOROOT_1_19_X64=/opt/hostedtoolcache/go/1.19.4/x64
 ARG go_stable_revision
 ARG go_stable_url=https://golang.org/dl/go${go_stable_revision}.linux-${TARGETARCH}.tar.gz
 ARG goroot_stable=${runner_tool_cache}/go/${go_stable_revision}/${arch_lc}

diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
@@ -82,7 +82,7 @@ jobs:
         if: runner.os == 'Linux'
         run: docker run --rm -v $HOME/.func-e:$HOME/.func-e -v $PWD:/work ${CENTOS_IMAGE} -o ${E2E_FUNC_E_PATH}/func-e e2e
         env:  # CENTOS_IMAGE was built by internal-images.yaml; E2E_FUNC_E_PATH was built via `make build`
-          CENTOS_IMAGE: ghcr.io/tetratelabs/func-e-internal:centos-8
+          CENTOS_IMAGE: ghcr.io/tetratelabs/func-e-internal:centos-9
           E2E_FUNC_E_PATH: build/func-e_linux_amd64
 
       - name: "Generate coverage report"  # only once (not per OS)

diff --git a/.github/workflows/internal-images.yml b/.github/workflows/internal-images.yml
@@ -13,12 +13,12 @@ on:
 #
 # To test this, try running end-to-end (e2e) tests!
 # ```bash
-# $ docker run --pull always --rm -v $PWD:/work ghcr.io/tetratelabs/func-e-internal:centos-8 e2e
+# $ docker run --pull always --rm -v $PWD:/work ghcr.io/tetratelabs/func-e-internal:centos-9 e2e
 # ```
 #
 # Make is the default entrypoint. To troubleshoot, use /bin/bash:
 # ```bash
-# $ docker run --pull always --rm -v $PWD:/work -it --entrypoint /bin/bash ghcr.io/tetratelabs/func-e-internal:centos-8
+# $ docker run --pull always --rm -v $PWD:/work -it --entrypoint /bin/bash ghcr.io/tetratelabs/func-e-internal:centos-9
 # [runner@babce89b5580 work]$
 # ```
 jobs:
@@ -27,8 +27,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - parent_image: centos:8  # Envoy requires CentOS >=8. See tetratelabs/archive-envoy#17
+          - parent_image: quay.io/centos/centos:stream9  # Envoy requires CentOS >=9.
+            image_tag: centos-9
           - parent_image: ubuntu:20.04  # Always match runs-on!
+            image_tag: ubuntu-20.04
 
     steps:
       # Same as doing this locally: echo "${GHCR_TOKEN}" | docker login ghcr.io -u "${GHCR_TOKEN}" --password-stdin
@@ -61,8 +63,8 @@ jobs:
       # We do this to allow pull requests to update go.mod with a new Golang
       # release without worrying if the Docker image has it, yet.
       #
-      # Ex. GOROOT_1_17_X64=/opt/hostedtoolcache/go/1.17.1/x64 ->
-      #     GO_STABLE_RELEASE=1_17, GO_STABLE_REVISION=1.17.1
+      # Ex. GOROOT_1_19_X64=/opt/hostedtoolcache/go/1.19.4/x64 ->
+      #     GO_STABLE_RELEASE=1_19, GO_STABLE_REVISION=1.19.4
       - name: "Find and parse last two GOROOTs"
         run: |  # Until Go releases hit triple digits, we can use simple ordering.
           goroot_stable_env=$(env|grep GOROOT_|sort -n|tail -1)
@@ -75,7 +77,7 @@ jobs:
 
       - name: "Build and push"
         run: |
-          docker_tag=ghcr.io/${{ github.repository_owner }}/func-e-internal:${PARENT_IMAGE//:/-}
+          docker_tag=ghcr.io/${{ github.repository_owner }}/func-e-internal:${IMAGE_TAG}
           docker buildx build --push \
             --platform linux/amd64,linux/arm64 \
             --build-arg parent_image=${PARENT_IMAGE} \
@@ -86,3 +88,4 @@ jobs:
             -t ${docker_tag} .github/workflows
         env:
           PARENT_IMAGE: ${{ matrix.parent_image }}
+          IMAGE_TAG: ${{ matrix.image_tag }}
diff --git a/.github/workflows/packaging.yaml b/.github/workflows/packaging.yaml
@@ -45,9 +45,22 @@ jobs:
           # See https://github.com/actions/virtual-environments/issues/3857
           - os: ubuntu-20.04  # Hard-coding an LTS means maintenance, but only once each 2 years!
             setup: sudo apt update -qq && sudo apt install -qq -y wixl msitools osslsigncode
-          # macos is missing wixl https://github.com/actions/virtual-environments/issues/3857
-          - os: macos-12
-            setup: brew install -q msitools osslsigncode
+
+          # MacOS is missing wixl, but could work with `brew install -q msitools osslsigncode`
+          # https://github.com/actions/virtual-environments/issues/3857
+          #
+          # However, osslsigncode is broken as of Jan 2023 like so:
+          #   codesign   signing build/func-e_windows_amd64/func-e.exe
+          #   make: *** [build/func-e_windows_amd64/func-e.exe.signed] Error 255
+          #   Failed to parse PKCS#12 file: packaging/msi/func-e.p12 (Wrong password?)
+          #   0096371801000000:error:0308010C:digital envelope routines:inner_evp_generic_fetch:unsupported:crypto/evp/evp_fetch.c:373:Global default library context, Algorithm (RC2-40-CBC : 0), Properties ()
+          #
+          # Also, homebrew removed the ability to install old versions, as well
+          # the ability to install from a raw URL. Until this works again,
+          # verification of packaging commands on MacOS is disabled. This is ok
+          # because they are verified on two other platforms, including Ubuntu,
+          # which is the platform used in the release workflow.
+
           # wixtoolset isn't in the path https://github.com/wixtoolset/wix3/blob/develop/src/Setup/CoreMsi/Toolset.wxs#L87
           - os: windows-2022
             setup: |
@@ -99,4 +112,4 @@ jobs:
         if: runner.os == 'Linux'
         run: docker run --rm -v $PWD:/work --entrypoint packaging/nfpm/verify_rpm.sh ${CENTOS_IMAGE}
         env:  # CENTOS_IMAGE was built by internal-images.yaml
-          CENTOS_IMAGE: ghcr.io/tetratelabs/func-e-internal:centos-8
+          CENTOS_IMAGE: ghcr.io/tetratelabs/func-e-internal:centos-9
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -110,4 +110,4 @@ jobs:
           docker run --rm -v $PWD:/work --entrypoint packaging/nfpm/verify_rpm.sh ${CENTOS_IMAGE}
         env:  # authenticate release downloads as drafts are not public
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CENTOS_IMAGE: ghcr.io/tetratelabs/func-e-internal:centos-8  # See internal-images.yaml
+          CENTOS_IMAGE: ghcr.io/tetratelabs/func-e-internal:centos-9  # See internal-images.yaml
diff --git a/.golangci.yml b/.golangci.yml
@@ -34,7 +34,6 @@ linters:
     - "gofmt"
     - "gocyclo"
     - "goimports"
-    - "revive"
     - "gosec"
     - "gosimple"
     - "lll"
@@ -48,6 +47,7 @@ linters:
   disable:
     - "gochecknoglobals"
     - "gochecknoinits"
+    - "revive"  # pedantic about package docs
 
 # all available settings of specific linters
 linters-settings:

diff --git a/Tools.mk b/Tools.mk
@@ -1,9 +1,9 @@
 # Copyright 2021 Tetrate
 # Licensed under the Apache License, Version 2.0 (the "License")
 
-golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2
-goimports     := golang.org/x/tools/cmd/goimports@v0.1.10
+golangci_lint := github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
+goimports     := golang.org/x/tools/cmd/goimports@v0.5.0
 # sync this with netlify.toml!
-hugo          := github.com/gohugoio/hugo@v0.99.1
+hugo          := github.com/gohugoio/hugo@v0.109.0
 licenser      := github.com/liamawhite/[email protected]
-nfpm          := github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.15.1
+nfpm          := github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.23.0
diff --git a/USAGE.md b/USAGE.md
@@ -3,9 +3,9 @@ To run Envoy, execute `func-e run -c your_envoy_config.yaml`. This
 downloads and installs the latest version of Envoy for you.
 
 To list versions of Envoy you can use, execute `func-e versions -a`. To
-choose one, invoke `func-e use 1.23.1`. This installs into
-`$FUNC_E_HOME/versions/1.23.1`, if not already present. You may also use
-minor version, such as `func-e use 1.23`.
+choose one, invoke `func-e use 1.24.1`. This installs into
+`$FUNC_E_HOME/versions/1.24.1`, if not already present. You may also use
+minor version, such as `func-e use 1.24`.
 
 You may want to override `$ENVOY_VERSIONS_URL` to supply custom builds or
 otherwise control the source of Envoy binaries. When overriding, validate

diff --git a/go.mod b/go.mod
@@ -1,12 +1,11 @@
 module github.com/tetratelabs/func-e
 
-// This project uses go:embed, so requires minimally go 1.16
-go 1.18
+go 1.19
 
 require (
-	github.com/shirou/gopsutil/v3 v3.22.9
+	github.com/shirou/gopsutil/v3 v3.22.12
 	github.com/stretchr/testify v1.8.1
-	github.com/ulikunitz/xz v0.5.10
+	github.com/ulikunitz/xz v0.5.11
 	github.com/urfave/cli/v2 v2.8.1
 	golang.org/x/sync v0.1.0
 )
@@ -17,12 +16,12 @@ require (
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
+	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.10 // indirect
-	github.com/tklauser/numcpus v0.5.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.11 // indirect
+	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -14,26 +14,25 @@ github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQ
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
-github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b h1:0LFwY6Q3gMACTjAbMZBjXAqTOzOwFaj2Ld6cjeQ7Rig=
+github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/shirou/gopsutil/v3 v3.22.9 h1:yibtJhIVEMcdw+tCTbOPiF1VcsuDeTE4utJ8Dm4c5eA=
-github.com/shirou/gopsutil/v3 v3.22.9/go.mod h1:bBYl1kjgEJpWpxeHmLI+dVHWtyAwfcmSBLDsp2TNT8A=
+github.com/shirou/gopsutil/v3 v3.22.12 h1:oG0ns6poeUSxf78JtOsfygNWuEHYYz8hnnNg7P04TJs=
+github.com/shirou/gopsutil/v3 v3.22.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
-github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
-github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
-github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A=
-github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo=
-github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
-github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
+github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
+github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
+github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
+github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
+github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/urfave/cli/v2 v2.8.1 h1:CGuYNZF9IKZY/rfBe3lJpccSoIY1ytfvmgQT90cNOl4=
 github.com/urfave/cli/v2 v2.8.1/go.mod h1:Z41J9TPoffeoqP0Iza0YbAhGvymRdZAd2uPmZ5JxRdY=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
@@ -44,11 +43,10 @@ golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/internal/version/last_known_envoy.txt b/internal/version/last_known_envoy.txt
@@ -1 +1 @@
-1.23.1
+1.24.1
diff --git a/netlify.toml b/netlify.toml
@@ -3,7 +3,7 @@
   publish = "public"
 
 [build.environment]
-  HUGO_VERSION = "0.99.1"
+  HUGO_VERSION = "0.109.0"
 
 [context.production]
   command = "git submodule update --init && hugo --gc --minify"

diff --git a/packaging/nfpm/func-e.8 b/packaging/nfpm/func-e.8
@@ -32,9 +32,9 @@ To run Envoy, execute `func-e run -c your_envoy_config.yaml`. This
 downloads and installs the latest version of Envoy for you.
 
 To list versions of Envoy you can use, execute `func-e versions -a`. To
-choose one, invoke `func-e use 1.23.1`. This installs into
-`$FUNC_E_HOME/versions/1.23.1`, if not already present. You may also use
-minor version, such as `func-e use 1.23`.
+choose one, invoke `func-e use 1.24.1`. This installs into
+`$FUNC_E_HOME/versions/1.24.1`, if not already present. You may also use
+minor version, such as `func-e use 1.24`.
 
 You may want to override `$ENVOY_VERSIONS_URL` to supply custom builds or
 otherwise control the source of Envoy binaries. When overriding, validate