renaming k8s registration agent to konnector agent

vijayaraghavanr31 · vijayaraghavanr31 · commit f0829976be9d · 2025-10-14T22:57:38.000+05:30
diff --git a/api/v1alpha1/addon_types.go b/api/v1alpha1/addon_types.go
@@ -87,7 +87,7 @@ type NutanixAddons struct {
 	COSI *NutanixCOSI `json:"cosi,omitempty"`
 
 	// +kubebuilder:validation:Optional
-	KonnectorAgent *NutanixKonnectorAgent`json:"konnectorAgent,omitempty"`
+	KonnectorAgent *NutanixKonnectorAgent `json:"konnectorAgent,omitempty"`
 }
 
 type GenericAddons struct {
@@ -366,16 +366,16 @@ type RegistryAddon 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"`
+	Credentials *NutanixKonnectorAgentCredentials `json:"credentials,omitempty"`
 
-	// Addon strategy used to deploy the Nutanix k8s-registration-agent to the k8s cluster.
+	// Addon strategy used to deploy the Nutanix konnector-agent to the k8s cluster.
 	// +kubebuilder:default=HelmAddon
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:validation:Enum=ClusterResourceSet;HelmAddon
 	Strategy AddonStrategy `json:"strategy,omitzero"`
 }
 
-type NutanixK8sAgentCredentials struct {
+type NutanixKonnectorAgentCredentials struct {
 	// A reference to the Secret containing the credentials used by the Konnector agent.
 	// +kubebuilder:validation:Required
 	SecretRef LocalObjectReference `json:"secretRef"`
diff --git a/api/v1alpha1/constants.go b/api/v1alpha1/constants.go
@@ -32,8 +32,8 @@ const (
 	ServiceLoadBalancerVariableName = "serviceLoadBalancer"
 	// RegistryAddonVariableName is the OCI registry config patch variable name.
 	RegistryAddonVariableName = "registry"
-	// K8sRegistrationAgentVariableName is the Nutanix k8s-registration-agent addon config patch variable name.
-	K8sRegistrationAgentVariableName = "k8sRegistrationAgent"
+	// KonnectorAgentVariableName is the Nutanix konnector-agent addon config patch variable name.
+	KonnectorAgentVariableName = "konnectorAgent"
 
 	// GlobalMirrorVariableName is the global image registry mirror patch variable name.
 	GlobalMirrorVariableName = "globalImageRegistryMirror"
diff --git a/api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml b/api/v1alpha1/crds/caren.nutanix.com_nutanixclusterconfigs.yaml
@@ -235,13 +235,13 @@ spec:
                         - defaultStorage
                         - providers
                       type: object
-                    k8sRegistrationAgent:
+                    konnectorAgent:
                       properties:
                         credentials:
                           description: A reference to the Secret for credential information for the target Prism Central instance
                           properties:
                             secretRef:
-                              description: A reference to the Secret containing the credentials used by the CCM provider.
+                              description: A reference to the Secret containing the credentials used by the Konnector agent.
                               properties:
                                 name:
                                   description: |-
@@ -258,7 +258,7 @@ spec:
                           type: object
                         strategy:
                           default: HelmAddon
-                          description: Addon strategy used to deploy the Nutanix k8s-registration-agent to the k8s cluster.
+                          description: Addon strategy used to deploy the Nutanix konnector-agent to the k8s cluster.
                           enum:
                             - ClusterResourceSet
                             - HelmAddon
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/variables/aggregate_types.go b/api/variables/aggregate_types.go
@@ -67,11 +67,11 @@ type Addons struct {
 
 	COSI *COSI `json:"cosi,omitempty"`
 
-	NutanixK8sRegistrationAgent *NutanixK8sRegistrationAgent `json:"k8sRegistrationAgent,omitempty"`
+	NutanixKonnectorAgent *NutanixKonnectorAgent `json:"konnectorAgent,omitempty"`
 }
 
-type NutanixK8sRegistrationAgent struct {
-	carenv1.NutanixK8sRegistrationAgent `json:",inline"`
+type NutanixKonnectorAgent struct {
+	carenv1.NutanixKonnectorAgent `json:",inline"`
 }
 
 type CSI struct {
diff --git a/charts/cluster-api-runtime-extensions-nutanix/README.md b/charts/cluster-api-runtime-extensions-nutanix/README.md
@@ -87,8 +87,8 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
 | hooks.csi.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nutanix-csi-helm-values-template"` |  |
 | hooks.csi.snapshot-controller.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.csi.snapshot-controller.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-snapshot-controller-helm-values-template"` |  |
-| hooks.k8sRegistrationAgent.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
-| hooks.k8sRegistrationAgent.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-k8s-registrationagent-helm-values-template"` |  |
+| hooks.konnectorAgent.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
+| hooks.konnectorAgent.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-konnector-agent-helm-values-template"` |  |
 | hooks.nfd.crsStrategy.defaultInstallationConfigMap.name | string | `"node-feature-discovery"` |  |
 | hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` |  |
 | hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nfd-helm-values-template"` |  |
diff --git a/charts/cluster-api-runtime-extensions-nutanix/addons/konnector-agent/values-template.yaml b/charts/cluster-api-runtime-extensions-nutanix/addons/konnector-agent/values-template.yaml
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/deployment.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
         - --csi.snapshot-controller.helm-addon.default-values-template-configmap-name={{ (index .Values.hooks.csi "snapshot-controller").helmAddonStrategy.defaultValueTemplateConfigMap.name }}
         - --ccm.aws.helm-addon.default-values-template-configmap-name={{ .Values.hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.name }}
         - --cosi.controller.helm-addon.default-values-template-configmap-name={{ .Values.hooks.cosi.controller.helmAddonStrategy.defaultValueTemplateConfigMap.name }}
-        - --k8s-registration-agent.helm-addon.default-values-template-configmap-name={{ .Values.hooks.k8sRegistrationAgent.helmAddonStrategy.defaultValueTemplateConfigMap.name }}
+        - --konnector-agent.helm-addon.default-values-template-configmap-name={{ .Values.hooks.konnectorAgent.helmAddonStrategy.defaultValueTemplateConfigMap.name }}
         {{- range $k, $v := .Values.hooks.ccm.aws.k8sMinorVersionToCCMVersion }}
         - --ccm.aws.aws-ccm-versions={{ $k }}={{ $v }}
         {{- end }}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml
@@ -31,7 +31,7 @@ data:
     ChartName: cosi
     ChartVersion: 0.0.1-alpha.5
     RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}https://mesosphere.github.io/charts/stable/{{ end }}'
-  k8s-registration-agent: |
+  konnector-agent: |
     ChartName: nutanix-k8s-agent
     ChartVersion: 1.3.0-rc.0
     RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}http://192.168.1.21:8080{{ end }}'
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/k8s-registration-agent/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/k8s-registration-agent/helm-addon-installation.yaml
diff --git a/charts/cluster-api-runtime-extensions-nutanix/templates/konnector-agent/helm-addon-installation.yaml b/charts/cluster-api-runtime-extensions-nutanix/templates/konnector-agent/helm-addon-installation.yaml
@@ -0,0 +1,12 @@
+# Copyright 2025 Nutanix. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+{{- if .Values.hooks.konnectorAgent.helmAddonStrategy.defaultValueTemplateConfigMap.name }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: '{{ .Values.hooks.konnectorAgent.helmAddonStrategy.defaultValueTemplateConfigMap.name }}'
+data:
+  values.yaml: |-
+    {{- .Files.Get "addons/konnector-agent/values-template.yaml" | nindent 4 }}
+{{- end -}}
diff --git a/charts/cluster-api-runtime-extensions-nutanix/values.schema.json b/charts/cluster-api-runtime-extensions-nutanix/values.schema.json
@@ -496,7 +496,7 @@
                         }
                     }
                 },
-                "k8sRegistrationAgent": {
+                "konnectorAgent": {
                     "type": "object",
                     "properties": {
                         "helmAddonStrategy": {
diff --git a/charts/cluster-api-runtime-extensions-nutanix/values.yaml b/charts/cluster-api-runtime-extensions-nutanix/values.yaml
@@ -101,11 +101,11 @@ hooks:
       defaultValueTemplateConfigMap:
         create: true
         name: default-metallb-helm-values-template
-  k8sRegistrationAgent:
+  konnectorAgent:
     helmAddonStrategy:
       defaultValueTemplateConfigMap:
         create: true
-        name: default-k8s-registrationagent-helm-values-template
+        name: default-konnector-agent-helm-values-template
   cosi:
     controller:
       helmAddonStrategy:
diff --git a/docs/content/addons/k8s-registration-agent.md b/docs/content/addons/k8s-registration-agent.md
@@ -23,7 +23,7 @@ spec:
       - name: clusterConfig
         value:
           addons:
-            k8sRegistrationAgent: {}
+            konnectorAgent: {}
 ```
 
 [Kubernetes cluster registration agent]: https://github.com/nutanix-core/k8s-agent
diff --git a/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml b/examples/capi-quick-start/nutanix-cluster-calico-crs.yaml
@@ -90,7 +90,7 @@ spec:
                 strategy: HelmAddon
             snapshotController:
               strategy: HelmAddon
-          k8sRegistrationAgent: {}
+          konnectorAgent: {}
           nfd:
             strategy: ClusterResourceSet
           serviceLoadBalancer:
diff --git a/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-calico-helm-addon.yaml
@@ -88,7 +88,7 @@ spec:
                 strategy: HelmAddon
             snapshotController:
               strategy: HelmAddon
-          k8sRegistrationAgent: {}
+          konnectorAgent: {}
           nfd: {}
           serviceLoadBalancer:
             configuration:
diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-crs.yaml
@@ -90,7 +90,7 @@ spec:
                 strategy: HelmAddon
             snapshotController:
               strategy: HelmAddon
-          k8sRegistrationAgent: {}
+          konnectorAgent: {}
           nfd:
             strategy: ClusterResourceSet
           serviceLoadBalancer:
diff --git a/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml
@@ -88,7 +88,7 @@ spec:
                 strategy: HelmAddon
             snapshotController:
               strategy: HelmAddon
-          k8sRegistrationAgent: {}
+          konnectorAgent: {}
           nfd: {}
           serviceLoadBalancer:
             configuration:
diff --git a/examples/capi-quick-start/nutanix-cluster-with-failuredomains-cilium-crs.yaml b/examples/capi-quick-start/nutanix-cluster-with-failuredomains-cilium-crs.yaml
@@ -126,7 +126,7 @@ spec:
                 strategy: HelmAddon
             snapshotController:
               strategy: HelmAddon
-          k8sRegistrationAgent: {}
+          konnectorAgent: {}
           nfd:
             strategy: ClusterResourceSet
           serviceLoadBalancer:
diff --git a/examples/capi-quick-start/nutanix-cluster-with-failuredomains-cilium-helm-addon.yaml b/examples/capi-quick-start/nutanix-cluster-with-failuredomains-cilium-helm-addon.yaml
@@ -124,7 +124,7 @@ spec:
                 strategy: HelmAddon
             snapshotController:
               strategy: HelmAddon
-          k8sRegistrationAgent: {}
+          konnectorAgent: {}
           nfd: {}
           serviceLoadBalancer:
             configuration:
diff --git a/hack/addons/kustomize/k8s-registration-agent/kustomization.yaml.tmpl b/hack/addons/kustomize/k8s-registration-agent/kustomization.yaml.tmpl
@@ -5,14 +5,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 metadata:
-  name: k8s-registration-agent-kustomize
+  name: konnector-agent-kustomize
 
 helmCharts:
 - name: nutanix-k8s-agent
   namespace: kube-system
   #repo: https://mesosphere.github.io/charts/stable
   repo: http://192.168.1.21:8080
-  releaseName: k8s-registration-agent
+  releaseName: konnector-agent
   version: ${K8S_REGISTRATION_AGENT_VERSION}
   includeCRDs: true
   skipTests: true
diff --git a/hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl b/hack/examples/bases/nutanix/cluster/kustomization.yaml.tmpl
@@ -35,7 +35,7 @@ patches:
   path: ../../../patches/nutanix/cosi.yaml
 - target:
     kind: Cluster
-  path: ../../../patches/nutanix/k8s-registration-agent.yaml
+  path: ../../../patches/nutanix/konnector-agent.yaml
 - target:
     kind: Cluster
   path: ../../../patches/nutanix/ccm.yaml
diff --git a/hack/examples/patches/nutanix/konnector-agent.yaml b/hack/examples/patches/nutanix/konnector-agent.yaml
@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
 - op: "add"
-  path: "/spec/topology/variables/0/value/addons/k8sRegistrationAgent"
+  path: "/spec/topology/variables/0/value/addons/konnectorAgent"
   value: {}
diff --git a/hack/tools/fetch-images/main.go b/hack/tools/fetch-images/main.go
@@ -351,8 +351,8 @@ func getValuesFileForChartIfNeeded(chartName, carenChartDirectory string) (strin
 		return tempFile.Name(), nil
 	case "cosi-controller":
 		return filepath.Join(carenChartDirectory, "addons", "cosi", "controller", defaultHelmAddonFilename), nil
-	case "k8s-registration-agent":
-		return filepath.Join(carenChartDirectory, "addons", "k8s-registration-agent", defaultHelmAddonFilename), nil
+	case "konnector-agent":
+		return filepath.Join(carenChartDirectory, "addons", "konnector-agent", defaultHelmAddonFilename), nil
 	case "metallb":
 		return filepath.Join(
 			carenChartDirectory,
diff --git a/pkg/handlers/lifecycle/config/cm.go b/pkg/handlers/lifecycle/config/cm.go
@@ -31,7 +31,7 @@ const (
 	COSIController           Component = "cosi-controller"
 	CNCFDistributionRegistry Component = "cncf-distribution-registry"
 	RegistrySyncer           Component = "registry-syncer"
-	K8sRegistrationAgent     Component = "k8s-registration-agent"
+	KonnectorAgent           Component = "konnector-agent"
 )
 
 type HelmChartGetter struct {
diff --git a/pkg/handlers/lifecycle/handlers.go b/pkg/handlers/lifecycle/handlers.go
diff --git a/pkg/handlers/lifecycle/konnectoragent/doc.go b/pkg/handlers/lifecycle/konnectoragent/doc.go
diff --git a/pkg/handlers/lifecycle/konnectoragent/handler.go b/pkg/handlers/lifecycle/konnectoragent/handler.go
diff --git a/pkg/handlers/lifecycle/konnectoragent/variables_test.go b/pkg/handlers/lifecycle/konnectoragent/variables_test.go

Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,11 @@ type Addons struct {`
`67`	`67`
`68`	`68`	COSI *COSI `json:"cosi,omitempty"`
`69`	`69`
`70`		- NutanixK8sRegistrationAgent *NutanixK8sRegistrationAgent `json:"k8sRegistrationAgent,omitempty"`
	`70`	+ NutanixKonnectorAgent *NutanixKonnectorAgent `json:"konnectorAgent,omitempty"`
`71`	`71`	`}`
`72`	`72`
`73`		`-type NutanixK8sRegistrationAgent struct {`
`74`		- carenv1.NutanixK8sRegistrationAgent `json:",inline"`
	`73`	`+type NutanixKonnectorAgent struct {`
	`74`	+ carenv1.NutanixKonnectorAgent `json:",inline"`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`type CSI struct {`