Removing unnessary values from values template file

Author: vijayaraghavanr31

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

@@ -1,31 +1,11 @@
 agent:
-  namespaceOverride: ntnx-system
-  name: nutanix-agent
-  port: 8080
-  image:
-    repository: docker.io/vijayaraghavanr31
-    name: nke-k8s-agent
-    pullPolicy: IfNotPresent
-    tag: "688-14"
-    privateRegistry: false
-    imageCredentials:
-      dockerconfig: replace_base64_encoded_creds
-  updateConfigInMin: 10
-  updateMetricsInMin: 360
-  config:
-    registration:
-      delete:
-        force: false
-    kubeconfig:
-      delete:
-        force: false  
+  name: {{ .AgentName}}
 
 pc:
   port: {{ .PrismCentralPort }}
   insecure: {{ .PrismCentralInsecure }} #set this to true if PC does not have https enabled
   endpoint: {{ .PrismCentralHost }} # eg: ip or fqdn
-  username: "admin" # eg: admin or any other user with Kubernetes Infrastructure provision role
-  password: "Nutanix.123"
 k8sClusterName: {{ .ClusterName }}
-k8sDistribution: "CAPX" # eg: CAPX or NKE or OCP or EKSA or NKP
-categoryMappings: "" # "one or more comma separated key=value" eg: "key1=value1" or "key1=value1\,key2=value2"
+
+createSecret: false
+

charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

@@ -34,7 +34,7 @@ data:
   k8s-registration-agent: |
     ChartName: nutanix-k8s-agent
     ChartVersion: 0.0.1-alpha.1
-    RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}http://192.168.1.3:8080{{ end }}'
+    RepositoryURL: '{{ if .Values.helmRepository.enabled }}oci://helm-repository.{{ .Release.Namespace }}.svc/charts{{ else }}http://192.168.1.16:8080{{ end }}'
   local-path-provisioner-csi: |
     ChartName: local-path-provisioner
     ChartVersion: 0.0.31

hack/addons/helm-chart-bundler/repos.yaml

@@ -62,7 +62,7 @@ repositories:
       nutanix-csi-storage:
       - 3.3.4
   nutanix-k8s-agent:
-    repoURL: http://192.168.1.3:8080
+    repoURL: http://192.168.1.16:8080
     charts:
       nutanix-k8s-agent:
       - 0.0.1-alpha.1

hack/addons/kustomize/k8s-registration-agent/kustomization.yaml.tmpl

@@ -11,7 +11,7 @@ helmCharts:
 - name: nutanix-k8s-agent
   namespace: kube-system
   #repo: https://mesosphere.github.io/charts/stable
-  repo: http://192.168.1.3:8080
+  repo: http://192.168.1.16:8080
   releaseName: k8s-registration-agent
   version: ${K8S_REGISTRATION_AGENT_VERSION}
   includeCRDs: true

pkg/handlers/generic/lifecycle/k8sregistrationagent/handler.go

@@ -31,7 +31,8 @@ import (
 const (
 	defaultHelmReleaseName       = "k8s-registration-agent"
 	defaultHelmReleaseNamespace  = "ntnx-system"
-	defaultCredentialsSecretName = "nutanix-k8s-agent-credentials"
+	defaultK8sAgentName          = "nutanix-agent"
+	defaultCredentialsSecretName = defaultK8sAgentName
 )
 
 type ControllerConfig struct {
@@ -149,7 +150,7 @@ func (n *DefaultK8sRegistrtionAgent) apply(
 		return
 	}
 
-	// 🔹 Ensure credentials are provided
+	// Ensure credentials are provided
 	if k8sAgentVar.Credentials == nil {
 		resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
 		resp.SetMessage("name of the Secret containing PC credentials must be set")
@@ -300,6 +301,7 @@ func templateValuesFunc(
 		}
 
 		type input struct {
+			AgentName            string
 			PrismCentralHost     string
 			PrismCentralPort     uint16
 			PrismCentralInsecure bool
@@ -311,6 +313,7 @@ func templateValuesFunc(
 			return "", err
 		}
 		templateInput := input{
+			AgentName:            defaultK8sAgentName,
 			PrismCentralHost:     address,
 			PrismCentralPort:     port,
 			PrismCentralInsecure: nutanixConfig.PrismCentralEndpoint.Insecure,