Upgrade to istio 1.21 (#129)

Signed-off-by: c00887447 <[email protected]>
Co-authored-by: c00887447 <[email protected]>
Co-authored-by: c00887447 <[email protected]>

Author: 3 people

BUILD

@@ -15,20 +15,12 @@ envoy_cc_binary(
         "//src/application_protocols/brpc:config",
         "//src/application_protocols/trpc:config",
         "@io_istio_proxy//extensions/access_log_policy:access_log_policy_lib",
-        "@io_istio_proxy//extensions/metadata_exchange:metadata_exchange_lib",
         "@io_istio_proxy//extensions/stackdriver:stackdriver_plugin",
         "@io_istio_proxy//source/extensions/common/workload_discovery:api_lib",  # Experimental: WIP
         "@io_istio_proxy//source/extensions/filters/http/alpn:config_lib",
-        "@io_istio_proxy//source/extensions/filters/http/authn:filter_lib",
-        "@io_istio_proxy//source/extensions/filters/http/connect_authority",  # Experimental: ambient
-        "@io_istio_proxy//source/extensions/filters/http/connect_baggage",  # Experimental: ambient
         "@io_istio_proxy//source/extensions/filters/http/istio_stats",
-        "@io_istio_proxy//source/extensions/filters/listener/set_internal_dst_address:filter_lib",  # Experimental: ambient
-        "@io_istio_proxy//source/extensions/filters/network/forward_downstream_sni:config_lib",
-        "@io_istio_proxy//source/extensions/filters/network/istio_authn:config_lib",
+        "@io_istio_proxy//source/extensions/filters/http/peer_metadata:filter_lib",
         "@io_istio_proxy//source/extensions/filters/network/metadata_exchange:config_lib",
-        "@io_istio_proxy//source/extensions/filters/network/sni_verifier:config_lib",
-        "@io_istio_proxy//source/extensions/filters/network/tcp_cluster_rewrite:config_lib",
         "@envoy//source/exe:envoy_main_entry_lib",
     ],
-)
+)

WORKSPACE

@@ -21,31 +21,18 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "io_istio_proxy",
-    strip_prefix = "proxy-1.18.1",
-    sha256 = "ce682bf4bad606bfe5188e85d585a2ba12fec177254381e08da6cb27e8c872a1",
-    url = "https://github.com/istio/proxy/archive/refs/tags/1.18.1.tar.gz",
-)
-
-load(
-    "@io_istio_proxy//bazel:repositories.bzl",
-    "docker_dependencies",
-    "istioapi_dependencies",
-)
-
-istioapi_dependencies()
-
-bind(
-    name = "boringssl_crypto",
-    actual = "//external:ssl",
+    strip_prefix = "proxy-1.21.0",
+    sha256 = "007aa638869bad4e9b4a98c56518d033f59a67774e098307dffaf562832d3fa6",
+    url = "https://github.com/istio/proxy/archive/refs/tags/1.21.0.tar.gz",
 )
 
 # 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
 # 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
 #
-# Commit date: 2023-07-13
-ENVOY_SHA = "5b97cffea6bf0588dc7f6efe43a9822cd376cbea"
+# Commit date: 2024-08-22
+ENVOY_SHA = "2bb4cf1997597a981bc2bf3e500a9ae35787911e"
 
-ENVOY_SHA256 = "53a5c10fd00f6b2023c8341555d794dcd563bb1aa43944a551dc90af3c2e51d8"
+ENVOY_SHA256 = "0b2dc5ae343dd70f13730c16f9025ce4787f4ec60a8a4a1a5bdbab7f378506fc"
 
 ENVOY_ORG = "envoyproxy"
 
@@ -84,7 +71,7 @@ envoy_dependencies()
 
 load("@envoy//bazel:repositories_extra.bzl", "envoy_dependencies_extra")
 
-envoy_dependencies_extra()
+envoy_dependencies_extra(ignore_root_user_error = True)
 
 load("@envoy//bazel:python_dependencies.bzl", "envoy_python_dependencies")
 
@@ -106,62 +93,4 @@ go_repository(
     sum = "h1:po9/4sTYwOU9QPo1XTU8+YLNBPyXgS4nSdIjxNBXtxg=",
     version = "v0.1.12",
     build_external = "external",
-)
-
-# Bazel @rules_pkg
-
-http_archive(
-    name = "rules_pkg",
-    sha256 = "aeca78988341a2ee1ba097641056d168320ecc51372ef7ff8e64b139516a4937",
-    urls = [
-        "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.6-1/rules_pkg-0.2.6.tar.gz",
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.6/rules_pkg-0.2.6.tar.gz",
-    ],
-)
-
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-
-rules_pkg_dependencies()
-
-# Docker dependencies
-
-docker_dependencies()
-
-load(
-    "@io_bazel_rules_docker//repositories:repositories.bzl",
-    container_repositories = "repositories",
-)
-
-container_repositories()
-
-load("@io_bazel_rules_docker//repositories:deps.bzl", container_deps = "deps")
-
-container_deps()
-
-load(
-    "@io_bazel_rules_docker//container:container.bzl",
-    "container_pull",
-)
-
-container_pull(
-    name = "distroless_cc",
-    # Latest as of 10/21/2019. To update, remove this line, re-build, and copy the suggested digest.
-    digest = "sha256:86f16733f25964c40dcd34edf14339ddbb2287af2f7c9dfad88f0366723c00d7",
-    registry = "gcr.io",
-    repository = "distroless/cc",
-)
-
-container_pull(
-    name = "bionic",
-    # Latest as of 10/21/2019. To update, remove this line, re-build, and copy the suggested digest.
-    digest = "sha256:3e83eca7870ee14a03b8026660e71ba761e6919b6982fb920d10254688a363d4",
-    registry = "index.docker.io",
-    repository = "library/ubuntu",
-    tag = "bionic",
-)
-
-# End of docker dependencies
-
-load("//bazel:wasm.bzl", "wasm_dependencies")
-
-wasm_dependencies()
+)

api/meta_protocol_proxy/admin/v1alpha/BUILD

@@ -8,7 +8,7 @@ api_proto_package(
         "@envoy_api//envoy/config/core/v3:pkg",
         "@envoy_api//envoy/type/v3:pkg",
         "@envoy_api//envoy/admin/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
 

api/meta_protocol_proxy/config/route/v1alpha/BUILD

@@ -8,7 +8,7 @@ api_proto_package(
         "@envoy_api//envoy/config/route/v3:pkg",
         "@envoy_api//envoy/type/matcher/v3:pkg",
         "@envoy_api//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )
 

api/meta_protocol_proxy/filters/global_ratelimit/v1alpha/BUILD

@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
      deps = [
         "//api/meta_protocol_proxy/config/route/v1alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@envoy_api//envoy/config/core/v3:pkg",
         "@envoy_api//envoy/config/route/v3:pkg",
         "@envoy_api//envoy/config/ratelimit/v3:pkg"

api/meta_protocol_proxy/filters/istio_stats/v1alpha/BUILD

@@ -5,6 +5,6 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
      deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
      ],
 )

api/meta_protocol_proxy/filters/local_ratelimit/v1alpha/BUILD

@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
      deps = [
         "//api/meta_protocol_proxy/config/route/v1alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
         "@envoy_api//envoy/type/v3:pkg",
         "@envoy_api//envoy/config/core/v3:pkg",
         "@envoy_api//envoy/config/route/v3:pkg",

api/meta_protocol_proxy/filters/metadata_exchange/v1alpha/BUILD

@@ -5,6 +5,6 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
      deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
      ],
 )

api/meta_protocol_proxy/filters/router/v1alpha/BUILD

@@ -4,5 +4,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

api/meta_protocol_proxy/v1alpha/BUILD

@@ -21,7 +21,7 @@ api_proto_package(
         "@envoy_api//envoy/config/route/v3:pkg",
         "@envoy_api//envoy/type/matcher/v3:pkg",
         "@envoy_api//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )