Skip to content

Commit b6b0248

Browse files
authored
Merge pull request #15 from YaoZengzeng/update
Update master branch
2 parents 49fdd6a + 881c562 commit b6b0248

File tree

67 files changed

+1425
-847
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1425
-847
lines changed

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ build:remote --remote_timeout=7200
1616
# Enable libc++ and C++20 by default.
1717
build:linux --config=libc++20
1818

19+
# put /usr/local/bin before /usr/bin to avoid picking up wrong python3.6 when building envoy.tls.key_providers.cryptomb
20+
build:linux --action_env=PATH=/usr/lib/llvm/bin:/usr/local/bin:/bin:/usr/bin
21+
1922
# Need for CI image to pickup docker-credential-gcloud, PATH is fixed in rbe-toolchain-* configs.
2023
build:remote-ci --action_env=PATH=/usr/local/google-cloud-sdk/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/llvm/bin
2124

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.5.0
1+
7.6.0

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "istio build-tools",
3-
"image": "gcr.io/istio-testing/build-tools-proxy:master-0b8e6b9676d328fbeb28a23b8d1134dcc56d98ec",
3+
"image": "gcr.io/istio-testing/build-tools-proxy:master-561a5364527219539f8e4c1ac768d6cf1dd5d799",
44
"privileged": true,
55
"remoteEnv": {
66
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",

.github/dependabot.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Configures Depdendabot to PR go security updates only
2+
3+
version: 2
4+
updates:
5+
# Go configuration for master branch
6+
- package-ecosystem: "gomod"
7+
directory: "/"
8+
schedule:
9+
interval: "daily"
10+
# Limit number of open PRs to 0 so that we only get security updates
11+
# See https://docs.github.com/en/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates
12+
open-pull-requests-limit: 0
13+
labels:
14+
- "release-notes-none"

Makefile.core.mk

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -109,29 +109,6 @@ lint: lint-copyright-banner format-go lint-go tidy-go lint-scripts gen-extension
109109
@scripts/check-repository.sh
110110
@scripts/check-style.sh
111111

112-
protoc = protoc -I common-protos -I extensions
113-
protoc_gen_docs_plugin := --docs_out=camel_case_fields=false,warnings=true,per_file=true,mode=html_fragment_with_front_matter:$(repo_dir)/
114-
115-
metadata_exchange_path := extensions/metadata_exchange
116-
metadata_exchange_protos := $(wildcard $(metadata_exchange_path)/*.proto)
117-
metadata_exchange_docs := $(metadata_exchange_protos:.proto=.pb.html)
118-
$(metadata_exchange_docs): $(metadata_exchange_protos)
119-
@$(protoc) -I ./extensions $(protoc_gen_docs_plugin)$(metadata_exchange_path) $^
120-
121-
stackdriver_path := extensions/stackdriver/config/v1alpha1
122-
stackdriver_protos := $(wildcard $(stackdriver_path)/*.proto)
123-
stackdriver_docs := $(stackdriver_protos:.proto=.pb.html)
124-
$(stackdriver_docs): $(stackdriver_protos)
125-
@$(protoc) -I ./extensions $(protoc_gen_docs_plugin)$(stackdriver_path) $^
126-
127-
accesslog_policy_path := extensions/access_log_policy/config/v1alpha1
128-
accesslog_policy_protos := $(wildcard $(accesslog_policy_path)/*.proto)
129-
accesslog_policy_docs := $(accesslog_policy_protos:.proto=.pb.html)
130-
$(accesslog_policy_docs): $(accesslog_policy_protos)
131-
@$(protoc) -I ./extensions $(protoc_gen_docs_plugin)$(accesslog_policy_path) $^
132-
133-
extensions-docs: $(metadata_exchange_docs) $(stackdriver_docs) $(accesslog_policy_docs)
134-
135112
test_release:
136113
ifeq "$(shell uname -m)" "x86_64"
137114
export BAZEL_BUILD_ARGS="$(BAZEL_BUILD_ARGS)" && ./scripts/release-binary.sh

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2222
# 1. Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/$COMMIT.tar.gz && sha256sum $COMMIT.tar.gz`
2323
# 2. Update .bazelversion, envoy.bazelrc and .bazelrc if needed.
2424
#
25-
# Commit date: 2024-12-18
26-
ENVOY_SHA = "b14be4084100386a674cbed75a40c4083be3413f"
25+
# Commit date: 2025-04-08
26+
ENVOY_SHA = "c29a0ceafb1630d54e2cb43fdafd283593f49cee"
2727

28-
ENVOY_SHA256 = "ac2876b166eab94e7ed3dbe92ed1024e33aba9148dd460db9ce384720333b3ed"
28+
ENVOY_SHA256 = "1ae014ec7d6176d18e6a054743c131f1e1cc57ed3aee3d23f6920a4c9524c21f"
2929

3030
ENVOY_ORG = "envoyproxy"
3131

bazel/extension_config/extensions_build_config.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ ENVOY_EXTENSIONS = {
146146
"envoy.filters.http.on_demand": "//source/extensions/filters/http/on_demand:config",
147147
"envoy.filters.http.original_src": "//source/extensions/filters/http/original_src:config",
148148
"envoy.filters.http.ratelimit": "//source/extensions/filters/http/ratelimit:config",
149+
"envoy.filters.http.rate_limit_quota": "//source/extensions/filters/http/rate_limit_quota:config",
149150
"envoy.filters.http.rbac": "//source/extensions/filters/http/rbac:config",
150151
"envoy.filters.http.router": "//source/extensions/filters/http/router:config",
151152
"envoy.filters.http.set_filter_state": "//source/extensions/filters/http/set_filter_state:config",
@@ -356,7 +357,7 @@ ENVOY_EXTENSIONS = {
356357
# QUIC extensions
357358
#
358359

359-
"envoy.quic.deterministic_connection_id_generator": "//source/extensions/quic/connection_id_generator:envoy_deterministic_connection_id_generator_config",
360+
"envoy.quic.deterministic_connection_id_generator": "//source/extensions/quic/connection_id_generator/deterministic:envoy_deterministic_connection_id_generator_config",
360361
"envoy.quic.crypto_stream.server.quiche": "//source/extensions/quic/crypto_stream:envoy_quic_default_crypto_server_stream",
361362
"envoy.quic.proof_source.filter_chain": "//source/extensions/quic/proof_source:envoy_quic_default_proof_source",
362363

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ad4552bfdc5ead45c5d8084e4bf254b788090603
1+
42160100af6da9a20b415e791b5e47971861ede3

common/config/.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ linters-settings:
9494
- name: constant-logical-expr
9595
- name: bool-literal-in-expr
9696
- name: redefines-builtin-id
97-
- name: imports-blacklist
97+
- name: imports-blocklist
9898
- name: range-val-in-closure
9999
- name: range-val-address
100100
- name: waitgroup-by-value

common/config/license-lint.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,18 @@ allowlisted_modules:
125125

126126
# Simplified BSD (BSD-2-Clause): https://github.com/russross/blackfriday/blob/master/LICENSE.txt
127127
- github.com/russross/blackfriday
128-
- github.com/russross/blackfriday/v2
128+
- github.com/russross/blackfriday/v2
129+
130+
# W3C Test Suite License, W3C 3-clause BSD License
131+
# gonum uses this for its some of its test files
132+
# gonum.org/v1/gonum/graph/formats/rdf/testdata/LICENSE.md
133+
- gonum.org/v1/gonum
134+
135+
# BSD 3-clause: https://github.com/go-inf/inf/blob/v0.9.1/LICENSE
136+
- gopkg.in/inf.v0
137+
138+
# BSD 3-clause: https://github.com/go-git/gcfg/blob/main/LICENSE
139+
- github.com/go-git/gcfg
140+
141+
# Apache 2.0
142+
- github.com/aws/smithy-go

0 commit comments

Comments
 (0)