Skip to content

Commit aa40161

Browse files
committed
fix: suggestions from review
1 parent 829e551 commit aa40161

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

charts/cluster-api-runtime-extensions-nutanix/addons/cluster-autoscaler/values-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
fullnameOverride: "cluster-autoscaler-{{ index .Cluster.Annotations "caren.nutanix.com/cluster-uuid" }}
2+
fullnameOverride: "cluster-autoscaler-{{ index .Cluster.Annotations "caren.nutanix.com/cluster-uuid" }}"
33

44
cloudProvider: clusterapi
55

charts/cluster-api-runtime-extensions-nutanix/templates/cluster-autoscaler/manifests/cluster-autoscaler-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ data:
211211
items:
212212
- key: value
213213
path: kubeconfig
214-
secretName: '{{ `{{ index .Cluster.Annotations "caren.nutanix.com/cluster-uuid" }}` }}-kubeconfig'
214+
secretName: '{{ `{{ .Cluster.Name }}` }}-kubeconfig'
215215
kind: ConfigMap
216216
metadata:
217217
creationTimestamp: null

hack/addons/kustomize/cluster-autoscaler/manifests/helm-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ clusterAPIMode: kubeconfig-incluster
3333
clusterAPIWorkloadKubeconfigPath: /cluster/kubeconfig
3434
extraVolumeSecrets:
3535
kubeconfig:
36-
name: tmpl-clusteruuid-tmpl-kubeconfig
36+
name: tmpl-clustername-tmpl-kubeconfig
3737
mountPath: /cluster
3838
readOnly: true
3939
items:

hack/addons/kustomize/cluster-autoscaler/manifests/values-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
fullnameOverride: "cluster-autoscaler-{{ index .Cluster.Annotations "caren.nutanix.com/cluster-uuid" }}
2+
fullnameOverride: "cluster-autoscaler-{{ index .Cluster.Annotations "caren.nutanix.com/cluster-uuid" }}"
33

44
cloudProvider: clusterapi
55

hack/addons/update-cluster-autoscaler.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ kustomize build --enable-helm "${ASSETS_DIR}" >"${ASSETS_DIR}/${FILE_NAME}"
2727

2828
# this replaces the custom templating used for kustomize to generate the configmap to using the same templating as we do
2929
# with helm chart proxy
30-
# transforming tmpl-clustername-tmpl to -- {{ .Cluster.Name }}
30+
# transforming tmpl-clustername-tmpl to {{ .Cluster.Name }}
3131
sed -i -e "s/\([a-z-]*\)tmpl-clustername\([^-]*\)-tmpl\([a-z-]*\)/'\1{{ \`{{ .Cluster.Name\2 }}\` }}\3'/g" \
3232
-e "s/\([a-z-]*\)tmpl-clusteruuid-tmpl\([a-z-]*\)/'\1{{ \`{{ index .Cluster.Annotations \"caren.nutanix.com\/cluster-uuid\" }}\` }}\2'/g" \
3333
"${ASSETS_DIR}/${FILE_NAME}"

0 commit comments

Comments
 (0)