forked from emissary-ingress/emissary
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request emissary-ingress#4292 from emissary-ingress/envoy-…
…upgrade [v3.0] upgrade envoy
- v3.2.0
- v3.2.0-rc.4
- v3.2.0-rc.3
- v3.2.0-rc.2
- v3.2.0-rc.1
- v3.2.0-rc.0
- v3.2.0-dev
- v3.1.0
- v3.1.0-rc.1
- v3.1.0-rc.0
- v3.0.0
- v3.0.0-rc.0
- chart/v8.2.0
- chart/v8.2.0-rc.4
- chart/v8.2.0-rc.3
- chart/v8.2.0-rc.2
- chart/v8.2.0-rc.1
- chart/v8.2.0-rc.0
- chart/v8.2.0-dev
- chart/v8.1.0
- chart/v8.1.0-rc.1
- chart/v8.1.0-rc.0
- chart/v8.0.0
- chart/v8.0.0-rc.0
Showing
1,900 changed files
with
193,011 additions
and
201,237 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ RSYNC_EXTRAS ?= | |
|
||
# IF YOU MESS WITH ANY OF THESE VALUES, YOU MUST RUN `make update-base`. | ||
ENVOY_REPO ?= $(if $(IS_PRIVATE),[email protected]:datawire/envoy-private.git,https://github.com/datawire/envoy.git) | ||
ENVOY_COMMIT ?= 8151e9a87cde33721a1b1f864d0c54ae72e4aa78 | ||
ENVOY_COMMIT ?= f96adbeb45342bb8b37345df11fc395aa4b1fcda | ||
ENVOY_COMPILATION_MODE ?= opt | ||
# Increment BASE_ENVOY_RELVER on changes to `docker/base-envoy/Dockerfile`, or Envoy recipes. | ||
# You may reset BASE_ENVOY_RELVER when adjusting ENVOY_COMMIT. | ||
|
@@ -33,7 +33,7 @@ RSYNC_EXTRAS ?= | |
# which commits are ancestors, I added `make guess-envoy-go-control-plane-commit` to do that in an | ||
# automated way! Still look at the commit yourself to make sure it seems sane; blindly trusting | ||
# machines is bad, mmkay? | ||
ENVOY_GO_CONTROL_PLANE_COMMIT = f1f47757da33f7507078cf7e9e60915418c7bd10 | ||
ENVOY_GO_CONTROL_PLANE_COMMIT = v0.10.1 | ||
|
||
# Set ENVOY_DOCKER_REPO to the list of mirrors that we should | ||
# sanity-check that things get pushed to. | ||
|
@@ -249,16 +249,16 @@ envoy-shell: $(ENVOY_BASH.deps) | |
# These targets are depended on by `make generate` in `build-aux/generate.mk`. | ||
|
||
# Raw protobufs | ||
$(OSS_HOME)/api/envoy $(OSS_HOME)/api/pb: $(OSS_HOME)/api/%: $(OSS_HOME)/_cxx/envoy | ||
$(OSS_HOME)/api/envoy: $(OSS_HOME)/api/%: $(OSS_HOME)/_cxx/envoy | ||
rsync --recursive --delete --delete-excluded --prune-empty-dirs --include='*/' --include='*.proto' --exclude='*' $</api/$*/ $@ | ||
|
||
# Go generated from the protobufs | ||
$(OSS_HOME)/_cxx/envoy/build_go: $(ENVOY_BASH.deps) FORCE | ||
$(call ENVOY_BASH.cmd, \ | ||
$(ENVOY_DOCKER_EXEC) python3 -c 'from tools.api.generate_go_protobuf import generateProtobufs; generateProtobufs("/root/envoy/build_go")'; \ | ||
$(ENVOY_DOCKER_EXEC) python3 -c 'from tools.api.generate_go_protobuf import generate_protobufs; generate_protobufs("@envoy_api//...", "/root/envoy/build_go", "envoy_api")'; \ | ||
) | ||
test -d $@ && touch $@ | ||
$(OSS_HOME)/pkg/api/pb $(OSS_HOME)/pkg/api/envoy: $(OSS_HOME)/pkg/api/%: $(OSS_HOME)/_cxx/envoy/build_go | ||
$(OSS_HOME)/pkg/api/envoy: $(OSS_HOME)/pkg/api/%: $(OSS_HOME)/_cxx/envoy/build_go | ||
rm -rf $@ | ||
@PS4=; set -ex; { \ | ||
unset GIT_DIR GIT_WORK_TREE; \ | ||
|
@@ -269,7 +269,6 @@ $(OSS_HOME)/pkg/api/pb $(OSS_HOME)/pkg/api/envoy: $(OSS_HOME)/pkg/api/%: $(OSS_H | |
-exec chmod 644 {} + \ | ||
-exec sed -E -i.bak \ | ||
-e 's,github\.com/envoyproxy/go-control-plane/envoy,github.com/emissary-ingress/emissary/v3/pkg/api/envoy,g' \ | ||
-e 's,github\.com/envoyproxy/go-control-plane/pb,github.com/emissary-ingress/emissary/v3/pkg/api/pb,g' \ | ||
-- {} +; \ | ||
find "$$tmpdir" -name '*.bak' -delete; \ | ||
mv "$$tmpdir/$*" $@; \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.