Skip to content

update envoy with latest build fixes #2147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
istio-testing merged 3 commits into from
Mar 8, 2019
Merged

update envoy with latest build fixes #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf43c22
update envoy with latest build fixes
lizan Mar 7, 2019
054ab08
update protobuf to match envoy
lizan Mar 8, 2019
9933558
timeSystem -> timeSource
lizan Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ bind(
# When updating envoy sha manually please update the sha in istio.deps file also
#
# Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz`
ENVOY_SHA = "925810d00b0d3095a8e67fd4e04e0f597ed188bb"
ENVOY_SHA = "b89162d83f2d18328d45c4376e016b676afb3af7"

ENVOY_SHA256 = "26d1f14e881455546cf0e222ec92a8e1e5f65cb2c5761d63c66598b39cd9c47d"
ENVOY_SHA256 = "acda2888a0aa3a6d1f5d54bd901c8d00ffe864fd89bfc719e0c1a4c2d5ad3ce2"

http_archive(
name = "envoy",
Expand All @@ -46,7 +46,7 @@ http_archive(
url = "https://github.com/envoyproxy/envoy/archive/" + ENVOY_SHA + ".tar.gz",
)

load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
load("@envoy//bazel:repositories.bzl", "GO_VERSION", "envoy_dependencies")

envoy_dependencies()

Expand All @@ -62,20 +62,8 @@ load("@envoy_api//bazel:repositories.bzl", "api_dependencies")

api_dependencies()

load("@io_bazel_rules_go//go:def.bzl", "go_register_toolchains", "go_rules_dependencies")
load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")

go_rules_dependencies()

go_register_toolchains()

# Nov 28, 2017 (bazel 0.8.0 support)
RULES_PROTOBUF_SHA = "563b674a2ce6650d459732932ea2bc98c9c9a9bf"

RULES_PROTOBUF_SHA256 = "338e0d65cd709c6a6f9b5702466e641d536479be8b564d1e12a5d1de22a5cff6"

http_archive(
name = "org_pubref_rules_protobuf",
sha256 = RULES_PROTOBUF_SHA256,
strip_prefix = "rules_protobuf-" + RULES_PROTOBUF_SHA,
url = "https://github.com/pubref/rules_protobuf/archive/" + RULES_PROTOBUF_SHA + ".tar.gz",
)
go_register_toolchains(go_version = GO_VERSION)
2 changes: 1 addition & 1 deletion istio.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"name": "ENVOY_SHA",
"repoName": "envoyproxy/envoy",
"file": "WORKSPACE",
"lastStableSHA": "925810d00b0d3095a8e67fd4e04e0f597ed188bb"
"lastStableSHA": "b89162d83f2d18328d45c4376e016b676afb3af7"
}
]
4 changes: 2 additions & 2 deletions protobuf.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

# Match SHA used by Envoy
PROTOBUF_SHA = "7492b5681231c79f0265793fa57dc780ae2481d6"
PROTOBUF_SHA256 = "46f1da3a6a6db66dd240cf95a5553198f7c6e98e6ac942fceb8a1cf03291d96e"
PROTOBUF_SHA = "582743bf40c5d3639a70f98f183914a2c0cd0680"
PROTOBUF_SHA256 = "cf9e2fb1d2cd30ec9d51ff1749045208bd641f290f64b85046485934b0e03783"

def protobuf_repositories(load_repo = True, bind = True):
if load_repo:
Expand Down
4 changes: 2 additions & 2 deletions src/envoy/http/mixer/control.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ Control::Control(ControlDataSharedPtr control_data,
: control_data_(control_data),
check_client_factory_(Utils::GrpcClientFactoryForCluster(
control_data_->config().check_cluster(), cm, scope,
dispatcher.timeSystem())),
dispatcher.timeSource())),
report_client_factory_(Utils::GrpcClientFactoryForCluster(
control_data_->config().report_cluster(), cm, scope,
dispatcher.timeSystem())),
dispatcher.timeSource())),
stats_obj_(dispatcher, control_data_->stats(),
control_data_->config()
.config_pb()
Expand Down
4 changes: 2 additions & 2 deletions src/envoy/tcp/mixer/control.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ Control::Control(ControlDataSharedPtr control_data,
dispatcher_(dispatcher),
check_client_factory_(Utils::GrpcClientFactoryForCluster(
control_data_->config().check_cluster(), cm, scope,
dispatcher.timeSystem())),
dispatcher.timeSource())),
report_client_factory_(Utils::GrpcClientFactoryForCluster(
control_data_->config().report_cluster(), cm, scope,
dispatcher.timeSystem())),
dispatcher.timeSource())),
stats_obj_(dispatcher, control_data_->stats(),
control_data_->config()
.config_pb()
Expand Down