From 70c18dddc207618d14048a01738a1c5984be1a2f Mon Sep 17 00:00:00 2001
From: deepakm-ntnx <deepak.muley@nutanix.com>
Date: Wed, 29 Nov 2023 11:27:53 -0800
Subject: [PATCH] merged latest main

---
 Makefile                                                      | 4 ++--
 api/infrastructure/v1beta1/zz_generated.deepcopy.go           | 1 -
 ...frastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml | 3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 58fb5fe2cc..2c22a90087 100644
--- a/Makefile
+++ b/Makefile
@@ -235,7 +235,7 @@ kind-delete: ## Delete the kind cluster
 .PHONY: build
 build: generate fmt ## Build manager binary.
 	GIT_COMMIT_HASH=`git rev-parse HEAD` && \
-	go build -ldflags "-X main.gitCommitHash=$${GIT_COMMIT_HASH}" -o bin/manager main.go
+	go build -ldflags "-X main.gitCommitHash=$${GIT_COMMIT_HASH}" -o bin/manager cmd/main.go
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
@@ -244,7 +244,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 .PHONY: docker-build
 docker-build: $(KO) ## Build docker image with the manager.
 	GIT_COMMIT_HASH=`git rev-parse HEAD` && \
-	KO_DOCKER_REPO=ko.local GOFLAGS="-ldflags=-X=main.gitCommitHash=$${GIT_COMMIT_HASH}" $(KO) build -B --platform=${PLATFORMS} -t ${IMG_TAG} -L .
+	KO_DOCKER_REPO=ko.local GOFLAGS="-ldflags=-X=main.gitCommitHash=$${GIT_COMMIT_HASH}" $(KO) build -B --platform=${PLATFORMS} -t ${IMG_TAG} -L ./cmd
 
 .PHONY: docker-push
 docker-push: $(KO) ## Push docker image with the manager.
diff --git a/api/infrastructure/v1beta1/zz_generated.deepcopy.go b/api/infrastructure/v1beta1/zz_generated.deepcopy.go
index 73b2ba4802..39d855d19e 100644
--- a/api/infrastructure/v1beta1/zz_generated.deepcopy.go
+++ b/api/infrastructure/v1beta1/zz_generated.deepcopy.go
@@ -224,7 +224,6 @@ func (in *NutanixClusterTemplateList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *NutanixClusterTemplateResource) DeepCopyInto(out *NutanixClusterTemplateResource) {
 	*out = *in
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
 }
 
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml
index 7ea15dc272..1102987ef5 100644
--- a/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml
+++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_nutanixclustertemplates.yaml
@@ -40,9 +40,6 @@ spec:
                 description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
                   Important: Run "make" to regenerate code after modifying this file'
                 properties:
-                  metadata:
-                    description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata'
-                    type: object
                   spec:
                     description: NutanixClusterSpec defines the desired state of NutanixCluster
                     properties: