Skip to content

Commit 6882e76

Browse files
authored
Merge pull request kubernetes#114063 from ruquanzhao/fixNetworkTypesDoc
fix doc of types.go of network v1, v1alpha1, v1beta1
2 parents f56c793 + d5b4644 commit 6882e76

File tree

14 files changed

+738
-701
lines changed

14 files changed

+738
-701
lines changed

api/openapi-spec/swagger.json

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

api/openapi-spec/v3/apis__networking.k8s.io__v1_openapi.json

Lines changed: 59 additions & 59 deletions
Large diffs are not rendered by default.

api/openapi-spec/v3/apis__networking.k8s.io__v1alpha1_openapi.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
}
110110
],
111111
"default": {},
112-
"description": "Spec is the desired state of the ClusterCIDR. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status"
112+
"description": "spec is the desired state of the ClusterCIDR. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status"
113113
}
114114
},
115115
"type": "object",
@@ -129,7 +129,7 @@
129129
"type": "string"
130130
},
131131
"items": {
132-
"description": "Items is the list of ClusterCIDRs.",
132+
"description": "items is the list of ClusterCIDRs.",
133133
"items": {
134134
"allOf": [
135135
{
@@ -171,12 +171,12 @@
171171
"properties": {
172172
"ipv4": {
173173
"default": "",
174-
"description": "IPv4 defines an IPv4 IP block in CIDR notation(e.g. \"10.0.0.0/8\"). At least one of IPv4 and IPv6 must be specified. This field is immutable.",
174+
"description": "ipv4 defines an IPv4 IP block in CIDR notation(e.g. \"10.0.0.0/8\"). At least one of ipv4 and ipv6 must be specified. This field is immutable.",
175175
"type": "string"
176176
},
177177
"ipv6": {
178178
"default": "",
179-
"description": "IPv6 defines an IPv6 IP block in CIDR notation(e.g. \"2001:db8::/64\"). At least one of IPv4 and IPv6 must be specified. This field is immutable.",
179+
"description": "ipv6 defines an IPv6 IP block in CIDR notation(e.g. \"2001:db8::/64\"). At least one of ipv4 and ipv6 must be specified. This field is immutable.",
180180
"type": "string"
181181
},
182182
"nodeSelector": {
@@ -185,11 +185,11 @@
185185
"$ref": "#/components/schemas/io.k8s.api.core.v1.NodeSelector"
186186
}
187187
],
188-
"description": "NodeSelector defines which nodes the config is applicable to. An empty or nil NodeSelector selects all nodes. This field is immutable."
188+
"description": "nodeSelector defines which nodes the config is applicable to. An empty or nil nodeSelector selects all nodes. This field is immutable."
189189
},
190190
"perNodeHostBits": {
191191
"default": 0,
192-
"description": "PerNodeHostBits defines the number of host bits to be configured per node. A subnet mask determines how much of the address is used for network bits and host bits. For example an IPv4 address of 192.168.0.0/24, splits the address into 24 bits for the network portion and 8 bits for the host portion. To allocate 256 IPs, set this field to 8 (a /24 mask for IPv4 or a /120 for IPv6). Minimum value is 4 (16 IPs). This field is immutable.",
192+
"description": "perNodeHostBits defines the number of host bits to be configured per node. A subnet mask determines how much of the address is used for network bits and host bits. For example an IPv4 address of 192.168.0.0/24, splits the address into 24 bits for the network portion and 8 bits for the host portion. To allocate 256 IPs, set this field to 8 (a /24 mask for IPv4 or a /120 for IPv6). Minimum value is 4 (16 IPs). This field is immutable.",
193193
"format": "int32",
194194
"type": "integer"
195195
}

pkg/apis/networking/types.go

Lines changed: 113 additions & 99 deletions
Large diffs are not rendered by default.

pkg/generated/openapi/zz_generated.openapi.go

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

staging/src/k8s.io/api/networking/v1/generated.proto

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

staging/src/k8s.io/api/networking/v1/types.go

Lines changed: 100 additions & 88 deletions
Large diffs are not rendered by default.

staging/src/k8s.io/api/networking/v1/types_swagger_doc_generated.go

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

staging/src/k8s.io/api/networking/v1alpha1/generated.proto

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

staging/src/k8s.io/api/networking/v1alpha1/types.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,27 @@ import (
3737
// selector matches the Node may be used.
3838
type ClusterCIDR struct {
3939
metav1.TypeMeta `json:",inline"`
40+
4041
// Standard object's metadata.
4142
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
4243
// +optional
4344
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
4445

45-
// Spec is the desired state of the ClusterCIDR.
46+
// spec is the desired state of the ClusterCIDR.
4647
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
4748
// +optional
4849
Spec ClusterCIDRSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
4950
}
5051

5152
// ClusterCIDRSpec defines the desired state of ClusterCIDR.
5253
type ClusterCIDRSpec struct {
53-
// NodeSelector defines which nodes the config is applicable to.
54-
// An empty or nil NodeSelector selects all nodes.
54+
// nodeSelector defines which nodes the config is applicable to.
55+
// An empty or nil nodeSelector selects all nodes.
5556
// This field is immutable.
5657
// +optional
5758
NodeSelector *v1.NodeSelector `json:"nodeSelector,omitempty" protobuf:"bytes,1,opt,name=nodeSelector"`
5859

59-
// PerNodeHostBits defines the number of host bits to be configured per node.
60+
// perNodeHostBits defines the number of host bits to be configured per node.
6061
// A subnet mask determines how much of the address is used for network bits
6162
// and host bits. For example an IPv4 address of 192.168.0.0/24, splits the
6263
// address into 24 bits for the network portion and 8 bits for the host portion.
@@ -66,14 +67,14 @@ type ClusterCIDRSpec struct {
6667
// +required
6768
PerNodeHostBits int32 `json:"perNodeHostBits" protobuf:"varint,2,opt,name=perNodeHostBits"`
6869

69-
// IPv4 defines an IPv4 IP block in CIDR notation(e.g. "10.0.0.0/8").
70-
// At least one of IPv4 and IPv6 must be specified.
70+
// ipv4 defines an IPv4 IP block in CIDR notation(e.g. "10.0.0.0/8").
71+
// At least one of ipv4 and ipv6 must be specified.
7172
// This field is immutable.
7273
// +optional
7374
IPv4 string `json:"ipv4" protobuf:"bytes,3,opt,name=ipv4"`
7475

75-
// IPv6 defines an IPv6 IP block in CIDR notation(e.g. "2001:db8::/64").
76-
// At least one of IPv4 and IPv6 must be specified.
76+
// ipv6 defines an IPv6 IP block in CIDR notation(e.g. "2001:db8::/64").
77+
// At least one of ipv4 and ipv6 must be specified.
7778
// This field is immutable.
7879
// +optional
7980
IPv6 string `json:"ipv6" protobuf:"bytes,4,opt,name=ipv6"`
@@ -85,11 +86,12 @@ type ClusterCIDRSpec struct {
8586
// ClusterCIDRList contains a list of ClusterCIDR.
8687
type ClusterCIDRList struct {
8788
metav1.TypeMeta `json:",inline"`
89+
8890
// Standard object's metadata.
8991
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
9092
// +optional
9193
metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
9294

93-
// Items is the list of ClusterCIDRs.
95+
// items is the list of ClusterCIDRs.
9496
Items []ClusterCIDR `json:"items" protobuf:"bytes,2,rep,name=items"`
9597
}

0 commit comments

Comments
 (0)