Skip to content

Commit 5f143b0

Browse files
JacobTanenbaumJacobTanenbaum
committed
auto generated files
1 parent d2ddabe commit 5f143b0

15 files changed

+531
-80
lines changed

‎api/docs/apis-network.openshift.io/v1.ClusterNetwork.adoc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ Expand or mouse-over a field for more information about it.
1919
++++
2020
<pre>
2121
<div style="margin-left:13px;"><span title="(string) APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources">apiVersion</span>:
22-
</div><div style="margin-left:13px;"><span title="(integer) HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods">hostsubnetlength</span>:
22+
</div><details><summary><span title="(array) ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network&#39;s L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from. If this is specified, then DeprecatedClusterNetworkCIDR and DeprecatedHostSubnetLength may not be set.">clusterNetworks</span>:
23+
</summary><div style="margin-left:13px;">- <span title="(string) CIDR defines the total range of a cluster networks address space.">CIDR</span>:
24+
</div><div style="margin-left:13px;"> <span title="(integer) HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods.">hostSubnetLength</span>:
25+
</div></details><div style="margin-left:13px;"><span title="(integer) HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods">hostsubnetlength</span>:
2326
</div><div style="margin-left:13px;"><span title="(string) Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds">kind</span>:
2427
</div><details open><summary><span title="(v1.ObjectMeta) Standard object&#39;s metadata.">metadata</span>:
2528
</summary><details><summary> <span title="(object) Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations">annotations</span>:

‎api/docs/oapi/v1.ClusterNetwork.adoc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ Expand or mouse-over a field for more information about it.
1919
++++
2020
<pre>
2121
<div style="margin-left:13px;"><span title="(string) APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources">apiVersion</span>:
22-
</div><div style="margin-left:13px;"><span title="(integer) HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods">hostsubnetlength</span>:
22+
</div><details><summary><span title="(array) ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network&#39;s L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from. If this is specified, then DeprecatedClusterNetworkCIDR and DeprecatedHostSubnetLength may not be set.">clusterNetworks</span>:
23+
</summary><div style="margin-left:13px;">- <span title="(string) CIDR defines the total range of a cluster networks address space.">CIDR</span>:
24+
</div><div style="margin-left:13px;"> <span title="(integer) HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods.">hostSubnetLength</span>:
25+
</div></details><div style="margin-left:13px;"><span title="(integer) HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods">hostsubnetlength</span>:
2326
</div><div style="margin-left:13px;"><span title="(string) Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds">kind</span>:
2427
</div><details open><summary><span title="(v1.ObjectMeta) Standard object&#39;s metadata.">metadata</span>:
2528
</summary><details><summary> <span title="(object) Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations">annotations</span>:

‎api/protobuf-spec/github_com_openshift_origin_pkg_network_apis_network_v1.proto‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/swagger-spec/oapi-v1.json‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22781,9 +22781,8 @@
2278122781
"id": "v1.ClusterNetwork",
2278222782
"description": "ClusterNetwork describes the cluster network. There is normally only one object of this type, named \"default\", which is created by the SDN network plugin based on the master configuration when the cluster is brought up for the first time.",
2278322783
"required": [
22784-
"network",
22785-
"hostsubnetlength",
22786-
"serviceNetwork"
22784+
"serviceNetwork",
22785+
"clusterNetworks"
2278722786
],
2278822787
"properties": {
2278922788
"kind": {
@@ -22813,6 +22812,31 @@
2281322812
"pluginName": {
2281422813
"type": "string",
2281522814
"description": "PluginName is the name of the network plugin being used"
22815+
},
22816+
"clusterNetworks": {
22817+
"type": "array",
22818+
"items": {
22819+
"$ref": "v1.ClusterNetworkEntry"
22820+
},
22821+
"description": "ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from. If this is specified, then DeprecatedClusterNetworkCIDR and DeprecatedHostSubnetLength may not be set."
22822+
}
22823+
}
22824+
},
22825+
"v1.ClusterNetworkEntry": {
22826+
"id": "v1.ClusterNetworkEntry",
22827+
"description": "ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.",
22828+
"required": [
22829+
"CIDR",
22830+
"hostSubnetLength"
22831+
],
22832+
"properties": {
22833+
"CIDR": {
22834+
"type": "string",
22835+
"description": "CIDR defines the total range of a cluster networks address space."
22836+
},
22837+
"hostSubnetLength": {
22838+
"type": "integer",
22839+
"description": "HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods."
2281622840
}
2281722841
}
2281822842
},

‎api/swagger-spec/openshift-openapi-spec.json‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90742,15 +90742,21 @@
9074290742
"com.github.openshift.origin.pkg.network.apis.network.v1.ClusterNetwork": {
9074390743
"description": "ClusterNetwork describes the cluster network. There is normally only one object of this type, named \"default\", which is created by the SDN network plugin based on the master configuration when the cluster is brought up for the first time.",
9074490744
"required": [
90745-
"network",
90746-
"hostsubnetlength",
90747-
"serviceNetwork"
90745+
"serviceNetwork",
90746+
"clusterNetworks"
9074890747
],
9074990748
"properties": {
9075090749
"apiVersion": {
9075190750
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
9075290751
"type": "string"
9075390752
},
90753+
"clusterNetworks": {
90754+
"description": "ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from. If this is specified, then DeprecatedClusterNetworkCIDR and DeprecatedHostSubnetLength may not be set.",
90755+
"type": "array",
90756+
"items": {
90757+
"$ref": "#/definitions/com.github.openshift.origin.pkg.network.apis.network.v1.ClusterNetworkEntry"
90758+
}
90759+
},
9075490760
"hostsubnetlength": {
9075590761
"description": "HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods",
9075690762
"type": "integer",
@@ -90790,6 +90796,24 @@
9079090796
}
9079190797
]
9079290798
},
90799+
"com.github.openshift.origin.pkg.network.apis.network.v1.ClusterNetworkEntry": {
90800+
"description": "ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.",
90801+
"required": [
90802+
"CIDR",
90803+
"hostSubnetLength"
90804+
],
90805+
"properties": {
90806+
"CIDR": {
90807+
"description": "CIDR defines the total range of a cluster networks address space.",
90808+
"type": "string"
90809+
},
90810+
"hostSubnetLength": {
90811+
"description": "HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods.",
90812+
"type": "integer",
90813+
"format": "int64"
90814+
}
90815+
}
90816+
},
9079390817
"com.github.openshift.origin.pkg.network.apis.network.v1.ClusterNetworkList": {
9079490818
"description": "ClusterNetworkList is a collection of ClusterNetworks",
9079590819
"required": [

‎pkg/cmd/server/api/v1/swagger_doc.go‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,16 @@ func (ClientConnectionOverrides) SwaggerDoc() map[string]string {
145145
return map_ClientConnectionOverrides
146146
}
147147

148+
var map_ClusterNetworkEntry = map[string]string{
149+
"": "ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.",
150+
"cidr": "CIDR defines the total range of a cluster networks address space.",
151+
"hostSubnetLength": "HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pod.",
152+
}
153+
154+
func (ClusterNetworkEntry) SwaggerDoc() map[string]string {
155+
return map_ClusterNetworkEntry
156+
}
157+
148158
var map_ControllerConfig = map[string]string{
149159
"": "ControllerConfig holds configuration values for controllers",
150160
"election": "Election defines the configuration for electing a controller instance to make changes to the cluster. If unspecified, the ControllerTTL value is checked to determine whether the legacy direct etcd election code will be used.",
@@ -536,8 +546,9 @@ func (MasterConfig) SwaggerDoc() map[string]string {
536546
var map_MasterNetworkConfig = map[string]string{
537547
"": "MasterNetworkConfig to be passed to the compiled in network plugin",
538548
"networkPluginName": "NetworkPluginName is the name of the network plugin to use",
539-
"clusterNetworkCIDR": "ClusterNetworkCIDR is the CIDR string to specify the global overlay network's L3 space",
540-
"hostSubnetLength": "HostSubnetLength is the number of bits to allocate to each host's subnet e.g. 8 would mean a /24 network on the host",
549+
"clusterNetworkCIDR": "ClusterNetworkCIDR is the CIDR string to specify the global overlay network's L3 space. Deprecated, but maintained for backwards compatibility, use ClusterNetworks instead.",
550+
"clusterNetworks": "ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from. If this is specified, then DeprecatedClusterNetworkCIDR and DeprecatedHostSubnetLength may not be set.",
551+
"hostSubnetLength": "HostSubnetLength is the number of bits to allocate to each host's subnet e.g. 8 would mean a /24 network on the host. Deprecated, but maintained for backwards compatibility, use ClusterNetworks instead.",
541552
"serviceNetworkCIDR": "ServiceNetwork is the CIDR string to specify the service networks",
542553
"externalIPNetworkCIDRs": "ExternalIPNetworkCIDRs controls what values are acceptable for the service external IP field. If empty, no externalIP may be set. It may contain a list of CIDRs which are checked for access. If a CIDR is prefixed with !, IPs in that CIDR will be rejected. Rejections will be applied first, then the IP checked against one of the allowed CIDRs. You should ensure this range does not overlap with your nodes, pods, or service CIDRs for security reasons.",
543554
"ingressIPNetworkCIDR": "IngressIPNetworkCIDR controls the range to assign ingress ips from for services of type LoadBalancer on bare metal. If empty, ingress ips will not be assigned. It may contain a single CIDR that will be allocated from. For security reasons, you should ensure that this range does not overlap with the CIDRs reserved for external ips, nodes, pods, or services.",

‎pkg/cmd/server/api/v1/zz_generated.deepcopy.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
3131
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_BasicAuthPasswordIdentityProvider, InType: reflect.TypeOf(&BasicAuthPasswordIdentityProvider{})},
3232
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_CertInfo, InType: reflect.TypeOf(&CertInfo{})},
3333
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ClientConnectionOverrides, InType: reflect.TypeOf(&ClientConnectionOverrides{})},
34+
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ClusterNetworkEntry, InType: reflect.TypeOf(&ClusterNetworkEntry{})},
3435
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ControllerConfig, InType: reflect.TypeOf(&ControllerConfig{})},
3536
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_ControllerElectionConfig, InType: reflect.TypeOf(&ControllerElectionConfig{})},
3637
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1_DNSConfig, InType: reflect.TypeOf(&DNSConfig{})},
@@ -295,6 +296,16 @@ func DeepCopy_v1_ClientConnectionOverrides(in interface{}, out interface{}, c *c
295296
}
296297
}
297298

299+
// DeepCopy_v1_ClusterNetworkEntry is an autogenerated deepcopy function.
300+
func DeepCopy_v1_ClusterNetworkEntry(in interface{}, out interface{}, c *conversion.Cloner) error {
301+
{
302+
in := in.(*ClusterNetworkEntry)
303+
out := out.(*ClusterNetworkEntry)
304+
*out = *in
305+
return nil
306+
}
307+
}
308+
298309
// DeepCopy_v1_ControllerConfig is an autogenerated deepcopy function.
299310
func DeepCopy_v1_ControllerConfig(in interface{}, out interface{}, c *conversion.Cloner) error {
300311
{
@@ -888,6 +899,11 @@ func DeepCopy_v1_MasterNetworkConfig(in interface{}, out interface{}, c *convers
888899
in := in.(*MasterNetworkConfig)
889900
out := out.(*MasterNetworkConfig)
890901
*out = *in
902+
if in.ClusterNetworks != nil {
903+
in, out := &in.ClusterNetworks, &out.ClusterNetworks
904+
*out = make([]ClusterNetworkEntry, len(*in))
905+
copy(*out, *in)
906+
}
891907
if in.ExternalIPNetworkCIDRs != nil {
892908
in, out := &in.ExternalIPNetworkCIDRs, &out.ExternalIPNetworkCIDRs
893909
*out = make([]string, len(*in))

‎pkg/cmd/server/api/zz_generated.deepcopy.go‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error {
3131
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_BasicAuthPasswordIdentityProvider, InType: reflect.TypeOf(&BasicAuthPasswordIdentityProvider{})},
3232
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_CertInfo, InType: reflect.TypeOf(&CertInfo{})},
3333
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ClientConnectionOverrides, InType: reflect.TypeOf(&ClientConnectionOverrides{})},
34+
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ClusterNetworkEntry, InType: reflect.TypeOf(&ClusterNetworkEntry{})},
3435
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ControllerConfig, InType: reflect.TypeOf(&ControllerConfig{})},
3536
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_ControllerElectionConfig, InType: reflect.TypeOf(&ControllerElectionConfig{})},
3637
conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_api_DNSConfig, InType: reflect.TypeOf(&DNSConfig{})},
@@ -301,6 +302,16 @@ func DeepCopy_api_ClientConnectionOverrides(in interface{}, out interface{}, c *
301302
}
302303
}
303304

305+
// DeepCopy_api_ClusterNetworkEntry is an autogenerated deepcopy function.
306+
func DeepCopy_api_ClusterNetworkEntry(in interface{}, out interface{}, c *conversion.Cloner) error {
307+
{
308+
in := in.(*ClusterNetworkEntry)
309+
out := out.(*ClusterNetworkEntry)
310+
*out = *in
311+
return nil
312+
}
313+
}
314+
304315
// DeepCopy_api_ControllerConfig is an autogenerated deepcopy function.
305316
func DeepCopy_api_ControllerConfig(in interface{}, out interface{}, c *conversion.Cloner) error {
306317
{
@@ -889,6 +900,11 @@ func DeepCopy_api_MasterNetworkConfig(in interface{}, out interface{}, c *conver
889900
in := in.(*MasterNetworkConfig)
890901
out := out.(*MasterNetworkConfig)
891902
*out = *in
903+
if in.ClusterNetworks != nil {
904+
in, out := &in.ClusterNetworks, &out.ClusterNetworks
905+
*out = make([]ClusterNetworkEntry, len(*in))
906+
copy(*out, *in)
907+
}
892908
if in.ExternalIPNetworkCIDRs != nil {
893909
in, out := &in.ExternalIPNetworkCIDRs, &out.ExternalIPNetworkCIDRs
894910
*out = make([]string, len(*in))

0 commit comments

Comments
 (0)