Skip to content

rename NetworkScope to ServiceDependency #720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rshriram merged 2 commits into from
Nov 29, 2018
Merged

rename NetworkScope to ServiceDependency #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97ec610
rename NetworkScope to ServiceDependency
Nov 29, 2018
f4cc082
update
Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
251 changes: 126 additions & 125 deletions mesh/v1alpha1/config.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions mesh/v1alpha1/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,10 @@ message MeshConfig {
// Fallback to old identity format(without trust domain) if not set.
string trust_domain = 26;

// Default network scope settings for each workload in the mesh. Network
// scope controls the reachability of workloads to other services in the
// mesh.
message DefaultNetworkScope {
// Default service dependency settings for each workload in the
// mesh. ServiceDependencycontrols the reachability of workloads to other
// services in the mesh.
message DefaultServiceDependency {
enum Mode {
// Configure routes to services in all namespaces, i.e. import
// services from all namespaces.
Expand All @@ -218,19 +218,19 @@ message MeshConfig {
Mode import_mode = 1;

// Specifies one or more namespaces that should be imported by default
// in all user defined NetworkScope resources in addition to the
// in all user defined ServiceDependency resources in addition to the
// namespaces explicitly specified by the end user. Use this setting to
// automatically import services/resources from namespaces such as
// istio-system that all workloads in the mesh depend upon.
repeated string import_namespaces = 2;
}

// The default network scope associated with every workload in the mesh.
// Pilot will program the routes in the sidecars and gateways
// accordingly. If omitted, sidecars will be configured to reach every
// service in the mesh. The default scope can be overriden by supplying a
// NetworkScope resource per namespace.
DefaultNetworkScope default_network_scope = 29;
// The default service dependency setting associated with every workload
// in the mesh. Pilot will program the routes in the sidecars and
// gateways accordingly. If omitted, sidecars will be configured to reach
// every service in the mesh. The default scope can be overriden by
// supplying a ServiceDependency resource per namespace.
DefaultServiceDependency default_service_dependency = 29;

// $hide_from_docs
// Next available field number: 30
Expand Down
38 changes: 19 additions & 19 deletions mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,15 +305,15 @@ <h2 id="MeshConfig">MeshConfig</h2>

</td>
</tr>
<tr id="MeshConfig-default_network_scope">
<td><code>defaultNetworkScope</code></td>
<td><code><a href="#MeshConfig-DefaultNetworkScope">MeshConfig.DefaultNetworkScope</a></code></td>
<tr id="MeshConfig-default_service_dependency">
<td><code>defaultServiceDependency</code></td>
<td><code><a href="#MeshConfig-DefaultServiceDependency">MeshConfig.DefaultServiceDependency</a></code></td>
<td>
<p>The default network scope associated with every workload in the mesh.
Pilot will program the routes in the sidecars and gateways
accordingly. If omitted, sidecars will be configured to reach every
service in the mesh. The default scope can be overriden by supplying a
NetworkScope resource per namespace.</p>
<p>The default service dependency setting associated with every workload
in the mesh. Pilot will program the routes in the sidecars and
gateways accordingly. If omitted, sidecars will be configured to reach
every service in the mesh. The default scope can be overriden by
supplying a ServiceDependency resource per namespace.</p>

</td>
</tr>
Expand Down Expand Up @@ -343,11 +343,11 @@ <h2 id="MeshConfig-AccessLogEncoding">MeshConfig.AccessLogEncoding</h2>
</tbody>
</table>
</section>
<h2 id="MeshConfig-DefaultNetworkScope">MeshConfig.DefaultNetworkScope</h2>
<h2 id="MeshConfig-DefaultServiceDependency">MeshConfig.DefaultServiceDependency</h2>
<section>
<p>Default network scope settings for each workload in the mesh. Network
scope controls the reachability of workloads to other services in the
mesh.</p>
<p>Default service dependency settings for each workload in the
mesh. ServiceDependencycontrols the reachability of workloads to other
services in the mesh.</p>

<table class="message-fields">
<thead>
Expand All @@ -358,20 +358,20 @@ <h2 id="MeshConfig-DefaultNetworkScope">MeshConfig.DefaultNetworkScope</h2>
</tr>
</thead>
<tbody>
<tr id="MeshConfig-DefaultNetworkScope-import_mode">
<tr id="MeshConfig-DefaultServiceDependency-import_mode">
<td><code>importMode</code></td>
<td><code><a href="#MeshConfig-DefaultNetworkScope-Mode">MeshConfig.DefaultNetworkScope.Mode</a></code></td>
<td><code><a href="#MeshConfig-DefaultServiceDependency-Mode">MeshConfig.DefaultServiceDependency.Mode</a></code></td>
<td>
<p>REQUIRED: The default import setting for every workload in the mesh.</p>

</td>
</tr>
<tr id="MeshConfig-DefaultNetworkScope-import_namespaces">
<tr id="MeshConfig-DefaultServiceDependency-import_namespaces">
<td><code>importNamespaces</code></td>
<td><code>string[]</code></td>
<td>
<p>Specifies one or more namespaces that should be imported by default
in all user defined NetworkScope resources in addition to the
in all user defined ServiceDependency resources in addition to the
namespaces explicitly specified by the end user. Use this setting to
automatically import services/resources from namespaces such as
istio-system that all workloads in the mesh depend upon.</p>
Expand All @@ -381,7 +381,7 @@ <h2 id="MeshConfig-DefaultNetworkScope">MeshConfig.DefaultNetworkScope</h2>
</tbody>
</table>
</section>
<h2 id="MeshConfig-DefaultNetworkScope-Mode">MeshConfig.DefaultNetworkScope.Mode</h2>
<h2 id="MeshConfig-DefaultServiceDependency-Mode">MeshConfig.DefaultServiceDependency.Mode</h2>
<section>
<table class="enum-values">
<thead>
Expand All @@ -391,15 +391,15 @@ <h2 id="MeshConfig-DefaultNetworkScope-Mode">MeshConfig.DefaultNetworkScope.Mode
</tr>
</thead>
<tbody>
<tr id="MeshConfig-DefaultNetworkScope-Mode-ALL_NAMESPACES">
<tr id="MeshConfig-DefaultServiceDependency-Mode-ALL_NAMESPACES">
<td><code>ALL_NAMESPACES</code></td>
<td>
<p>Configure routes to services in all namespaces, i.e. import
services from all namespaces.</p>

</td>
</tr>
<tr id="MeshConfig-DefaultNetworkScope-Mode-SAME_NAMESPACE">
<tr id="MeshConfig-DefaultServiceDependency-Mode-SAME_NAMESPACE">
<td><code>SAME_NAMESPACE</code></td>
<td>
<p>Only configure routes to services that are in the same namespace
Expand Down
Loading