From 90b7953f5b6ffe617fa630d42ea6d5b65fba1b9e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 29 Oct 2024 18:51:52 +0000
Subject: [PATCH] chore(deps): update envoy 1.30.x to v1.30.7

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ENVOY_VERSION                    |  2 +-
 WORKSPACE                        |  6 ++----
 patches/0006-googleurl-dep.patch | 31 -------------------------------
 3 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 patches/0006-googleurl-dep.patch

diff --git a/ENVOY_VERSION b/ENVOY_VERSION
index 4cd18fd21..797b27abb 100644
--- a/ENVOY_VERSION
+++ b/ENVOY_VERSION
@@ -1 +1 @@
-envoy-1.30.6
+envoy-1.30.7
diff --git a/WORKSPACE b/WORKSPACE
index 5178472f3..8c898f9b5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -14,8 +14,8 @@ ENVOY_REPO = "envoy"
 #
 # No other line in this file may have ENVOY_SHA followed by an equals sign!
 #
-# renovate: datasource=github-releases depName=envoyproxy/envoy digestVersion=v1.30.6
-ENVOY_SHA = "810bfcb8cae456e3a5e6541a0ee853185e2586f7"
+# renovate: datasource=github-releases depName=envoyproxy/envoy digestVersion=v1.30.7
+ENVOY_SHA = "349011c2ebd40f070510e34f4605bff1da64fb0e"
 
 # // clang-format off: unexpected @bazel_tools reference, please indirect via a definition in //bazel
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
@@ -39,8 +39,6 @@ git_repository(
         # https://github.com/envoyproxy/envoy/pull/31894
         "@//patches:0004-Patch-cel-cpp-to-not-break-build.patch",
         "@//patches:0005-original_dst_cluster-Avoid-multiple-hosts-for-the-sa.patch",
-        # This is for https://github.com/envoyproxy/envoy/pull/36515
-        "@//patches:0006-googleurl-dep.patch",
     ],
     # // clang-format off: Envoy's format check: Only repository_locations.bzl may contains URL references
     remote = "https://github.com/envoyproxy/envoy.git",
diff --git a/patches/0006-googleurl-dep.patch b/patches/0006-googleurl-dep.patch
deleted file mode 100644
index 47eb54121..000000000
--- a/patches/0006-googleurl-dep.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 55b0fc45cfdc2c0df002690606853540cf794fab Mon Sep 17 00:00:00 2001
-From: alyssawilk <alyssar@chromium.org>
-Date: Wed, 9 Oct 2024 16:23:02 -0400
-Subject: [PATCH] ci: change googleurl dep (#36515)
-
-backing file temporarily deleted and re-updated (with a new hash)
-
-Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
----
- bazel/repository_locations.bzl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl
-index b6e02d489b..e42a6e7e2f 100644
---- a/bazel/repository_locations.bzl
-+++ b/bazel/repository_locations.bzl
-@@ -1222,9 +1222,9 @@ REPOSITORY_LOCATIONS_SPEC = dict(
-         project_name = "Chrome URL parsing library",
-         project_desc = "Chrome URL parsing library",
-         project_url = "https://quiche.googlesource.com/googleurl",
--        # Static snapshot of https://quiche.googlesource.com/googleurl/+archive/dd4080fec0b443296c0ed0036e1e776df8813aa7.tar.gz
-         version = "dd4080fec0b443296c0ed0036e1e776df8813aa7",
--        sha256 = "59f14d4fb373083b9dc8d389f16bbb817b5f936d1d436aa67e16eb6936028a51",
-+        sha256 = "fc694942e8a7491dcc1dde1bddf48a31370a1f46fef862bc17acf07c34dc6325",
-+        # Static snapshot of https://quiche.googlesource.com/googleurl/+archive/dd4080fec0b443296c0ed0036e1e776df8813aa7.tar.gz
-         urls = ["https://storage.googleapis.com/quiche-envoy-integration/{version}.tar.gz"],
-         use_category = ["controlplane", "dataplane_core"],
-         extensions = [],
--- 
-2.46.2
-