Merge pull request #653 from zhengxiexie/zhengxie/new_generated

Update code-generator for new apiVersion

build/image/photon/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.9 as golang-build
+FROM golang:1.22.5 as golang-build
 
 WORKDIR /source
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/nsx-operator
 
-go 1.21.9
+go 1.22.5
 
 replace (
 	github.com/vmware-tanzu/nsx-operator/pkg/apis => ./pkg/apis
@@ -17,8 +17,8 @@ require (
 	github.com/agiledragon/gomonkey/v2 v2.9.0
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/deckarep/golang-set v1.8.0
-	github.com/go-logr/logr v1.3.0
-	github.com/go-logr/zapr v1.2.4
+	github.com/go-logr/logr v1.4.1
+	github.com/go-logr/zapr v1.3.0
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/golang/mock v1.6.0
 	github.com/google/uuid v1.3.0
@@ -28,7 +28,7 @@ require (
 	github.com/prometheus/client_golang v1.16.0
 	github.com/sirupsen/logrus v1.9.0
 	github.com/stretchr/testify v1.8.4
-	github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240305035435-c992c623aad3
+	github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240730023032-0784c0791081
 	github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240102061654-537b080e159f
 	github.com/vmware-tanzu/vm-operator/api v1.8.2
 	github.com/vmware/govmomi v0.27.4
@@ -37,15 +37,15 @@ require (
 	github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.12.0
 	github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp v0.6.0
 	go.uber.org/automaxprocs v1.5.3
-	go.uber.org/zap v1.25.0
-	golang.org/x/crypto v0.17.0
+	go.uber.org/zap v1.26.0
+	golang.org/x/crypto v0.21.0
 	golang.org/x/time v0.3.0
 	gopkg.in/ini.v1 v1.66.4
-	k8s.io/api v0.29.3
-	k8s.io/apimachinery v0.29.3
-	k8s.io/client-go v0.29.3
-	k8s.io/code-generator v0.29.3
-	sigs.k8s.io/controller-runtime v0.16.0
+	k8s.io/api v0.30.3
+	k8s.io/apimachinery v0.30.3
+	k8s.io/client-go v0.30.3
+	k8s.io/code-generator v0.30.1
+	sigs.k8s.io/controller-runtime v0.18.4
 )
 
 require (
@@ -55,7 +55,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gibson042/canonicaljson-go v1.0.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -79,29 +79,28 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/oauth2 v0.10.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/mod v0.15.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/oauth2 v0.12.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.16.1 // indirect
+	golang.org/x/tools v0.18.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.29.3 // indirect
-	k8s.io/component-base v0.29.3 // indirect
-	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
-	k8s.io/klog/v2 v2.110.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/apiextensions-apiserver v0.30.1 // indirect
+	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
+	k8s.io/klog/v2 v2.120.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

hack/update-codegen.sh

@@ -8,7 +8,7 @@ set -o xtrace
 APIS=./pkg/apis
 APIS_PKG=github.com/vmware-tanzu/nsx-operator/pkg/apis
 OUTPUT_PKG=github.com/vmware-tanzu/nsx-operator/pkg/client
-GROUP=nsx.vmware.com
+GROUP=crd.nsx.vmware.com
 
 SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 CODEGEN_PKG=$(go env GOMODCACHE)/k8s.io/[email protected]

pkg/apis/crd.nsx.vmware.com/v1alpha1/addressbinding_types.go

@@ -0,0 +1,41 @@
+package v1alpha1
+
+import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+type AddressBindingSpec struct {
+	// VMName contains the VM's name
+	VMName string `json:"vmName"`
+	// InterfaceName contains the interface name of the VM, if not set, the first interface of the VM will be used
+	InterfaceName string `json:"interfaceName,omitempty"`
+}
+
+type AddressBindingStatus struct {
+	IPAddress string `json:"ipAddress"`
+}
+
+// +genclient
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
+//+kubebuilder:storageversion
+
+// AddressBinding is used to manage 1:1 NAT for a VM/NetworkInterface.
+type AddressBinding struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   AddressBindingSpec   `json:"spec"`
+	Status AddressBindingStatus `json:"status"`
+}
+
+//+kubebuilder:object:root=true
+
+// AddressBindingList contains a list of AddressBinding.
+type AddressBindingList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []AddressBinding `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&AddressBinding{}, &AddressBindingList{})
+}

pkg/apis/crd.nsx.vmware.com/v1alpha1/ipaddressallocation_types.go

@@ -10,9 +10,8 @@ import (
 type IPAddressVisibility string
 
 const (
-	IPAddressVisibilityExternal = "External"
-	IPAddressVisibilityPrivate  = "Private"
-	IPAddressVisibilityProject  = "Project"
+	IPAddressVisibilityExternal = "EXTERNAL"
+	IPAddressVisibilityPrivate  = "PRIVATE"
 )
 
 // +genclient
@@ -42,8 +41,8 @@ type IPAddressAllocationList struct {
 
 // IPAddressAllocationSpec defines the desired state of IPAddressAllocation.
 type IPAddressAllocationSpec struct {
-	// IPAddressBlockVisibility specifies the visibility of the IPBlocks to allocate IP addresses. Can be External, Private or Project.
-	// +kubebuilder:validation:Enum=External;Private;Project
+	// IPAddressBlockVisibility specifies the visibility of the IPBlocks to allocate IP addresses. Can be External or Private.
+	// +kubebuilder:validation:Enum=External;Private
 	// +kubebuilder:default=Private
 	// +optional
 	IPAddressBlockVisibility IPAddressVisibility `json:"ip_address_block_visibility,omitempty"`

pkg/apis/crd.nsx.vmware.com/v1alpha1/vpcnetworkconfiguration_types.go

@@ -46,6 +46,11 @@ type VPCNetworkConfigurationSpec struct {
 	// +kubebuilder:validation:MaxLength=8
 	// +optional
 	ShortID string `json:"shortID,omitempty"`
+	// NSX path of the VPC the Namespace associated with.
+	// If vpc is set, only defaultIPv4SubnetSize and defaultSubnetAccessMode
+	// take effect, other fields are ignored.
+	// +optional
+	VPC string `json:"vpc,omitempty"`
 }
 
 // VPCNetworkConfigurationStatus defines the observed state of VPCNetworkConfiguration
@@ -60,6 +65,8 @@ type VPCInfo struct {
 	Name string `json:"name"`
 	// AVISESubnetPath is the NSX Policy Path for the AVI SE Subnet.
 	AVISESubnetPath string `json:"lbSubnetPath,omitempty"`
+	// NSXLoadBalancerPath is the NSX Policy path for the NSX Load Balancer.
+	NSXLoadBalancerPath string `json:"nsxLoadBalancerPath,omitempty"`
 }
 
 // +genclient