Apply suggestions from code review

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

Author: vijayaraghavanr31

api/v1alpha1/addon_types.go

@@ -87,7 +87,7 @@ type NutanixAddons struct {
 	COSI *NutanixCOSI `json:"cosi,omitempty"`
 
 	// +kubebuilder:validation:Optional
-	K8sRegistrationAgent *NutanixK8sRegistrationAgent `json:"k8sRegistrationAgent,omitempty"`
+	KonnectorAgent *NutanixKonnectorAgent`json:"konnectorAgent,omitempty"`
 }
 
 type GenericAddons struct {
@@ -363,7 +363,7 @@ type RegistryAddon struct {
 	Provider string `json:"provider"`
 }
 
-type NutanixK8sRegistrationAgent struct {
+type NutanixKonnectorAgent struct {
 	// A reference to the Secret for credential information for the target Prism Central instance
 	// +kubebuilder:validation:Optional
 	Credentials *NutanixK8sAgentCredentials `json:"credentials,omitempty"`
@@ -376,7 +376,7 @@ type NutanixK8sRegistrationAgent struct {
 }
 
 type NutanixK8sAgentCredentials struct {
-	// A reference to the Secret containing the credentials used by the CCM provider.
+	// A reference to the Secret containing the credentials used by the Konnector agent.
 	// +kubebuilder:validation:Required
 	SecretRef LocalObjectReference `json:"secretRef"`
 }

charts/cluster-api-runtime-extensions-nutanix/addons/k8s-registration-agent/values-template.yaml

@@ -6,5 +6,5 @@ pc:
   insecure: {{ .PrismCentralInsecure }} #set this to true if PC does not have https enabled
   endpoint: {{ .PrismCentralHost }} # eg: ip or fqdn
 k8sClusterName: {{ .ClusterName }}
-
+k8sDistribution: NKP
 createSecret: false

pkg/handlers/lifecycle/handlers.go

@@ -48,7 +48,7 @@ type Handlers struct {
 	localPathCSIConfig         *localpath.Config
 	snapshotControllerConfig   *snapshotcontroller.Config
 	cosiControllerConfig       *cosi.ControllerConfig
-	k8sRegistrationAgentConfig *k8sregistrationagent.ControllerConfig
+	k8sRegistrationAgentConfig *k8sregistrationagent.Config
 	distributionConfig         *cncfdistribution.Config
 }
 
@@ -71,7 +71,7 @@ func New(
 		localPathCSIConfig:         localpath.NewConfig(globalOptions),
 		snapshotControllerConfig:   snapshotcontroller.NewConfig(globalOptions),
 		cosiControllerConfig:       cosi.NewControllerConfig(globalOptions),
-		k8sRegistrationAgentConfig: k8sregistrationagent.NewControllerConfig(globalOptions),
+		k8sRegistrationAgentConfig: k8sregistrationagent.NewConfig(globalOptions),
 		distributionConfig:         &cncfdistribution.Config{GlobalOptions: globalOptions},
 	}
 }

pkg/handlers/lifecycle/k8sregistrationagent/handler.go

@@ -37,7 +37,7 @@ import (
 const (
 	defaultHelmReleaseName       = "k8s-registration-agent"
 	defaultHelmReleaseNamespace  = "ntnx-system"
-	defaultK8sAgentName          = "nutanix-agent"
+	defaultK8sAgentName          = "konnector-agent"
 	defaultCredentialsSecretName = defaultK8sAgentName
 )
 
@@ -63,7 +63,7 @@ func (c *ControllerConfig) AddFlags(prefix string, flags *pflag.FlagSet) {
 
 type DefaultK8sRegistrationAgent struct {
 	client              ctrlclient.Client
-	config              *ControllerConfig
+	config              *Config
 	helmChartInfoGetter *config.HelmChartGetter
 
 	variableName string   // points to the global config variable
@@ -246,14 +246,6 @@ func (n *DefaultK8sRegistrationAgent) apply(
 			n.client,
 			helmChart,
 		).WithValueTemplater(templateValuesFunc(clusterConfigVar.Nutanix, cluster))
-	case v1alpha1.AddonStrategyClusterResourceSet:
-		resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
-		resp.SetMessage(
-			fmt.Sprintf(
-				"strategy %q not provided for K8s Registration Agent", v1alpha1.AddonStrategyClusterResourceSet,
-			),
-		)
-		return
 	case "":
 		resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
 		resp.SetMessage("strategy not provided for K8s Registration Agent")