Skip to content

Commit

Permalink
Merge pull request vmware-tanzu#654 from TaoZou1/main-sync
Browse files Browse the repository at this point in the history
Main sync
  • Loading branch information
TaoZou1 authored Jul 30, 2024
2 parents 57e668b + a4e6b95 commit a90cd10
Show file tree
Hide file tree
Showing 138 changed files with 10,013 additions and 1,250 deletions.
8 changes: 7 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,10 @@ linters:
- gosec
- goimports
- vet
- revive
- revive

issues:
exclude-rules:
- linters:
- staticcheck
text: "SA1019: lbs.RelaxScaleValidation"
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
.PHONY: controller-gen
controller-gen: ## Download controller-gen locally if necessary.
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.0)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)

KUSTOMIZE = $(shell pwd)/bin/kustomize
.PHONY: kustomize
Expand Down
65 changes: 65 additions & 0 deletions build/yaml/crd/nsx.vmware.com_addressbindings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
name: addressbindings.nsx.vmware.com
spec:
group: nsx.vmware.com
names:
kind: AddressBinding
listKind: AddressBindingList
plural: addressbindings
singular: addressbinding
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: AddressBinding is used to manage 1:1 NAT for a VM/NetworkInterface.
properties:
apiVersion:
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/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
properties:
interfaceName:
description: InterfaceName contains the interface name of the VM,
if not set, the first interface of the VM will be used
type: string
vmName:
description: VMName contains the VM's name
type: string
required:
- vmName
type: object
status:
properties:
ipAddress:
type: string
required:
- ipAddress
type: object
required:
- spec
- status
type: object
served: true
storage: true
subresources:
status: {}
107 changes: 107 additions & 0 deletions build/yaml/crd/nsx.vmware.com_ipaddressallocations.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
name: ipaddressallocations.nsx.vmware.com
spec:
group: nsx.vmware.com
names:
kind: IPAddressAllocation
listKind: IPAddressAllocationList
plural: ipaddressallocations
singular: ipaddressallocation
scope: Namespaced
versions:
- additionalPrinterColumns:
- description: IPAddressBlockVisibility of IPAddressAllocation
jsonPath: .spec.ip_address_block_visibility
name: IPAddressBlockVisibility
type: string
- description: CIDRs for the IPAddressAllocation
jsonPath: .status.cidr
name: CIDR
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: IPAddressAllocation is the Schema for the IP allocation API.
properties:
apiVersion:
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/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: IPAddressAllocationSpec defines the desired state of IPAddressAllocation.
properties:
allocation_size:
description: AllocationSize specifies the size of IP CIDR to be allocated.
type: integer
ip_address_block_visibility:
default: Private
description: IPAddressBlockVisibility specifies the visibility of
the IPBlocks to allocate IP addresses. Can be External or Private.
enum:
- External
- Private
type: string
type: object
status:
description: IPAddressAllocationStatus defines the observed state of IPAddressAllocation.
properties:
CIDR:
description: CIDR is the allocated CIDR
type: string
conditions:
items:
description: Condition defines condition of custom resource.
properties:
lastTransitionTime:
description: |-
Last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when
the API field changed is acceptable.
format: date-time
type: string
message:
description: Message shows a human-readable message about condition.
type: string
reason:
description: Reason shows a brief reason of condition.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type defines condition type.
type: string
required:
- status
- type
type: object
type: array
required:
- CIDR
type: object
required:
- metadata
- spec
type: object
served: true
storage: true
subresources:
status: {}
63 changes: 37 additions & 26 deletions build/yaml/crd/nsx.vmware.com_ippools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: ippools.nsx.vmware.com
spec:
group: nsx.vmware.com
Expand All @@ -21,14 +20,19 @@ spec:
description: IPPool is the Schema for the ippools API.
properties:
apiVersion:
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/sig-architecture/api-conventions.md#resources'
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/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -42,8 +46,9 @@ spec:
properties:
ipFamily:
default: IPv4
description: IPFamily defines the IP family type for this subnet,
could be IPv4 or IPv6. This is optional, the default is IPv4.
description: |-
IPFamily defines the IP family type for this subnet, could be IPv4 or IPv6.
This is optional, the default is IPv4.
enum:
- IPv4
- IPv6
Expand All @@ -68,10 +73,10 @@ spec:
description: Condition defines condition of custom resource.
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another. This should be when the underlying condition changed.
If that is not known, then using the time when the API field
changed is acceptable.
description: |-
Last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when
the API field changed is acceptable.
format: date-time
type: string
message:
Expand Down Expand Up @@ -134,14 +139,19 @@ spec:
description: IPPool is the Schema for the ippools API.
properties:
apiVersion:
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/sig-architecture/api-conventions.md#resources'
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/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -155,8 +165,9 @@ spec:
properties:
ipFamily:
default: IPv4
description: IPFamily defines the IP family type for this subnet,
could be IPv4 or IPv6. This is optional, the default is IPv4.
description: |-
IPFamily defines the IP family type for this subnet, could be IPv4 or IPv6.
This is optional, the default is IPv4.
enum:
- IPv4
- IPv6
Expand Down Expand Up @@ -187,10 +198,10 @@ spec:
description: Condition defines condition of custom resource.
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another. This should be when the underlying condition changed.
If that is not known, then using the time when the API field
changed is acceptable.
description: |-
Last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when
the API field changed is acceptable.
format: date-time
type: string
message:
Expand Down
20 changes: 12 additions & 8 deletions build/yaml/crd/nsx.vmware.com_networkinfos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: networkinfos.nsx.vmware.com
spec:
group: nsx.vmware.com
Expand All @@ -21,14 +20,19 @@ spec:
description: NetworkInfo is used to report the network information for a namespace.
properties:
apiVersion:
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/sig-architecture/api-conventions.md#resources'
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/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down
Loading

0 comments on commit a90cd10

Please sign in to comment.