bump proxy SHA

Signed-off-by: psbrar99 <[email protected]>
tetratelabs · Jul 26, 2023 · db97970 · db97970
1 parent 00832fb
commit db97970
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/istio.deps b/istio.deps
@@ -4,7 +4,7 @@
     "name": "PROXY_REPO_SHA",
     "repoName": "proxy",
     "file": "",
-    "lastStableSHA": "220f2abf4d0ee5f9c2fca11101cf4607a766ab0c"
+    "lastStableSHA": "33c75fe4994dfbe01aa01dbefe38e74fdef6025f"
   },
   {
     "_comment": "",

diff --git a/tests/integration/pilot/ingress_test.go b/tests/integration/pilot/ingress_test.go
@@ -48,8 +48,6 @@ import (
 	ingressutil "istio.io/istio/tests/integration/security/sds_ingress/util"
 )
 
-<<<<<<< ours
-=======
 func TestGateway(t *testing.T) {
 	framework.
 		NewTest(t).
@@ -282,7 +280,6 @@ spec:
 		})
 }
 
->>>>>>> theirs
 func skipIfIngressClassUnsupported(t framework.TestContext) {
 	if !t.Clusters().Default().MinKubeVersion(18) {
 		t.Skip("IngressClass not supported")