Skip to content

Commit 225e5f5

Browse files
wenqiqwenqiq
committed
update NetworkConfiguration CR with new VPC API
Signed-off-by: Wenqi Qiu <[email protected]>
1 parent 4bc8285 commit 225e5f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+858
-831
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
146146
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
147147
.PHONY: controller-gen
148148
controller-gen: ## Download controller-gen locally if necessary.
149-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.0)
149+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
150150

151151
KUSTOMIZE = $(shell pwd)/bin/kustomize
152152
.PHONY: kustomize

‎build/yaml/crd/nsx.vmware.com_ippools.yaml

+40-27
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: ippools.nsx.vmware.com
98
spec:
109
group: nsx.vmware.com
@@ -21,14 +20,19 @@ spec:
2120
description: IPPool is the Schema for the ippools API.
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
@@ -42,8 +46,9 @@ spec:
4246
properties:
4347
ipFamily:
4448
default: IPv4
45-
description: IPFamily defines the IP family type for this subnet,
46-
could be IPv4 or IPv6. This is optional, the default is IPv4.
49+
description: |-
50+
IPFamily defines the IP family type for this subnet, could be IPv4 or IPv6.
51+
This is optional, the default is IPv4.
4752
enum:
4853
- IPv4
4954
- IPv6
@@ -68,10 +73,10 @@ spec:
6873
description: Condition defines condition of custom resource.
6974
properties:
7075
lastTransitionTime:
71-
description: Last time the condition transitioned from one status
72-
to another. This should be when the underlying condition changed.
73-
If that is not known, then using the time when the API field
74-
changed is acceptable.
76+
description: |-
77+
Last time the condition transitioned from one status to another.
78+
This should be when the underlying condition changed. If that is not known, then using the time when
79+
the API field changed is acceptable.
7580
format: date-time
7681
type: string
7782
message:
@@ -134,14 +139,19 @@ spec:
134139
description: IPPool is the Schema for the ippools API.
135140
properties:
136141
apiVersion:
137-
description: 'APIVersion defines the versioned schema of this representation
138-
of an object. Servers should convert recognized schemas to the latest
139-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
142+
description: |-
143+
APIVersion defines the versioned schema of this representation of an object.
144+
Servers should convert recognized schemas to the latest internal value, and
145+
may reject unrecognized values.
146+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
140147
type: string
141148
kind:
142-
description: 'Kind is a string value representing the REST resource this
143-
object represents. Servers may infer this from the endpoint the client
144-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
149+
description: |-
150+
Kind is a string value representing the REST resource this object represents.
151+
Servers may infer this from the endpoint the client submits requests to.
152+
Cannot be updated.
153+
In CamelCase.
154+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
145155
type: string
146156
metadata:
147157
type: object
@@ -155,8 +165,9 @@ spec:
155165
properties:
156166
ipFamily:
157167
default: IPv4
158-
description: IPFamily defines the IP family type for this subnet,
159-
could be IPv4 or IPv6. This is optional, the default is IPv4.
168+
description: |-
169+
IPFamily defines the IP family type for this subnet, could be IPv4 or IPv6.
170+
This is optional, the default is IPv4.
160171
enum:
161172
- IPv4
162173
- IPv6
@@ -172,10 +183,12 @@ spec:
172183
type: object
173184
type: array
174185
type:
175-
description: Type defines the type of this IPPool, Public or Private.
186+
description: Type defines the type of this IPPool, Public, Private
187+
or Project.
176188
enum:
177189
- Public
178190
- Private
191+
- Project
179192
type: string
180193
type: object
181194
status:
@@ -187,10 +200,10 @@ spec:
187200
description: Condition defines condition of custom resource.
188201
properties:
189202
lastTransitionTime:
190-
description: Last time the condition transitioned from one status
191-
to another. This should be when the underlying condition changed.
192-
If that is not known, then using the time when the API field
193-
changed is acceptable.
203+
description: |-
204+
Last time the condition transitioned from one status to another.
205+
This should be when the underlying condition changed. If that is not known, then using the time when
206+
the API field changed is acceptable.
194207
format: date-time
195208
type: string
196209
message:

‎build/yaml/crd/nsx.vmware.com_networkinfos.yaml

+13-9
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: networkinfos.nsx.vmware.com
98
spec:
109
group: nsx.vmware.com
@@ -21,14 +20,19 @@ spec:
2120
description: NetworkInfo is used to report the network information for a namespace.
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
@@ -46,7 +50,7 @@ spec:
4650
name:
4751
description: VPC name.
4852
type: string
49-
privateIPv4CIDRs:
53+
privateIPs:
5054
description: Private CIDRs used for the VPC.
5155
items:
5256
type: string

‎build/yaml/crd/nsx.vmware.com_nsxserviceaccounts.yaml

+45-39
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: nsxserviceaccounts.nsx.vmware.com
98
spec:
109
group: nsx.vmware.com
@@ -21,14 +20,19 @@ spec:
2120
description: NSXServiceAccount is the Schema for the nsxserviceaccounts API
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
@@ -50,46 +54,47 @@ spec:
5054
clusterName:
5155
type: string
5256
conditions:
53-
description: 'Represents the realization status of a NSXServiceAccount''s
54-
current state. Known .status.conditions.type is: "Realized"'
57+
description: |-
58+
Represents the realization status of a NSXServiceAccount's current state.
59+
Known .status.conditions.type is: "Realized"
5560
items:
5661
description: "Condition contains details for one aspect of the current
57-
state of this API Resource. --- This struct is intended for direct
58-
use as an array at the field path .status.conditions. For example,
59-
\n type FooStatus struct{ // Represents the observations of a
60-
foo's current state. // Known .status.conditions.type are: \"Available\",
61-
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
62-
// +listType=map // +listMapKey=type Conditions []metav1.Condition
63-
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
64-
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
62+
state of this API Resource.\n---\nThis struct is intended for
63+
direct use as an array at the field path .status.conditions. For
64+
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
65+
observations of a foo's current state.\n\t // Known .status.conditions.type
66+
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
67+
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
68+
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
69+
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
70+
\ // other fields\n\t}"
6571
properties:
6672
lastTransitionTime:
67-
description: lastTransitionTime is the last time the condition
68-
transitioned from one status to another. This should be when
69-
the underlying condition changed. If that is not known, then
70-
using the time when the API field changed is acceptable.
73+
description: |-
74+
lastTransitionTime is the last time the condition transitioned from one status to another.
75+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
7176
format: date-time
7277
type: string
7378
message:
74-
description: message is a human readable message indicating
75-
details about the transition. This may be an empty string.
79+
description: |-
80+
message is a human readable message indicating details about the transition.
81+
This may be an empty string.
7682
maxLength: 32768
7783
type: string
7884
observedGeneration:
79-
description: observedGeneration represents the .metadata.generation
80-
that the condition was set based upon. For instance, if .metadata.generation
81-
is currently 12, but the .status.conditions[x].observedGeneration
82-
is 9, the condition is out of date with respect to the current
83-
state of the instance.
85+
description: |-
86+
observedGeneration represents the .metadata.generation that the condition was set based upon.
87+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
88+
with respect to the current state of the instance.
8489
format: int64
8590
minimum: 0
8691
type: integer
8792
reason:
88-
description: reason contains a programmatic identifier indicating
89-
the reason for the condition's last transition. Producers
90-
of specific condition types may define expected values and
91-
meanings for this field, and whether the values are considered
92-
a guaranteed API. The value should be a CamelCase string.
93+
description: |-
94+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
95+
Producers of specific condition types may define expected values and meanings for this field,
96+
and whether the values are considered a guaranteed API.
97+
The value should be a CamelCase string.
9398
This field may not be empty.
9499
maxLength: 1024
95100
minLength: 1
@@ -103,11 +108,12 @@ spec:
103108
- Unknown
104109
type: string
105110
type:
106-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
107-
--- Many .condition.type values are consistent across resources
108-
like Available, but because arbitrary conditions can be useful
109-
(see .node.status.conditions), the ability to deconflict is
110-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
111+
description: |-
112+
type of condition in CamelCase or in foo.example.com/CamelCase.
113+
---
114+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
115+
useful (see .node.status.conditions), the ability to deconflict is important.
116+
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
111117
maxLength: 316
112118
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
113119
type: string

0 commit comments

Comments
 (0)