feat: Apply suggestions from code review

Co-authored-by: Manoj Surudwad <[email protected]>

Author: vijayaraghavanr31

api/v1alpha1/addon_types.go

@@ -371,7 +371,7 @@ type NutanixKonnectorAgent struct {
 	// Addon strategy used to deploy the Nutanix konnector-agent to the k8s cluster.
 	// +kubebuilder:default=HelmAddon
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:validation:Enum=ClusterResourceSet;HelmAddon
+	// +kubebuilder:validation:Enum=HelmAddon
 	Strategy AddonStrategy `json:"strategy,omitzero"`
 }
 

docs/content/addons/konnector-agent.md

@@ -7,7 +7,7 @@ The Konnector Agent addon enables automatic registration of Kubernetes clusters
 
 ## Overview
 
-The Konnector Agent addon provides:
+Konnector Agent's addon management via CAREN(Cluster API Runtime Extensions - Nutanix) provides:
 
 - **Automatic cluster registration** with Nutanix Prism Central
 - **Lifecycle management** through Cluster API hooks
@@ -193,6 +193,6 @@ kubectl logs hook-preinstall -n ntnx-system
 
 ## References
 
-- [Konnector Agent Repository](https://github.com/nutanix-core/k8s-agent)
+- [Konnector Agent ](https://portal.nutanix.com/page/documents/details?targetId=Prism-Central-Guide-vpc_7_3:mul-cluster-kubernetes-clusters-manage-pc-c.html)
 - [Cluster API Add-on Provider for Helm](https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm)
 - [Cluster API Runtime Hooks](https://cluster-api.sigs.k8s.io/tasks/experimental-features/runtime-sdk/hooks.html)

hack/addons/kustomize/konnector-agent/kustomization.yaml.tmpl

@@ -9,7 +9,7 @@ metadata:
 
 helmCharts:
 - name: konnector-agent
-  namespace: kube-system
+  namespace: ntnx-system
   #repo: https://mesosphere.github.io/charts/stable
   repo: http://192.168.1.7:8080
   releaseName: konnector-agent

pkg/handlers/lifecycle/konnectoragent/doc.go

@@ -3,6 +3,6 @@
 
 // Package konnector-agent provides a handler for managing k8s agent deployments on clusters
 //
-// +kubebuilder:rbac:groups=addons.cluster.x-k8s.io,resources=clusterresourcesets,verbs=watch;list;get;create;patch;update;delete
+// +kubebuilder:rbac:groups=addons.cluster.x-k8s.io,resources=helmchartproxies,verbs=watch;list;get;create;patch;update;delete
 // +kubebuilder:rbac:groups="",resources=configmaps,verbs=watch;list;get;create;patch;update;delete
 package konnectoragent

pkg/handlers/lifecycle/konnectoragent/handler.go

@@ -398,9 +398,6 @@ func (n *DefaultKonnectorAgent) BeforeClusterDelete(
 		resp.SetStatus(runtimehooksv1.ResponseStatusSuccess)
 		resp.SetRetryAfterSeconds(5) // Quick retry to start monitoring
 
-	case v1alpha1.AddonStrategyClusterResourceSet:
-		log.Info("ClusterResourceSet strategy does not require cleanup")
-		resp.SetStatus(runtimehooksv1.ResponseStatusSuccess)
 	case "":
 		log.Info("No strategy specified, skipping cleanup")
 		resp.SetStatus(runtimehooksv1.ResponseStatusSuccess)
@@ -413,7 +410,7 @@ func (n *DefaultKonnectorAgent) BeforeClusterDelete(
 	}
 }
 
-func (n *DefaultKonnectorAgent) deleteHelmChart(
+func (n *DefaultKonnectorAgent) deleteHelmChartProxy(
 	ctx context.Context,
 	cluster *clusterv1.Cluster,
 	log logr.Logger,
@@ -442,7 +439,7 @@ func (n *DefaultKonnectorAgent) deleteHelmChart(
 	err := n.client.Get(ctx, ctrlclient.ObjectKeyFromObject(hcp), currentHCP)
 	if err != nil {
 		if ctrlclient.IgnoreNotFound(err) == nil {
-			log.Info("K8s Registration Agent HelmChartProxy already deleted", "name", hcp.Name)
+			log.Info("Konnector Agent HelmChartProxy is not present on cluster", "name", hcp.Name)
 			return nil
 		}
 		return fmt.Errorf("failed to get HelmChartProxy %q: %w", ctrlclient.ObjectKeyFromObject(hcp), err)