Skip to content

Commit b5d35aa

Browse files
authored
separate check and report clusters (#362)
* separate check and report clusters * fix * nits * nit * backward compat
1 parent ffa742d commit b5d35aa

File tree

3 files changed

+143
-89
lines changed

3 files changed

+143
-89
lines changed

mesh/v1alpha1/config.pb.go

+92-71
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mesh/v1alpha1/config.proto

+23-9
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,25 @@ message ProxyConfig {
117117
// MeshConfig defines mesh-wide variables shared by all Envoy instances in the
118118
// Istio service mesh.
119119
message MeshConfig {
120-
// Address of the egress Envoy service (e.g. _istio-egress:80_).
121-
string egress_proxy_address = 1;
122-
123-
// Address of the mixer service (e.g. _istio-mixer:15004_).
124-
// Empty value disables Mixer checks and telemetry.
125-
string mixer_address = 2;
126-
127-
// Disable policy checks by the mixer service. Metrics will still be
128-
// reported to the mixer for HTTP requests and TCP connections. Default
120+
// Address of the server that will be used by the proxies for policy
121+
// check calls (e.g. _istio-mixer:15004_). By using different names for
122+
// mixerCheckServer and mixerReportServer, it is possible to have one set
123+
// of mixer servers handle policy check calls, while another set of mixer
124+
// servers handle telemetry calls.
125+
//
126+
// NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
127+
// equivalent to setting disablePolicyChecks to true.
128+
string mixer_check_server = 1;
129+
130+
// Address of the server that will be used by the proxies as an Istio
131+
// telemetry sink (access logs, API/connection metrics)
132+
// (e.g. _istio-mixer:15004_). By using different names for
133+
// mixerCheckServer and mixerReportServer, it is possible to have one set
134+
// of mixer servers handle policy check calls, while another set of mixer
135+
// servers handle telemetry calls.
136+
string mixer_report_server = 2;
137+
138+
// Disable policy checks by the mixer service. Default
129139
// is false, i.e. mixer policy check is enabled by default.
130140
bool disable_policy_checks = 3;
131141

@@ -208,4 +218,8 @@ message MeshConfig {
208218
// DO NOT use this setting for services that are managed by Istio (i.e. using Istio sidecar).
209219
// Instead, use service-level annotations to overwrite the authentication policy.
210220
repeated string mtls_excluded_services = 15;
221+
222+
// DEPRECATED. Mixer address. This option will be removed soon. Please
223+
// use mixer_check_server and mixer_report_server.
224+
string mixer_address = 16;
211225
}

mesh/v1alpha1/istio.mesh.v1alpha1.pb.html

+28-9
Original file line numberDiff line numberDiff line change
@@ -60,29 +60,39 @@ <h2 id="MeshConfig">MeshConfig</h2>
6060
</tr>
6161
</thead>
6262
<tbody>
63-
<tr id="MeshConfig.egress_proxy_address">
64-
<td><code>egressProxyAddress</code></td>
63+
<tr id="MeshConfig.mixer_check_server">
64+
<td><code>mixerCheckServer</code></td>
6565
<td><code>string</code></td>
6666
<td>
67-
<p>Address of the egress Envoy service (e.g. <em>istio-egress:80</em>).</p>
67+
<p>Address of the server that will be used by the proxies for policy
68+
check calls (e.g. <em>istio-mixer:15004</em>). By using different names for
69+
mixerCheckServer and mixerReportServer, it is possible to have one set
70+
of mixer servers handle policy check calls, while another set of mixer
71+
servers handle telemetry calls.</p>
72+
73+
<p>NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
74+
equivalent to setting disablePolicyChecks to true.</p>
6875

6976
</td>
7077
</tr>
71-
<tr id="MeshConfig.mixer_address">
72-
<td><code>mixerAddress</code></td>
78+
<tr id="MeshConfig.mixer_report_server">
79+
<td><code>mixerReportServer</code></td>
7380
<td><code>string</code></td>
7481
<td>
75-
<p>Address of the mixer service (e.g. <em>istio-mixer:15004</em>).
76-
Empty value disables Mixer checks and telemetry.</p>
82+
<p>Address of the server that will be used by the proxies as an Istio
83+
telemetry sink (access logs, API/connection metrics)
84+
(e.g. <em>istio-mixer:15004</em>). By using different names for
85+
mixerCheckServer and mixerReportServer, it is possible to have one set
86+
of mixer servers handle policy check calls, while another set of mixer
87+
servers handle telemetry calls.</p>
7788

7889
</td>
7990
</tr>
8091
<tr id="MeshConfig.disable_policy_checks">
8192
<td><code>disablePolicyChecks</code></td>
8293
<td><code>bool</code></td>
8394
<td>
84-
<p>Disable policy checks by the mixer service. Metrics will still be
85-
reported to the mixer for HTTP requests and TCP connections. Default
95+
<p>Disable policy checks by the mixer service. Default
8696
is false, i.e. mixer policy check is enabled by default.</p>
8797

8898
</td>
@@ -197,6 +207,15 @@ <h2 id="MeshConfig">MeshConfig</h2>
197207
DO NOT use this setting for services that are managed by Istio (i.e. using Istio sidecar).
198208
Instead, use service-level annotations to overwrite the authentication policy.</p>
199209

210+
</td>
211+
</tr>
212+
<tr id="MeshConfig.mixer_address">
213+
<td><code>mixerAddress</code></td>
214+
<td><code>string</code></td>
215+
<td>
216+
<p>DEPRECATED. Mixer address. This option will be removed soon. Please
217+
use mixer<em>check</em>server and mixer<em>report</em>server.</p>
218+
200219
</td>
201220
</tr>
202221
</tbody>

0 commit comments

Comments
 (0)