ran 'make update'

openshift · Jul 26, 2017 · d758c79 · d758c79
1 parent 65288be
commit d758c79
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 1 deletion.
diff --git a/api/protobuf-spec/github_com_openshift_origin_pkg_sdn_apis_network_v1.proto b/api/protobuf-spec/github_com_openshift_origin_pkg_sdn_apis_network_v1.proto
diff --git a/api/swagger-spec/oapi-v1.json b/api/swagger-spec/oapi-v1.json
@@ -25794,6 +25794,7 @@
     "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.",
     "required": [
      "network",
+     "clusterNetworks",
      "hostsubnetlength",
      "serviceNetwork"
     ],
@@ -25814,6 +25815,13 @@
       "type": "string",
       "description": "Network is a CIDR string specifying the global overlay network's L3 space"
      },
+     "clusterNetworks": {
+      "type": "array",
+      "items": {
+       "$ref": "v1.ClusterNetworkEntry"
+      },
+      "description": "ClusterNetworks contains the definition of the CIDRs and that specify the global overlay networks L3 space"
+     },
      "hostsubnetlength": {
       "type": "integer",
       "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 @@
      }
     }
    },
+   "v1.ClusterNetworkEntry": {
+    "id": "v1.ClusterNetworkEntry",
+    "description": "Contains the CIDR and the host subnet length that defines one portion of the global overlay networks L3 space",
+    "required": [
+     "CIDR",
+     "hostsubnetlength"
+    ],
+    "properties": {
+     "CIDR": {
+      "type": "string",
+      "description": "CIDR is the CIDR string specifying one section of the global overlay network's L3 space"
+     },
+     "hostsubnetlength": {
+      "type": "integer",
+      "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"
+     }
+    }
+   },
    "v1.ClusterPolicyList": {
     "id": "v1.ClusterPolicyList",
     "description": "ClusterPolicyList is a collection of ClusterPolicies",

diff --git a/api/swagger-spec/openshift-openapi-spec.json b/api/swagger-spec/openshift-openapi-spec.json
@@ -99186,6 +99186,7 @@
     "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.",
     "required": [
      "network",
+     "clusterNetworks",
      "hostsubnetlength",
      "serviceNetwork"
     ],
@@ -99194,6 +99195,13 @@
       "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",
       "type": "string"
      },
+     "clusterNetworks": {
+      "description": "ClusterNetworks contains the definition of the CIDRs and that specify the global overlay networks L3 space",
+      "type": "array",
+      "items": {
+       "$ref": "#/definitions/com.github.openshift.origin.pkg.sdn.apis.network.v1.ClusterNetworkEntry"
+      }
+     },
      "hostsubnetlength": {
       "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",
       "type": "integer",
@@ -99233,6 +99241,24 @@
      }
     ]
    },
+   "com.github.openshift.origin.pkg.sdn.apis.network.v1.ClusterNetworkEntry": {
+    "description": "Contains the CIDR and the host subnet length that defines one portion of the global overlay networks L3 space",
+    "required": [
+     "CIDR",
+     "hostsubnetlength"
+    ],
+    "properties": {
+     "CIDR": {
+      "description": "CIDR is the CIDR string specifying one section of the global overlay network's L3 space",
+      "type": "string"
+     },
+     "hostsubnetlength": {
+      "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",
+      "type": "integer",
+      "format": "int64"
+     }
+    }
+   },
    "com.github.openshift.origin.pkg.sdn.apis.network.v1.ClusterNetworkList": {
     "description": "ClusterNetworkList is a collection of ClusterNetworks",
     "required": [

diff --git a/pkg/sdn/apis/network/v1/generated.proto b/pkg/sdn/apis/network/v1/generated.proto
diff --git a/pkg/sdn/apis/network/v1/types.go b/pkg/sdn/apis/network/v1/types.go
@@ -33,7 +33,7 @@ type ClusterNetwork struct {
 //Contains the CIDR and the host subnet length that defines one portion of the global overlay networks L3 space
 type ClusterNetworkEntry struct {
 	// CIDR is the CIDR string specifying one section of the global overlay network's L3 space
-	CIDR             string `json:"CIDR" protobuf:"bytes,1,opt,name=CIDR"`
+	CIDR string `json:"CIDR" protobuf:"bytes,1,opt,name=CIDR"`
 	// 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 uint32 `json:"hostsubnetlength" protobuf:"varint,2,opt,name=hostsubnetlength"`
 }