Merge pull request vmware-tanzu#684 from wenqiq/topic/wenqi/cherrypic…

…k420 Sync 4.2.0 branch
zhengxiexie · Aug 12, 2024 · 10f5564 · 10f5564
2 parents 3d12cf1 + 9a78792
commit 10f5564
Show file tree

Hide file tree

Showing 278 changed files with 3,867 additions and 15,308 deletions.
diff --git a/Makefile b/Makefile
@@ -41,7 +41,8 @@ help: ## Display this help.
 
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="github.com/vmware-tanzu/nsx-operator/pkg/apis/v1alpha1;github.com/vmware-tanzu/nsx-operator/pkg/apis/v1alpha2" output:crd:artifacts:config=build/yaml/crd/
+	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" output:crd:artifacts:config=build/yaml/crd/t1/
+	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" output:crd:artifacts:config=build/yaml/crd/vpc/
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

diff --git a/build/image/photon/Dockerfile b/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
 

diff --git a/build/yaml/crd/nsx.vmware.com_ipaddressallocations.yaml b/build/yaml/crd/nsx.vmware.com_ipaddressallocations.yaml
diff --git a/build/yaml/crd/nsx.vmware.com_ippools.yaml b/build/yaml/crd/nsx.vmware.com_ippools.yaml