Skip to content

Commit 08fe6be

Browse files
author
Eric Van Norman
authored
Updates to use fix main branch post release branching (istio#10894)
* Update to use main branch for reference docs * Updates to fix this for next time (not moving to master) * Run `make gen` * Update master istio test reference * Ingore one shellcheck, SC1091, for now. Not sure why it just showed up
1 parent 50e54d7 commit 08fe6be

File tree

22 files changed

+403
-223
lines changed

22 files changed

+403
-223
lines changed

‎Makefile.core.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ baseurl := "$(URL)"
7777
endif
7878

7979
# Which branch of the Istio source code do we fetch stuff from
80-
export SOURCE_BRANCH_NAME ?= release-1.13
80+
export SOURCE_BRANCH_NAME ?= master
8181

8282
site:
8383
@scripts/gen_site.sh

‎content/en/docs/examples/virtual-machines/snips.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ sudo systemctl restart mysql
3939
}
4040

4141
snip_running_mysql_on_the_vm_3() {
42-
curl -LO https://raw.githubusercontent.com/istio/istio/release-1.13/samples/bookinfo/src/mysql/mysqldb-init.sql
42+
curl -LO https://raw.githubusercontent.com/istio/istio/master/samples/bookinfo/src/mysql/mysqldb-init.sql
4343
mysql -u root -ppassword < mysqldb-init.sql
4444
}
4545

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

+12-6
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,12 @@ <h2 id="envvars">Environment variables</h2>
690690
<td>If true, Istiod will set the pod fsGroup to 1337 on injection. This is required for Kubernetes 1.18 and older (see https://github.com/kubernetes/kubernetes/issues/57923 for details) unless JWT_POLICY is &#34;first-party-jwt&#34;.</td>
691691
</tr>
692692
<tr>
693+
<td><code>ENABLE_LEGACY_LB_ALGORITHM_DEFAULT</code></td>
694+
<td>Boolean</td>
695+
<td><code>false</code></td>
696+
<td>If enabled, destinations for which no LB algorithm is specified will use the legacy default, ROUND_ROBIN. Care should be taken when using ROUND_ROBIN in general as it can overburden endpoints, especially when weights are used.</td>
697+
</tr>
698+
<tr>
693699
<td><code>ENABLE_MCS_AUTO_EXPORT</code></td>
694700
<td>Boolean</td>
695701
<td><code>false</code></td>
@@ -1050,12 +1056,6 @@ <h2 id="envvars">Environment variables</h2>
10501056
<td>If true, pilot will add telemetry related metadata to cluster and endpoint resources, which will be consumed by telemetry filter.</td>
10511057
</tr>
10521058
<tr>
1053-
<td><code>PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE</code></td>
1054-
<td>Boolean</td>
1055-
<td><code>true</code></td>
1056-
<td>If set to false, virtualService delegate will not be supported.</td>
1057-
</tr>
1058-
<tr>
10591059
<td><code>PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION</code></td>
10601060
<td>Boolean</td>
10611061
<td><code>true</code></td>
@@ -1164,6 +1164,12 @@ <h2 id="envvars">Environment variables</h2>
11641164
<td>If enabled, a gateway workload can only select gateway resources in the same namespace. Gateways with same selectors in different namespaces will not be applicable.</td>
11651165
</tr>
11661166
<tr>
1167+
<td><code>PILOT_SEND_UNHEALTHY_ENDPOINTS</code></td>
1168+
<td>Boolean</td>
1169+
<td><code>true</code></td>
1170+
<td>If enabled, Pilot will include unhealthy endpoints in EDS pushes and even if they are sent Envoy does not use them for load balancing.</td>
1171+
</tr>
1172+
<tr>
11671173
<td><code>PILOT_SIDECAR_USE_REMOTE_ADDRESS</code></td>
11681174
<td>Boolean</td>
11691175
<td><code>false</code></td>

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

+70-59
Large diffs are not rendered by default.

‎content/en/docs/reference/commands/operator/index.html

+18-6
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,12 @@ <h2 id="envvars">Environment variables</h2>
318318
<td>If true, Istiod will set the pod fsGroup to 1337 on injection. This is required for Kubernetes 1.18 and older (see https://github.com/kubernetes/kubernetes/issues/57923 for details) unless JWT_POLICY is &#34;first-party-jwt&#34;.</td>
319319
</tr>
320320
<tr>
321+
<td><code>ENABLE_LEGACY_LB_ALGORITHM_DEFAULT</code></td>
322+
<td>Boolean</td>
323+
<td><code>false</code></td>
324+
<td>If enabled, destinations for which no LB algorithm is specified will use the legacy default, ROUND_ROBIN. Care should be taken when using ROUND_ROBIN in general as it can overburden endpoints, especially when weights are used.</td>
325+
</tr>
326+
<tr>
321327
<td><code>ENABLE_MCS_AUTO_EXPORT</code></td>
322328
<td>Boolean</td>
323329
<td><code>false</code></td>
@@ -384,6 +390,12 @@ <h2 id="envvars">Environment variables</h2>
384390
<td>Allows specification of a quota project to be used in requests to GCP APIs.</td>
385391
</tr>
386392
<tr>
393+
<td><code>HTTP_STRIP_FRAGMENT_FROM_PATH_UNSAFE_IF_DISABLED</code></td>
394+
<td>Boolean</td>
395+
<td><code>true</code></td>
396+
<td></td>
397+
</tr>
398+
<tr>
387399
<td><code>INJECTION_WEBHOOK_CONFIG_NAME</code></td>
388400
<td>String</td>
389401
<td><code>istio-sidecar-injector</code></td>
@@ -678,12 +690,6 @@ <h2 id="envvars">Environment variables</h2>
678690
<td>If true, pilot will add telemetry related metadata to cluster and endpoint resources, which will be consumed by telemetry filter.</td>
679691
</tr>
680692
<tr>
681-
<td><code>PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE</code></td>
682-
<td>Boolean</td>
683-
<td><code>true</code></td>
684-
<td>If set to false, virtualService delegate will not be supported.</td>
685-
</tr>
686-
<tr>
687693
<td><code>PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION</code></td>
688694
<td>Boolean</td>
689695
<td><code>true</code></td>
@@ -792,6 +798,12 @@ <h2 id="envvars">Environment variables</h2>
792798
<td>If enabled, a gateway workload can only select gateway resources in the same namespace. Gateways with same selectors in different namespaces will not be applicable.</td>
793799
</tr>
794800
<tr>
801+
<td><code>PILOT_SEND_UNHEALTHY_ENDPOINTS</code></td>
802+
<td>Boolean</td>
803+
<td><code>true</code></td>
804+
<td>If enabled, Pilot will include unhealthy endpoints in EDS pushes and even if they are sent Envoy does not use them for load balancing.</td>
805+
</tr>
806+
<tr>
795807
<td><code>PILOT_SIDECAR_USE_REMOTE_ADDRESS</code></td>
796808
<td>Boolean</td>
797809
<td><code>false</code></td>

‎content/en/docs/reference/commands/pilot-agent/index.html

+25-7
Original file line numberDiff line numberDiff line change
@@ -1032,7 +1032,7 @@ <h2 id="envvars">Environment variables</h2>
10321032
<tr>
10331033
<td><code>CREDENTIAL_FETCHER_TYPE</code></td>
10341034
<td>String</td>
1035-
<td><code></code></td>
1035+
<td><code>JWT</code></td>
10361036
<td>The type of the credential fetcher. Currently supported types include GoogleComputeEngine</td>
10371037
</tr>
10381038
<tr>
@@ -1084,6 +1084,12 @@ <h2 id="envvars">Environment variables</h2>
10841084
<td>If true, Istiod will set the pod fsGroup to 1337 on injection. This is required for Kubernetes 1.18 and older (see https://github.com/kubernetes/kubernetes/issues/57923 for details) unless JWT_POLICY is &#34;first-party-jwt&#34;.</td>
10851085
</tr>
10861086
<tr>
1087+
<td><code>ENABLE_LEGACY_LB_ALGORITHM_DEFAULT</code></td>
1088+
<td>Boolean</td>
1089+
<td><code>false</code></td>
1090+
<td>If enabled, destinations for which no LB algorithm is specified will use the legacy default, ROUND_ROBIN. Care should be taken when using ROUND_ROBIN in general as it can overburden endpoints, especially when weights are used.</td>
1091+
</tr>
1092+
<tr>
10871093
<td><code>ENABLE_MCS_AUTO_EXPORT</code></td>
10881094
<td>Boolean</td>
10891095
<td><code>false</code></td>
@@ -1198,6 +1204,12 @@ <h2 id="envvars">Environment variables</h2>
11981204
<td>Path where gRPC expects to read a bootstrap file. Agent will generate one if set.</td>
11991205
</tr>
12001206
<tr>
1207+
<td><code>HTTP_STRIP_FRAGMENT_FROM_PATH_UNSAFE_IF_DISABLED</code></td>
1208+
<td>Boolean</td>
1209+
<td><code>true</code></td>
1210+
<td></td>
1211+
</tr>
1212+
<tr>
12011213
<td><code>INJECTION_WEBHOOK_CONFIG_NAME</code></td>
12021214
<td>String</td>
12031215
<td><code>istio-sidecar-injector</code></td>
@@ -1564,12 +1576,6 @@ <h2 id="envvars">Environment variables</h2>
15641576
<td>If true, pilot will add telemetry related metadata to cluster and endpoint resources, which will be consumed by telemetry filter.</td>
15651577
</tr>
15661578
<tr>
1567-
<td><code>PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE</code></td>
1568-
<td>Boolean</td>
1569-
<td><code>true</code></td>
1570-
<td>If set to false, virtualService delegate will not be supported.</td>
1571-
</tr>
1572-
<tr>
15731579
<td><code>PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION</code></td>
15741580
<td>Boolean</td>
15751581
<td><code>true</code></td>
@@ -1678,6 +1684,12 @@ <h2 id="envvars">Environment variables</h2>
16781684
<td>If enabled, a gateway workload can only select gateway resources in the same namespace. Gateways with same selectors in different namespaces will not be applicable.</td>
16791685
</tr>
16801686
<tr>
1687+
<td><code>PILOT_SEND_UNHEALTHY_ENDPOINTS</code></td>
1688+
<td>Boolean</td>
1689+
<td><code>true</code></td>
1690+
<td>If enabled, Pilot will include unhealthy endpoints in EDS pushes and even if they are sent Envoy does not use them for load balancing.</td>
1691+
</tr>
1692+
<tr>
16811693
<td><code>PILOT_SIDECAR_USE_REMOTE_ADDRESS</code></td>
16821694
<td>Boolean</td>
16831695
<td><code>false</code></td>
@@ -1894,6 +1906,12 @@ <h2 id="envvars">Environment variables</h2>
18941906
<td>If enabled, certificates received by the proxy will be verified against the OS CA certificate bundle.</td>
18951907
</tr>
18961908
<tr>
1909+
<td><code>WASM_INSECURE_REGISTRIES</code></td>
1910+
<td>String</td>
1911+
<td><code></code></td>
1912+
<td>allow agent pull wasm plugin from insecure registries, for example: &#39;localhost:5000,docker-registry:5000&#39;</td>
1913+
</tr>
1914+
<tr>
18971915
<td><code>XDS_AUTH</code></td>
18981916
<td>Boolean</td>
18991917
<td><code>true</code></td>

‎content/en/docs/reference/commands/pilot-discovery/index.html

+18-6
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,12 @@ <h2 id="envvars">Environment variables</h2>
529529
<td>If true, Istiod will set the pod fsGroup to 1337 on injection. This is required for Kubernetes 1.18 and older (see https://github.com/kubernetes/kubernetes/issues/57923 for details) unless JWT_POLICY is &#34;first-party-jwt&#34;.</td>
530530
</tr>
531531
<tr>
532+
<td><code>ENABLE_LEGACY_LB_ALGORITHM_DEFAULT</code></td>
533+
<td>Boolean</td>
534+
<td><code>false</code></td>
535+
<td>If enabled, destinations for which no LB algorithm is specified will use the legacy default, ROUND_ROBIN. Care should be taken when using ROUND_ROBIN in general as it can overburden endpoints, especially when weights are used.</td>
536+
</tr>
537+
<tr>
532538
<td><code>ENABLE_MCS_AUTO_EXPORT</code></td>
533539
<td>Boolean</td>
534540
<td><code>false</code></td>
@@ -601,6 +607,12 @@ <h2 id="envvars">Environment variables</h2>
601607
<td>Allows specification of a quota project to be used in requests to GCP APIs.</td>
602608
</tr>
603609
<tr>
610+
<td><code>HTTP_STRIP_FRAGMENT_FROM_PATH_UNSAFE_IF_DISABLED</code></td>
611+
<td>Boolean</td>
612+
<td><code>true</code></td>
613+
<td></td>
614+
</tr>
615+
<tr>
604616
<td><code>INJECTION_WEBHOOK_CONFIG_NAME</code></td>
605617
<td>String</td>
606618
<td><code>istio-sidecar-injector</code></td>
@@ -925,12 +937,6 @@ <h2 id="envvars">Environment variables</h2>
925937
<td>If true, pilot will add telemetry related metadata to cluster and endpoint resources, which will be consumed by telemetry filter.</td>
926938
</tr>
927939
<tr>
928-
<td><code>PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE</code></td>
929-
<td>Boolean</td>
930-
<td><code>true</code></td>
931-
<td>If set to false, virtualService delegate will not be supported.</td>
932-
</tr>
933-
<tr>
934940
<td><code>PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION</code></td>
935941
<td>Boolean</td>
936942
<td><code>true</code></td>
@@ -1039,6 +1045,12 @@ <h2 id="envvars">Environment variables</h2>
10391045
<td>If enabled, a gateway workload can only select gateway resources in the same namespace. Gateways with same selectors in different namespaces will not be applicable.</td>
10401046
</tr>
10411047
<tr>
1048+
<td><code>PILOT_SEND_UNHEALTHY_ENDPOINTS</code></td>
1049+
<td>Boolean</td>
1050+
<td><code>true</code></td>
1051+
<td>If enabled, Pilot will include unhealthy endpoints in EDS pushes and even if they are sent Envoy does not use them for load balancing.</td>
1052+
</tr>
1053+
<tr>
10421054
<td><code>PILOT_SIDECAR_USE_REMOTE_ADDRESS</code></td>
10431055
<td>Boolean</td>
10441056
<td><code>false</code></td>

‎content/en/docs/reference/config/istio.mesh.v1alpha1/index.html

+20
Original file line numberDiff line numberDiff line change
@@ -2848,6 +2848,18 @@ <h2 id="ProxyConfig">ProxyConfig</h2>
28482848
<p>Additional environment variables for the proxy.
28492849
Names starting with <code>ISTIO_META_</code> will be included in the generated bootstrap and sent to the XDS server.</p>
28502850

2851+
</td>
2852+
<td>
2853+
No
2854+
</td>
2855+
</tr>
2856+
<tr id="ProxyConfig-runtime_values">
2857+
<td><code>runtimeValues</code></td>
2858+
<td><code>map&lt;string,&nbsp;string&gt;</code></td>
2859+
<td>
2860+
<p>Envoy <a href="https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/operations/runtime">runtime configuration</a> to set during bootstrapping.
2861+
This enables setting experimental, unsafe, unsupported, and deprecated features that should be used with extreme caution.</p>
2862+
28512863
</td>
28522864
<td>
28532865
No
@@ -3880,6 +3892,14 @@ <h2 id="ProxyConfig-InboundInterceptionMode">ProxyConfig.InboundInterceptionMode
38803892
filtering and manipulation. This mode also configures the sidecar to run with the
38813893
<code>CAP_NET_ADMIN</code> capability, which is required to use <code>TPROXY</code>.</p>
38823894

3895+
</td>
3896+
</tr>
3897+
<tr id="ProxyConfig-InboundInterceptionMode-NONE">
3898+
<td><code>NONE</code></td>
3899+
<td>
3900+
<p>The <code>NONE</code> mode does not configure redirect to Envoy at all. This is an advanced
3901+
configuration that typically requires changes to user applications.</p>
3902+
38833903
</td>
38843904
</tr>
38853905
</tbody>

0 commit comments

Comments
 (0)