From 234e14152024d9c649a4a45c2b8b5fce82ec65bf Mon Sep 17 00:00:00 2001
From: temp <temp@hashicorp.com>
Date: Fri, 20 Oct 2023 14:09:49 -0400
Subject: [PATCH] no-op commit due to failed cherry-picking

---
 .github/scripts/verify_envoy_version.sh    | 5 +++++
 .github/workflows/verify-envoy-version.yml | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/.github/scripts/verify_envoy_version.sh b/.github/scripts/verify_envoy_version.sh
index 773431f50bc8..bfbd969d4baa 100755
--- a/.github/scripts/verify_envoy_version.sh
+++ b/.github/scripts/verify_envoy_version.sh
@@ -17,6 +17,11 @@ if [ -z "$current_branch" ]; then
   exit 1
 fi
 
+if [[ "$SKIP_VERIFY_ENVOY_VERSION" = "true" ]]; then
+  echo -e "*************** VERIFY ENVOY VERSION IS DISABLED. To enable, update environment variable in Github settings *****************"
+  exit 0
+fi
+
 # Get Consul and Envoy version 
 SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 pushd $SCRIPT_DIR/../.. # repository root
diff --git a/.github/workflows/verify-envoy-version.yml b/.github/workflows/verify-envoy-version.yml
index d097e335d37b..cf87959ad4dc 100644
--- a/.github/workflows/verify-envoy-version.yml
+++ b/.github/workflows/verify-envoy-version.yml
@@ -13,6 +13,10 @@ on:
     branches:
       - main
       - release/**
+      - disable_envoy_check
+
+env:
+  SKIP_VERIFY_ENVOY_VERSION: ${{ vars.SKIP_VERIFY_ENVOY_VERSION }}
 
 jobs:
   verify-envoy-version: