Skip to content

Commit d758c79

Browse files
ran 'make update'
1 parent 65288be commit d758c79

File tree

5 files changed

+57
-1
lines changed

5 files changed

+57
-1
lines changed

Diff for: api/protobuf-spec/github_com_openshift_origin_pkg_sdn_apis_network_v1.proto

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

Diff for: api/swagger-spec/oapi-v1.json

+26
Original file line numberDiff line numberDiff line change
@@ -25794,6 +25794,7 @@
2579425794
"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.",
2579525795
"required": [
2579625796
"network",
25797+
"clusterNetworks",
2579725798
"hostsubnetlength",
2579825799
"serviceNetwork"
2579925800
],
@@ -25814,6 +25815,13 @@
2581425815
"type": "string",
2581525816
"description": "Network is a CIDR string specifying the global overlay network's L3 space"
2581625817
},
25818+
"clusterNetworks": {
25819+
"type": "array",
25820+
"items": {
25821+
"$ref": "v1.ClusterNetworkEntry"
25822+
},
25823+
"description": "ClusterNetworks contains the definition of the CIDRs and that specify the global overlay networks L3 space"
25824+
},
2581725825
"hostsubnetlength": {
2581825826
"type": "integer",
2581925827
"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"
@@ -25828,6 +25836,24 @@
2582825836
}
2582925837
}
2583025838
},
25839+
"v1.ClusterNetworkEntry": {
25840+
"id": "v1.ClusterNetworkEntry",
25841+
"description": "Contains the CIDR and the host subnet length that defines one portion of the global overlay networks L3 space",
25842+
"required": [
25843+
"CIDR",
25844+
"hostsubnetlength"
25845+
],
25846+
"properties": {
25847+
"CIDR": {
25848+
"type": "string",
25849+
"description": "CIDR is the CIDR string specifying one section of the global overlay network's L3 space"
25850+
},
25851+
"hostsubnetlength": {
25852+
"type": "integer",
25853+
"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"
25854+
}
25855+
}
25856+
},
2583125857
"v1.ClusterPolicyList": {
2583225858
"id": "v1.ClusterPolicyList",
2583325859
"description": "ClusterPolicyList is a collection of ClusterPolicies",

Diff for: api/swagger-spec/openshift-openapi-spec.json

+26
Original file line numberDiff line numberDiff line change
@@ -99186,6 +99186,7 @@
9918699186
"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.",
9918799187
"required": [
9918899188
"network",
99189+
"clusterNetworks",
9918999190
"hostsubnetlength",
9919099191
"serviceNetwork"
9919199192
],
@@ -99194,6 +99195,13 @@
9919499195
"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",
9919599196
"type": "string"
9919699197
},
99198+
"clusterNetworks": {
99199+
"description": "ClusterNetworks contains the definition of the CIDRs and that specify the global overlay networks L3 space",
99200+
"type": "array",
99201+
"items": {
99202+
"$ref": "#/definitions/com.github.openshift.origin.pkg.sdn.apis.network.v1.ClusterNetworkEntry"
99203+
}
99204+
},
9919799205
"hostsubnetlength": {
9919899206
"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",
9919999207
"type": "integer",
@@ -99233,6 +99241,24 @@
9923399241
}
9923499242
]
9923599243
},
99244+
"com.github.openshift.origin.pkg.sdn.apis.network.v1.ClusterNetworkEntry": {
99245+
"description": "Contains the CIDR and the host subnet length that defines one portion of the global overlay networks L3 space",
99246+
"required": [
99247+
"CIDR",
99248+
"hostsubnetlength"
99249+
],
99250+
"properties": {
99251+
"CIDR": {
99252+
"description": "CIDR is the CIDR string specifying one section of the global overlay network's L3 space",
99253+
"type": "string"
99254+
},
99255+
"hostsubnetlength": {
99256+
"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",
99257+
"type": "integer",
99258+
"format": "int64"
99259+
}
99260+
}
99261+
},
9923699262
"com.github.openshift.origin.pkg.sdn.apis.network.v1.ClusterNetworkList": {
9923799263
"description": "ClusterNetworkList is a collection of ClusterNetworks",
9923899264
"required": [

Diff for: pkg/sdn/apis/network/v1/generated.proto

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

Diff for: pkg/sdn/apis/network/v1/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type ClusterNetwork struct {
3333
//Contains the CIDR and the host subnet length that defines one portion of the global overlay networks L3 space
3434
type ClusterNetworkEntry struct {
3535
// CIDR is the CIDR string specifying one section of the global overlay network's L3 space
36-
CIDR string `json:"CIDR" protobuf:"bytes,1,opt,name=CIDR"`
36+
CIDR string `json:"CIDR" protobuf:"bytes,1,opt,name=CIDR"`
3737
// 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
3838
HostSubnetLength uint32 `json:"hostsubnetlength" protobuf:"varint,2,opt,name=hostsubnetlength"`
3939
}

0 commit comments

Comments
 (0)