Skip to content

Commit

Permalink
Updates to use fix main branch post release branching (istio#10894)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Eric Van Norman authored Feb 12, 2022
1 parent 50e54d7 commit 08fe6be
Show file tree
Hide file tree
Showing 22 changed files with 403 additions and 223 deletions.
2 changes: 1 addition & 1 deletion Makefile.core.mk
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ baseurl := "$(URL)"
endif

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

site:
@scripts/gen_site.sh
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/examples/virtual-machines/snips.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ sudo systemctl restart mysql
}

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

Expand Down
18 changes: 12 additions & 6 deletions content/en/docs/reference/commands/install-cni/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,12 @@ <h2 id="envvars">Environment variables</h2>
<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>
</tr>
<tr>
<td><code>ENABLE_LEGACY_LB_ALGORITHM_DEFAULT</code></td>
<td>Boolean</td>
<td><code>false</code></td>
<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>
</tr>
<tr>
<td><code>ENABLE_MCS_AUTO_EXPORT</code></td>
<td>Boolean</td>
<td><code>false</code></td>
Expand Down Expand Up @@ -1050,12 +1056,6 @@ <h2 id="envvars">Environment variables</h2>
<td>If true, pilot will add telemetry related metadata to cluster and endpoint resources, which will be consumed by telemetry filter.</td>
</tr>
<tr>
<td><code>PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<td>If set to false, virtualService delegate will not be supported.</td>
</tr>
<tr>
<td><code>PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION</code></td>
<td>Boolean</td>
<td><code>true</code></td>
Expand Down Expand Up @@ -1164,6 +1164,12 @@ <h2 id="envvars">Environment variables</h2>
<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>
</tr>
<tr>
<td><code>PILOT_SEND_UNHEALTHY_ENDPOINTS</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<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>
</tr>
<tr>
<td><code>PILOT_SIDECAR_USE_REMOTE_ADDRESS</code></td>
<td>Boolean</td>
<td><code>false</code></td>
Expand Down
129 changes: 70 additions & 59 deletions content/en/docs/reference/commands/istioctl/index.html

Large diffs are not rendered by default.

24 changes: 18 additions & 6 deletions content/en/docs/reference/commands/operator/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,12 @@ <h2 id="envvars">Environment variables</h2>
<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>
</tr>
<tr>
<td><code>ENABLE_LEGACY_LB_ALGORITHM_DEFAULT</code></td>
<td>Boolean</td>
<td><code>false</code></td>
<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>
</tr>
<tr>
<td><code>ENABLE_MCS_AUTO_EXPORT</code></td>
<td>Boolean</td>
<td><code>false</code></td>
Expand Down Expand Up @@ -384,6 +390,12 @@ <h2 id="envvars">Environment variables</h2>
<td>Allows specification of a quota project to be used in requests to GCP APIs.</td>
</tr>
<tr>
<td><code>HTTP_STRIP_FRAGMENT_FROM_PATH_UNSAFE_IF_DISABLED</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<td></td>
</tr>
<tr>
<td><code>INJECTION_WEBHOOK_CONFIG_NAME</code></td>
<td>String</td>
<td><code>istio-sidecar-injector</code></td>
Expand Down Expand Up @@ -678,12 +690,6 @@ <h2 id="envvars">Environment variables</h2>
<td>If true, pilot will add telemetry related metadata to cluster and endpoint resources, which will be consumed by telemetry filter.</td>
</tr>
<tr>
<td><code>PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<td>If set to false, virtualService delegate will not be supported.</td>
</tr>
<tr>
<td><code>PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION</code></td>
<td>Boolean</td>
<td><code>true</code></td>
Expand Down Expand Up @@ -792,6 +798,12 @@ <h2 id="envvars">Environment variables</h2>
<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>
</tr>
<tr>
<td><code>PILOT_SEND_UNHEALTHY_ENDPOINTS</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<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>
</tr>
<tr>
<td><code>PILOT_SIDECAR_USE_REMOTE_ADDRESS</code></td>
<td>Boolean</td>
<td><code>false</code></td>
Expand Down
32 changes: 25 additions & 7 deletions content/en/docs/reference/commands/pilot-agent/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ <h2 id="envvars">Environment variables</h2>
<tr>
<td><code>CREDENTIAL_FETCHER_TYPE</code></td>
<td>String</td>
<td><code></code></td>
<td><code>JWT</code></td>
<td>The type of the credential fetcher. Currently supported types include GoogleComputeEngine</td>
</tr>
<tr>
Expand Down Expand Up @@ -1084,6 +1084,12 @@ <h2 id="envvars">Environment variables</h2>
<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>
</tr>
<tr>
<td><code>ENABLE_LEGACY_LB_ALGORITHM_DEFAULT</code></td>
<td>Boolean</td>
<td><code>false</code></td>
<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>
</tr>
<tr>
<td><code>ENABLE_MCS_AUTO_EXPORT</code></td>
<td>Boolean</td>
<td><code>false</code></td>
Expand Down Expand Up @@ -1198,6 +1204,12 @@ <h2 id="envvars">Environment variables</h2>
<td>Path where gRPC expects to read a bootstrap file. Agent will generate one if set.</td>
</tr>
<tr>
<td><code>HTTP_STRIP_FRAGMENT_FROM_PATH_UNSAFE_IF_DISABLED</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<td></td>
</tr>
<tr>
<td><code>INJECTION_WEBHOOK_CONFIG_NAME</code></td>
<td>String</td>
<td><code>istio-sidecar-injector</code></td>
Expand Down Expand Up @@ -1564,12 +1576,6 @@ <h2 id="envvars">Environment variables</h2>
<td>If true, pilot will add telemetry related metadata to cluster and endpoint resources, which will be consumed by telemetry filter.</td>
</tr>
<tr>
<td><code>PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<td>If set to false, virtualService delegate will not be supported.</td>
</tr>
<tr>
<td><code>PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION</code></td>
<td>Boolean</td>
<td><code>true</code></td>
Expand Down Expand Up @@ -1678,6 +1684,12 @@ <h2 id="envvars">Environment variables</h2>
<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>
</tr>
<tr>
<td><code>PILOT_SEND_UNHEALTHY_ENDPOINTS</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<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>
</tr>
<tr>
<td><code>PILOT_SIDECAR_USE_REMOTE_ADDRESS</code></td>
<td>Boolean</td>
<td><code>false</code></td>
Expand Down Expand Up @@ -1894,6 +1906,12 @@ <h2 id="envvars">Environment variables</h2>
<td>If enabled, certificates received by the proxy will be verified against the OS CA certificate bundle.</td>
</tr>
<tr>
<td><code>WASM_INSECURE_REGISTRIES</code></td>
<td>String</td>
<td><code></code></td>
<td>allow agent pull wasm plugin from insecure registries, for example: &#39;localhost:5000,docker-registry:5000&#39;</td>
</tr>
<tr>
<td><code>XDS_AUTH</code></td>
<td>Boolean</td>
<td><code>true</code></td>
Expand Down
24 changes: 18 additions & 6 deletions content/en/docs/reference/commands/pilot-discovery/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,12 @@ <h2 id="envvars">Environment variables</h2>
<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>
</tr>
<tr>
<td><code>ENABLE_LEGACY_LB_ALGORITHM_DEFAULT</code></td>
<td>Boolean</td>
<td><code>false</code></td>
<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>
</tr>
<tr>
<td><code>ENABLE_MCS_AUTO_EXPORT</code></td>
<td>Boolean</td>
<td><code>false</code></td>
Expand Down Expand Up @@ -601,6 +607,12 @@ <h2 id="envvars">Environment variables</h2>
<td>Allows specification of a quota project to be used in requests to GCP APIs.</td>
</tr>
<tr>
<td><code>HTTP_STRIP_FRAGMENT_FROM_PATH_UNSAFE_IF_DISABLED</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<td></td>
</tr>
<tr>
<td><code>INJECTION_WEBHOOK_CONFIG_NAME</code></td>
<td>String</td>
<td><code>istio-sidecar-injector</code></td>
Expand Down Expand Up @@ -925,12 +937,6 @@ <h2 id="envvars">Environment variables</h2>
<td>If true, pilot will add telemetry related metadata to cluster and endpoint resources, which will be consumed by telemetry filter.</td>
</tr>
<tr>
<td><code>PILOT_ENABLE_VIRTUAL_SERVICE_DELEGATE</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<td>If set to false, virtualService delegate will not be supported.</td>
</tr>
<tr>
<td><code>PILOT_ENABLE_WORKLOAD_ENTRY_AUTOREGISTRATION</code></td>
<td>Boolean</td>
<td><code>true</code></td>
Expand Down Expand Up @@ -1039,6 +1045,12 @@ <h2 id="envvars">Environment variables</h2>
<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>
</tr>
<tr>
<td><code>PILOT_SEND_UNHEALTHY_ENDPOINTS</code></td>
<td>Boolean</td>
<td><code>true</code></td>
<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>
</tr>
<tr>
<td><code>PILOT_SIDECAR_USE_REMOTE_ADDRESS</code></td>
<td>Boolean</td>
<td><code>false</code></td>
Expand Down
20 changes: 20 additions & 0 deletions content/en/docs/reference/config/istio.mesh.v1alpha1/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2848,6 +2848,18 @@ <h2 id="ProxyConfig">ProxyConfig</h2>
<p>Additional environment variables for the proxy.
Names starting with <code>ISTIO_META_</code> will be included in the generated bootstrap and sent to the XDS server.</p>

</td>
<td>
No
</td>
</tr>
<tr id="ProxyConfig-runtime_values">
<td><code>runtimeValues</code></td>
<td><code>map&lt;string,&nbsp;string&gt;</code></td>
<td>
<p>Envoy <a href="https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/operations/runtime">runtime configuration</a> to set during bootstrapping.
This enables setting experimental, unsafe, unsupported, and deprecated features that should be used with extreme caution.</p>

</td>
<td>
No
Expand Down Expand Up @@ -3880,6 +3892,14 @@ <h2 id="ProxyConfig-InboundInterceptionMode">ProxyConfig.InboundInterceptionMode
filtering and manipulation. This mode also configures the sidecar to run with the
<code>CAP_NET_ADMIN</code> capability, which is required to use <code>TPROXY</code>.</p>

</td>
</tr>
<tr id="ProxyConfig-InboundInterceptionMode-NONE">
<td><code>NONE</code></td>
<td>
<p>The <code>NONE</code> mode does not configure redirect to Envoy at all. This is an advanced
configuration that typically requires changes to user applications.</p>

</td>
</tr>
</tbody>
Expand Down
Loading

0 comments on commit 08fe6be

Please sign in to comment.