Skip to content

Commit a4e6b95

Browse files
TaoZou1TaoZou1
committed
Merge branch 'main' into v4.2.0
2 parents 57e668b + 0784c07 commit a4e6b95

File tree

138 files changed

+10013
-1250
lines changed

Some content is hidden

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

138 files changed

+10013
-1250
lines changed

‎.golangci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,10 @@ linters:
3232
- gosec
3333
- goimports
3434
- vet
35-
- revive
35+
- revive
36+
37+
issues:
38+
exclude-rules:
39+
- linters:
40+
- staticcheck
41+
text: "SA1019: lbs.RelaxScaleValidation"

‎Makefile

Lines changed: 1 addition & 1 deletion
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_addressbindings.yaml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
annotations:
6+
controller-gen.kubebuilder.io/version: v0.14.0
7+
name: addressbindings.nsx.vmware.com
8+
spec:
9+
group: nsx.vmware.com
10+
names:
11+
kind: AddressBinding
12+
listKind: AddressBindingList
13+
plural: addressbindings
14+
singular: addressbinding
15+
scope: Namespaced
16+
versions:
17+
- name: v1alpha1
18+
schema:
19+
openAPIV3Schema:
20+
description: AddressBinding is used to manage 1:1 NAT for a VM/NetworkInterface.
21+
properties:
22+
apiVersion:
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
28+
type: string
29+
kind:
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
36+
type: string
37+
metadata:
38+
type: object
39+
spec:
40+
properties:
41+
interfaceName:
42+
description: InterfaceName contains the interface name of the VM,
43+
if not set, the first interface of the VM will be used
44+
type: string
45+
vmName:
46+
description: VMName contains the VM's name
47+
type: string
48+
required:
49+
- vmName
50+
type: object
51+
status:
52+
properties:
53+
ipAddress:
54+
type: string
55+
required:
56+
- ipAddress
57+
type: object
58+
required:
59+
- spec
60+
- status
61+
type: object
62+
served: true
63+
storage: true
64+
subresources:
65+
status: {}

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

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
annotations:
6+
controller-gen.kubebuilder.io/version: v0.14.0
7+
name: ipaddressallocations.nsx.vmware.com
8+
spec:
9+
group: nsx.vmware.com
10+
names:
11+
kind: IPAddressAllocation
12+
listKind: IPAddressAllocationList
13+
plural: ipaddressallocations
14+
singular: ipaddressallocation
15+
scope: Namespaced
16+
versions:
17+
- additionalPrinterColumns:
18+
- description: IPAddressBlockVisibility of IPAddressAllocation
19+
jsonPath: .spec.ip_address_block_visibility
20+
name: IPAddressBlockVisibility
21+
type: string
22+
- description: CIDRs for the IPAddressAllocation
23+
jsonPath: .status.cidr
24+
name: CIDR
25+
type: string
26+
name: v1alpha1
27+
schema:
28+
openAPIV3Schema:
29+
description: IPAddressAllocation is the Schema for the IP allocation API.
30+
properties:
31+
apiVersion:
32+
description: |-
33+
APIVersion defines the versioned schema of this representation of an object.
34+
Servers should convert recognized schemas to the latest internal value, and
35+
may reject unrecognized values.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
37+
type: string
38+
kind:
39+
description: |-
40+
Kind is a string value representing the REST resource this object represents.
41+
Servers may infer this from the endpoint the client submits requests to.
42+
Cannot be updated.
43+
In CamelCase.
44+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
45+
type: string
46+
metadata:
47+
type: object
48+
spec:
49+
description: IPAddressAllocationSpec defines the desired state of IPAddressAllocation.
50+
properties:
51+
allocation_size:
52+
description: AllocationSize specifies the size of IP CIDR to be allocated.
53+
type: integer
54+
ip_address_block_visibility:
55+
default: Private
56+
description: IPAddressBlockVisibility specifies the visibility of
57+
the IPBlocks to allocate IP addresses. Can be External or Private.
58+
enum:
59+
- External
60+
- Private
61+
type: string
62+
type: object
63+
status:
64+
description: IPAddressAllocationStatus defines the observed state of IPAddressAllocation.
65+
properties:
66+
CIDR:
67+
description: CIDR is the allocated CIDR
68+
type: string
69+
conditions:
70+
items:
71+
description: Condition defines condition of custom resource.
72+
properties:
73+
lastTransitionTime:
74+
description: |-
75+
Last time the condition transitioned from one status to another.
76+
This should be when the underlying condition changed. If that is not known, then using the time when
77+
the API field changed is acceptable.
78+
format: date-time
79+
type: string
80+
message:
81+
description: Message shows a human-readable message about condition.
82+
type: string
83+
reason:
84+
description: Reason shows a brief reason of condition.
85+
type: string
86+
status:
87+
description: Status of the condition, one of True, False, Unknown.
88+
type: string
89+
type:
90+
description: Type defines condition type.
91+
type: string
92+
required:
93+
- status
94+
- type
95+
type: object
96+
type: array
97+
required:
98+
- CIDR
99+
type: object
100+
required:
101+
- metadata
102+
- spec
103+
type: object
104+
served: true
105+
storage: true
106+
subresources:
107+
status: {}

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

Lines changed: 37 additions & 26 deletions
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
@@ -187,10 +198,10 @@ spec:
187198
description: Condition defines condition of custom resource.
188199
properties:
189200
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.
201+
description: |-
202+
Last time the condition transitioned from one status to another.
203+
This should be when the underlying condition changed. If that is not known, then using the time when
204+
the API field changed is acceptable.
194205
format: date-time
195206
type: string
196207
message:

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

Lines changed: 12 additions & 8 deletions
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

0 commit comments

Comments
 (0)