Skip to content

K
k3s
Commit 641e359b authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #26193 from girishkalele/servicespec

Automatic merge from submit-queue Remove comment about empty selectors in the service spec As discussed, removing the comment about empty selectors in Service specs.
parents 044de6ef 3778ca19
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
api/swagger-spec/v1.json
View file @ 641e359b
...@@ -19226,7 +19226,7 @@ ...@@ -19226,7 +19226,7 @@
}, },
"selector": { "selector": {
"type": "object", "type": "object",
"description": "This service will route traffic to pods having labels matching this selector. Label keys and values that must match in order to receive traffic for this service. If empty, all pods are selected, if not specified, endpoints must be manually specified. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview" "description": "This service will route traffic to pods having labels matching this selector. Label keys and values that must match in order to receive traffic for this service. If not specified, endpoints must be manually specified and the system will not automatically manage them. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview"
}, },
"clusterIP": { "clusterIP": {
"type": "string", "type": "string",
......
docs/api-reference/v1/definitions.html
View file @ 641e359b
...@@ -7885,7 +7885,7 @@ The resulting set of endpoints can be viewed as:<br> ...@@ -7885,7 +7885,7 @@ The resulting set of endpoints can be viewed as:<br>
</tr> </tr>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">selector</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">selector</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">This service will route traffic to pods having labels matching this selector. Label keys and values that must match in order to receive traffic for this service. If empty, all pods are selected, if not specified, endpoints must be manually specified. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview">http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview</a></p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">This service will route traffic to pods having labels matching this selector. Label keys and values that must match in order to receive traffic for this service. If not specified, endpoints must be manually specified and the system will not automatically manage them. More info: <a href="http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview">http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">object</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">object</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
...@@ -8153,7 +8153,7 @@ The resulting set of endpoints can be viewed as:<br> ...@@ -8153,7 +8153,7 @@ The resulting set of endpoints can be viewed as:<br>
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2016-06-16 20:52:03 UTC Last updated 2016-06-28 21:36:31 UTC
</div> </div>
</div> </div>
</body> </body>
......
pkg/api/v1/generated.proto
View file @ 641e359b
...@@ -2676,7 +2676,7 @@ message ServiceSpec { ...@@ -2676,7 +2676,7 @@ message ServiceSpec {
// This service will route traffic to pods having labels matching this selector. // This service will route traffic to pods having labels matching this selector.
// Label keys and values that must match in order to receive traffic for this service. // Label keys and values that must match in order to receive traffic for this service.
// If empty, all pods are selected, if not specified, endpoints must be manually specified. // If not specified, endpoints must be manually specified and the system will not automatically manage them.
// More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview // More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview
map<string, string> selector = 2; map<string, string> selector = 2;
......
pkg/api/v1/types.go
View file @ 641e359b
...@@ -2048,7 +2048,7 @@ type ServiceSpec struct { ...@@ -2048,7 +2048,7 @@ type ServiceSpec struct {
// This service will route traffic to pods having labels matching this selector. // This service will route traffic to pods having labels matching this selector.
// Label keys and values that must match in order to receive traffic for this service. // Label keys and values that must match in order to receive traffic for this service.
// If empty, all pods are selected, if not specified, endpoints must be manually specified. // If not specified, endpoints must be manually specified and the system will not automatically manage them.
// More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview // More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview
Selector map[string]string `json:"selector,omitempty" protobuf:"bytes,2,rep,name=selector"` Selector map[string]string `json:"selector,omitempty" protobuf:"bytes,2,rep,name=selector"`
......
pkg/api/v1/types_swagger_doc_generated.go
View file @ 641e359b
...@@ -1614,7 +1614,7 @@ func (ServiceProxyOptions) SwaggerDoc() map[string]string { ...@@ -1614,7 +1614,7 @@ func (ServiceProxyOptions) SwaggerDoc() map[string]string {
var map_ServiceSpec = map[string]string{ var map_ServiceSpec = map[string]string{
"": "ServiceSpec describes the attributes that a user creates on a service.", "": "ServiceSpec describes the attributes that a user creates on a service.",
"ports": "The list of ports that are exposed by this service. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#virtual-ips-and-service-proxies", "ports": "The list of ports that are exposed by this service. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#virtual-ips-and-service-proxies",
"selector": "This service will route traffic to pods having labels matching this selector. Label keys and values that must match in order to receive traffic for this service. If empty, all pods are selected, if not specified, endpoints must be manually specified. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview", "selector": "This service will route traffic to pods having labels matching this selector. Label keys and values that must match in order to receive traffic for this service. If not specified, endpoints must be manually specified and the system will not automatically manage them. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#overview",
"clusterIP": "ClusterIP is usually assigned by the master and is the IP address of the service. If specified, it will be allocated to the service if it is unused or else creation of the service will fail. Valid values are None, empty string (\"\"), or a valid IP address. 'None' can be specified for a headless service when proxying is not required. Cannot be updated. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#virtual-ips-and-service-proxies", "clusterIP": "ClusterIP is usually assigned by the master and is the IP address of the service. If specified, it will be allocated to the service if it is unused or else creation of the service will fail. Valid values are None, empty string (\"\"), or a valid IP address. 'None' can be specified for a headless service when proxying is not required. Cannot be updated. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#virtual-ips-and-service-proxies",
"type": "Type of exposed service. Must be ClusterIP, NodePort, or LoadBalancer. Defaults to ClusterIP. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#external-services", "type": "Type of exposed service. Must be ClusterIP, NodePort, or LoadBalancer. Defaults to ClusterIP. More info: http://releases.k8s.io/HEAD/docs/user-guide/services.md#external-services",
"externalIPs": "externalIPs is a list of IP addresses for which nodes in the cluster will also accept traffic for this service. These IPs are not managed by Kubernetes. The user is responsible for ensuring that traffic arrives at a node with this IP. A common example is external load-balancers that are not part of the Kubernetes system. A previous form of this functionality exists as the deprecatedPublicIPs field. When using this field, callers should also clear the deprecatedPublicIPs field.", "externalIPs": "externalIPs is a list of IP addresses for which nodes in the cluster will also accept traffic for this service. These IPs are not managed by Kubernetes. The user is responsible for ensuring that traffic arrives at a node with this IP. A common example is external load-balancers that are not part of the Kubernetes system. A previous form of this functionality exists as the deprecatedPublicIPs field. When using this field, callers should also clear the deprecatedPublicIPs field.",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment