From 62a07b4204cc6292d077fddca8672804455e27f1 Mon Sep 17 00:00:00 2001 From: John Murret Date: Fri, 22 Dec 2023 08:56:48 -0700 Subject: [PATCH] update makefile, compatibility tests, and nightlies to use latest envoy. (#20048) --- .github/workflows/nightly-test-integrations.yml | 2 +- .github/workflows/test-integrations.yml | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly-test-integrations.yml b/.github/workflows/nightly-test-integrations.yml index a79d102b5e..32e09f2e34 100644 --- a/.github/workflows/nightly-test-integrations.yml +++ b/.github/workflows/nightly-test-integrations.yml @@ -196,7 +196,7 @@ jobs: consul-version: [ "1.16", "1.17"] env: CONSUL_LATEST_VERSION: ${{ matrix.consul-version }} - ENVOY_VERSION: "1.25.4" + ENVOY_VERSION: "1.28.0" steps: - name: Checkout code uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index 4dbbedf092..ebcf70bb65 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -383,7 +383,7 @@ jobs: id-token: write # NOTE: this permission is explicitly required for Vault auth. contents: read env: - ENVOY_VERSION: "1.25.4" + ENVOY_VERSION: "1.28.0" CONSUL_DATAPLANE_IMAGE: "docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi" steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 diff --git a/Makefile b/Makefile index 228c377956..ca186b426f 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ GO_BUILD_TAG?=consul-build-go UI_BUILD_TAG?=consul-build-ui BUILD_CONTAINER_NAME?=consul-builder CONSUL_IMAGE_VERSION?=latest -ENVOY_VERSION?='1.25.4' +ENVOY_VERSION?='1.28.0' CONSUL_DATAPLANE_IMAGE := $(or $(CONSUL_DATAPLANE_IMAGE),"docker.io/hashicorppreview/consul-dataplane:1.3-dev-ubi") DEPLOYER_CONSUL_DATAPLANE_IMAGE := $(or $(DEPLOYER_CONSUL_DATAPLANE_IMAGE), "docker.io/hashicorppreview/consul-dataplane:1.3-dev")