Skip to content

Commit 332714e

Browse files
Minor changes
1 parent cd63d0f commit 332714e

File tree

2 files changed

+8
-8
lines changed
  • charts/cluster-api-runtime-extensions-nutanix/addons/k8s-registration-agent
  • pkg/handlers/generic/lifecycle/k8sregistrationagent

2 files changed

+8
-8
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ agent:
33
name: nutanix-agent
44
port: 8080
55
image:
6-
repository: docker.io/nutanix
6+
repository: docker.io/vijayaraghavanr31
77
name: nke-k8s-agent
88
pullPolicy: IfNotPresent
9-
tag: "688"
10-
privateRegistry: true
9+
tag: "688-14"
10+
privateRegistry: false
1111
imageCredentials:
1212
dockerconfig: replace_base64_encoded_creds
1313
updateConfigInMin: 10
@@ -24,8 +24,8 @@ pc:
2424
port: {{ .PrismCentralPort }}
2525
insecure: {{ .PrismCentralInsecure }} #set this to true if PC does not have https enabled
2626
endpoint: {{ .PrismCentralHost }} # eg: ip or fqdn
27-
username: "DCFSPpwNEOuG" # eg: admin or any other user with Kubernetes Infrastructure provision role
28-
password: "gHVU2vO64xwIt3Lz09aSQ85p1su7mKDr"
27+
username: "admin" # eg: admin or any other user with Kubernetes Infrastructure provision role
28+
password: "Nutanix.123"
2929
k8sClusterName: {{ .ClusterName }}
3030
k8sDistribution: "CAPX" # eg: CAPX or NKE or OCP or EKSA or NKP
3131
categoryMappings: "" # "one or more comma separated key=value" eg: "key1=value1" or "key1=value1\,key2=value2"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func (n *DefaultK8sRegistrtionAgent) apply(
249249
n.config.helmAddonConfig,
250250
n.client,
251251
helmChart,
252-
).WithValueTemplater(templateValuesFunc(clusterConfigVar.Nutanix))
252+
).WithValueTemplater(templateValuesFunc(clusterConfigVar.Nutanix, cluster))
253253
case v1alpha1.AddonStrategyClusterResourceSet:
254254
resp.SetStatus(runtimehooksv1.ResponseStatusFailure)
255255
resp.SetMessage(
@@ -283,7 +283,7 @@ func (n *DefaultK8sRegistrtionAgent) apply(
283283
}
284284

285285
func templateValuesFunc(
286-
nutanixConfig *v1alpha1.NutanixSpec,
286+
nutanixConfig *v1alpha1.NutanixSpec, cluster *clusterv1.Cluster,
287287
) func(*clusterv1.Cluster, string) (string, error) {
288288
return func(_ *clusterv1.Cluster, valuesTemplate string) (string, error) {
289289
joinQuoted := template.FuncMap{
@@ -314,7 +314,7 @@ func templateValuesFunc(
314314
PrismCentralHost: address,
315315
PrismCentralPort: port,
316316
PrismCentralInsecure: nutanixConfig.PrismCentralEndpoint.Insecure,
317-
ClusterName: nutanixConfig.PrismCentralEndpoint.AdditionalTrustBundle,
317+
ClusterName: cluster.Name,
318318
}
319319

320320
var b bytes.Buffer

0 commit comments

Comments
 (0)