Skip to content

Commit e51ce78

Browse files
committed
fixup! refactor: Apply review feedback
1 parent 72cdf4b commit e51ce78

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

charts/capi-runtime-extensions/templates/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ spec:
3939
- --nfd.helm-addon.default-values-template-configmap-name={{ .Values.hooks.nfd.helmAddonStrategy.defaultValueTemplateConfigMap.name }}
4040
- --awscpi.defaults-namespace={{ .Release.Namespace }}
4141
- --awsebs.defaults-namespace={{ .Release.Namespace }}
42+
- --cluster-autoscaler.crs.defaults-namespace={{ .Release.Namespace }}
4243
{{- range $key, $value := .Values.extraArgs }}
4344
- --{{ $key }}={{ $value }}
4445
{{- end }}

docs/content/addons/cluster-autoscaler.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on the new cluster via `ClusterResourceSets` at the `AfterControlPlaneInitialize
77

88
Deployment of Cluster Autoscaler is opt-in via the [provider-specific cluster configuration]({{< ref ".." >}}).
99

10-
The hook creates a `ClusterResourceSet` to deploy the NFD resources.
10+
The hook creates a `ClusterResourceSet` to deploy the Cluster Autoscaler resources.
1111

1212
## Example
1313

@@ -36,7 +36,7 @@ spec:
3636
cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "3"
3737
cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "1"
3838
name: md-0
39-
# Remove the replicas field, otherwise the topology controller will revert back the aytoscaler's changes
39+
# Remove the replicas field, otherwise the topology controller will revert back the autoscaler's changes
4040
```
4141

4242
[cluster-autoscaler]: https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler/cloudprovider/clusterapi

hack/examples/sync.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ sed -i'' 's/cloud-provider:\ aws/cloud-provider:\ external/g' "${EXAMPLE_CLUSTER
114114

115115
# TODO Remove once kustomize supports retaining quotes in what will be numeric values.
116116
#shellcheck disable=SC2016
117-
sed -i'' 's/size\: ${WORKER_MACHINE_COUNT}/size\: "${WORKER_MACHINE_COUNT}"/' "${EXAMPLE_CLUSTERS_DIR}"/*.yaml
117+
sed -i'' 's/\( cluster.x-k8s.io\/cluster-api-autoscaler-node-group-\(min\|max\)-size\): \(${WORKER_MACHINE_COUNT}\)/\1: "\3"/' "${EXAMPLE_CLUSTERS_DIR}"/*.yaml

pkg/handlers/generic/lifecycle/handlers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (h *Handlers) AllHandlers(mgr manager.Manager) []handlers.Named {
6161

6262
func (h *Handlers) AddFlags(flagSet *pflag.FlagSet) {
6363
h.nfdConfig.AddFlags("nfd", flagSet)
64-
h.clusterAutoscalerConfig.AddFlags("clusterAutoscaler", flagSet)
64+
h.clusterAutoscalerConfig.AddFlags("cluster-autoscaler", flagSet)
6565
h.calicoCNIConfig.AddFlags("cni.calico", flagSet)
6666
h.ciliumCNIConfig.AddFlags("cni.cilium", flagSet)
6767
h.ebsConfig.AddFlags("awsebs", pflag.CommandLine)

0 commit comments

Comments
 (0)