Skip to content

Commit a7d501e

Browse files
committed
Merge branch 'master' into feat/local-splide-threejs
2 parents e56a0bd + 09b9c4b commit a7d501e

File tree

65 files changed

+418
-591
lines changed

Some content is hidden

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

65 files changed

+418
-591
lines changed

.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:master-8d2a100a81731715ea16de11e8c9f23b2ddb3948",
3+
"image": "gcr.io/istio-testing/build-tools:master-267d17ce87eaf154c1a6bc2bc743b9a27a12d551",
44
"privileged": true,
55
"remoteEnv": {
66
"USE_GKE_GCLOUD_AUTH_PLUGIN": "True",

Makefile.core.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ archive-version:
139139
netlify_install:
140140
@npm init -y
141141
@npm install --omit=dev --global \
142-
sass@v1.52.1 \
143-
typescript@v4.7.2 \
144-
svgstore-cli@v1.3.2 \
145-
@babel/core@v7.18.2 \
146-
@babel/cli@v7.17.10 \
142+
sass@v1.89.1 \
143+
typescript@v5.8.3 \
144+
svgstore-cli@v2.0.1 \
145+
@babel/core@v7.27.4 \
146+
@babel/cli@v7.27.2 \
147147
148-
@babel/preset-env@v7.18.2
148+
@babel/preset-env@v7.27.2
149149
@npm install --omit=dev --save-dev \
150150
151151
@npm install --save \

Makefile.overrides.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
# limitations under the License.
1414

1515
# expose port 1313 from the container in order to support 'make serve' which runs a Hugo web server
16+
ifeq ($(filter serve,$(MAKECMDGOALS)),serve)
1617
CONTAINER_OPTIONS = -p 1313:1313 ${ADDITIONAL_CONTAINER_OPTIONS}
18+
else
19+
CONTAINER_OPTIONS = ${ADDITIONAL_CONTAINER_OPTIONS}
20+
endif
1721

1822
# this repo is on the container plan by default
1923
BUILD_WITH_CONTAINER ?= 1

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5cc5ed563d6dff7b2ef302b4bddb57d4b4d462ef
1+
fa13a39d16201a043415263f1ce8ddfec1d69442

common/scripts/setup_env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fi
7575
TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
7676
PROJECT_ID=${PROJECT_ID:-istio-testing}
7777
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
78-
IMAGE_VERSION=master-8d2a100a81731715ea16de11e8c9f23b2ddb3948
78+
IMAGE_VERSION=master-267d17ce87eaf154c1a6bc2bc743b9a27a12d551
7979
fi
8080
if [[ "${IMAGE_NAME:-}" == "" ]]; then
8181
IMAGE_NAME=build-tools

content/en/docs/examples/bookinfo/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ else
5252
_verify_like snip_determine_the_ingress_ip_and_port_2 "$snip_determine_the_ingress_ip_and_port_2_out"
5353

5454
# give config some time to propagate
55-
_wait_for_istio gateway default bookinfo-gateway
56-
_wait_for_istio virtualservice default bookinfo
55+
_wait_for_resource gateway default bookinfo-gateway
56+
_wait_for_resource virtualservice default bookinfo
5757

5858
# export the INGRESS_ environment variables
5959
_set_ingress_environment_variables

content/en/docs/ops/configuration/mesh/app-health-check/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ snip_liveness_and_readiness_probes_using_the_command_approach_1
3838

3939
snip_liveness_and_readiness_probes_using_the_command_approach_2
4040

41-
_wait_for_istio peerauthentication istio-io-health default
41+
_wait_for_resource peerauthentication istio-io-health default
4242

4343
snip_liveness_and_readiness_probes_using_the_command_approach_3
4444

content/en/docs/ops/configuration/traffic-management/network-topologies/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ else
4444
snip_deploy_httpbin_gateway
4545

4646
# wait for for the rules to propagate
47-
_wait_for_istio gateway httpbin httpbin-gateway
48-
_wait_for_istio virtualservice httpbin httpbin
47+
_wait_for_resource gateway httpbin httpbin-gateway
48+
_wait_for_resource virtualservice httpbin httpbin
4949

5050
snip_export_gateway_url
5151
fi

content/en/docs/reference/commands/install-cni/index.html

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,12 @@ <h2 id="envvars">Environment variables</h2>
626626
<td>If enabled, selector based authorization policies will be enforced as L4 policies in front of the waypoint.</td>
627627
</tr>
628628
<tr>
629+
<td><code>ENABLE_LAZY_SIDECAR_EVALUATION</code></td>
630+
<td>Boolean</td>
631+
<td><code>true</code></td>
632+
<td>If enabled, pilot will only compute sidecar resources when actually used</td>
633+
</tr>
634+
<tr>
629635
<td><code>ENABLE_LEADER_ELECTION</code></td>
630636
<td>Boolean</td>
631637
<td><code>true</code></td>
@@ -674,6 +680,12 @@ <h2 id="envvars">Environment variables</h2>
674680
<td>If set, used Kubernetes native Sidecar container support. Requires SidecarContainer feature flag.</td>
675681
</tr>
676682
<tr>
683+
<td><code>ENABLE_PROXY_FIND_POD_BY_IP</code></td>
684+
<td>Boolean</td>
685+
<td><code>false</code></td>
686+
<td>If enabled, the pod controller will allow finding pods matching proxies by IP if it fails to find them by name.</td>
687+
</tr>
688+
<tr>
677689
<td><code>ENABLE_SELECTOR_BASED_K8S_GATEWAY_POLICY</code></td>
678690
<td>Boolean</td>
679691
<td><code>true</code></td>
@@ -692,6 +704,12 @@ <h2 id="envvars">Environment variables</h2>
692704
<td>If true, will use optimized vtprotobuf based marshaling. Requires a build with -tags=vtprotobuf.</td>
693705
</tr>
694706
<tr>
707+
<td><code>ENVOY_STATUS_PORT_ENABLE_PROXY_PROTOCOL</code></td>
708+
<td>Boolean</td>
709+
<td><code>false</code></td>
710+
<td>If enabled, Envoy will support requests with proxy protocol on its status port</td>
711+
</tr>
712+
<tr>
695713
<td><code>ENVOY_USER</code></td>
696714
<td>String</td>
697715
<td><code>istio-proxy</code></td>
@@ -969,7 +987,7 @@ <h2 id="envvars">Environment variables</h2>
969987
<td><code>PILOT_CONVERT_SIDECAR_SCOPE_CONCURRENCY</code></td>
970988
<td>Integer</td>
971989
<td><code>1</code></td>
972-
<td>Used to adjust the concurrency of SidecarScope conversions. When istiod is deployed on a multi-core CPU server, increasing this value will help to use the CPU to accelerate configuration push, but it also means that istiod will consume more CPU resources.</td>
990+
<td>Deprecated, superseded by ENABLE_LAZY_SIDECAR_EVALUATION. Used to adjust the concurrency of SidecarScope conversions. When istiod is deployed on a multi-core CPU server, increasing this value will help to use the CPU to accelerate configuration push, but it also means that istiod will consume more CPU resources.</td>
973991
</tr>
974992
<tr>
975993
<td><code>PILOT_DEBOUNCE_AFTER</code></td>
@@ -1044,6 +1062,12 @@ <h2 id="envvars">Environment variables</h2>
10441062
<td>If enabled, pilot will run istio analyzers and write analysis errors to the Status field of any Istio Resources</td>
10451063
</tr>
10461064
<tr>
1065+
<td><code>PILOT_ENABLE_CA_CRL</code></td>
1066+
<td>Boolean</td>
1067+
<td><code>false</code></td>
1068+
<td>If set to true, Istio will watch for ca-crl.pem file in /etc/cacerts directory and will distribute crl data in each namespace in the cluster for proxies to consume. </td>
1069+
</tr>
1070+
<tr>
10471071
<td><code>PILOT_ENABLE_CDS_CACHE</code></td>
10481072
<td>Boolean</td>
10491073
<td><code>true</code></td>

content/en/docs/reference/commands/istioctl/index.html

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8479,6 +8479,12 @@ <h2 id="envvars">Environment variables</h2>
84798479
<td>If enabled, selector based authorization policies will be enforced as L4 policies in front of the waypoint.</td>
84808480
</tr>
84818481
<tr>
8482+
<td><code>ENABLE_LAZY_SIDECAR_EVALUATION</code></td>
8483+
<td>Boolean</td>
8484+
<td><code>true</code></td>
8485+
<td>If enabled, pilot will only compute sidecar resources when actually used</td>
8486+
</tr>
8487+
<tr>
84828488
<td><code>ENABLE_LEADER_ELECTION</code></td>
84838489
<td>Boolean</td>
84848490
<td><code>true</code></td>
@@ -8533,6 +8539,12 @@ <h2 id="envvars">Environment variables</h2>
85338539
<td>If enabled, readiness probes will keep the connection from pilot-agent to the application alive. This mirrors older Istio versions&#39; behaviors, but not kubelet&#39;s.</td>
85348540
</tr>
85358541
<tr>
8542+
<td><code>ENABLE_PROXY_FIND_POD_BY_IP</code></td>
8543+
<td>Boolean</td>
8544+
<td><code>false</code></td>
8545+
<td>If enabled, the pod controller will allow finding pods matching proxies by IP if it fails to find them by name.</td>
8546+
</tr>
8547+
<tr>
85368548
<td><code>ENABLE_SELECTOR_BASED_K8S_GATEWAY_POLICY</code></td>
85378549
<td>Boolean</td>
85388550
<td><code>true</code></td>
@@ -8551,6 +8563,12 @@ <h2 id="envvars">Environment variables</h2>
85518563
<td>If true, will use optimized vtprotobuf based marshaling. Requires a build with -tags=vtprotobuf.</td>
85528564
</tr>
85538565
<tr>
8566+
<td><code>ENVOY_STATUS_PORT_ENABLE_PROXY_PROTOCOL</code></td>
8567+
<td>Boolean</td>
8568+
<td><code>false</code></td>
8569+
<td>If enabled, Envoy will support requests with proxy protocol on its status port</td>
8570+
</tr>
8571+
<tr>
85548572
<td><code>EXTERNAL_ISTIOD</code></td>
85558573
<td>Boolean</td>
85568574
<td><code>false</code></td>
@@ -8876,7 +8894,7 @@ <h2 id="envvars">Environment variables</h2>
88768894
<td><code>PILOT_CONVERT_SIDECAR_SCOPE_CONCURRENCY</code></td>
88778895
<td>Integer</td>
88788896
<td><code>1</code></td>
8879-
<td>Used to adjust the concurrency of SidecarScope conversions. When istiod is deployed on a multi-core CPU server, increasing this value will help to use the CPU to accelerate configuration push, but it also means that istiod will consume more CPU resources.</td>
8897+
<td>Deprecated, superseded by ENABLE_LAZY_SIDECAR_EVALUATION. Used to adjust the concurrency of SidecarScope conversions. When istiod is deployed on a multi-core CPU server, increasing this value will help to use the CPU to accelerate configuration push, but it also means that istiod will consume more CPU resources.</td>
88808898
</tr>
88818899
<tr>
88828900
<td><code>PILOT_DEBOUNCE_AFTER</code></td>
@@ -8951,6 +8969,12 @@ <h2 id="envvars">Environment variables</h2>
89518969
<td>If enabled, pilot will run istio analyzers and write analysis errors to the Status field of any Istio Resources</td>
89528970
</tr>
89538971
<tr>
8972+
<td><code>PILOT_ENABLE_CA_CRL</code></td>
8973+
<td>Boolean</td>
8974+
<td><code>false</code></td>
8975+
<td>If set to true, Istio will watch for ca-crl.pem file in /etc/cacerts directory and will distribute crl data in each namespace in the cluster for proxies to consume. </td>
8976+
</tr>
8977+
<tr>
89548978
<td><code>PILOT_ENABLE_CDS_CACHE</code></td>
89558979
<td>Boolean</td>
89568980
<td><code>true</code></td>

0 commit comments

Comments
 (0)