Merge pull request #29 from /issues/28

Issues/28

Author: bsctl

README.md

@@ -68,11 +68,9 @@ nodePools:
       enabled: true
       minSize: 2
       maxSize: 6
-      labels:
-        autoscaling: "enabled"
 ```
 
-This configuration marks the node pool for autoscaling. The Cluster Autoscaler will use these settings to scale the node pool within the specified limits.
+This configuration marks the node pool for autoscaling. The Cluster Autoscaler will use these settings to scale the node pool within the specified limits. There are sever criteria for selecting the cluster autoscaler, including labels, cluster name, and namespace. Refer to the [Cluster Autoscaler documentation](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/clusterapi/README.md)
 
 You need to install the Cluster Autoscaler in the management cluster. Here is an example using Helm:
 
@@ -81,13 +79,14 @@ helm repo add autoscaler https://kubernetes.github.io/autoscaler
 helm repo update
 helm upgrade --install ${CLUSTER_NAME}-autoscaler autoscaler/cluster-autoscaler \
     --set cloudProvider=clusterapi \
-    --set autodiscovery.namespace=default \
-    --set "autoDiscovery.labels[0].autoscaling=enabled" \
+    --set autoDiscovery.namespace=default \
+    --set autoDiscovery.labels[0].foo=bar \
+    --set autoDiscovery.clusterName=${CLUSTER_NAME} \
     --set clusterAPIKubeconfigSecret=${CLUSTER_NAME}-kubeconfig \
     --set clusterAPIMode=kubeconfig-incluster
 ```
 
-This command installs the Cluster Autoscaler and configures it to manage the workload cluster from the management cluster.
+This command installs the Cluster Autoscaler and configures it to manage the workload cluster from the management cluster. In the example above, cluster selection is done using the `autoDiscovery` feature, which matches the labels set in the node pool configuration, namespace, and cluster name.
 
 ## Prerequisites
 

charts/capi-kamaji-vsphere/Chart.yaml

@@ -1,5 +1,5 @@
 name: capi-kamaji-vsphere
-version: 0.2.5
+version: 0.2.6
 appVersion: 1.32.0
 description: A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API
   and Kamaji.

charts/capi-kamaji-vsphere/README.md

@@ -1,6 +1,6 @@
 # capi-kamaji-vsphere
 
-![Version: 0.2.5](https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.32.0](https://img.shields.io/badge/AppVersion-1.32.0-informational?style=flat-square)
+![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.32.0](https://img.shields.io/badge/AppVersion-1.32.0-informational?style=flat-square)
 
 A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API and Kamaji.
 
@@ -59,7 +59,6 @@ A Helm chart for deploying a Kamaji Tenant Cluster on vSphere using Cluster API
 | nodePools[0].addressesFromPools | object | `{"enabled":true}` | Use an IPAMProvider pool to reserve IPs |
 | nodePools[0].addressesFromPools.enabled | bool | `true` | Enable the IPAMProvider usage |
 | nodePools[0].autoscaling.enabled | bool | `false` | Enable autoscaling |
-| nodePools[0].autoscaling.labels.autoscaling | string | `"enabled"` | Labels to use for autoscaling: make sure to use the same labels on the autoscaler configuration |
 | nodePools[0].autoscaling.maxSize | string | `"6"` | Maximum number of instances in the pool |
 | nodePools[0].autoscaling.minSize | string | `"2"` | Minimum number of instances in the pool |
 | nodePools[0].dataStore | string | `"datastore"` | VSphere datastore to use |

charts/capi-kamaji-vsphere/templates/machine-deployment.yaml

@@ -11,11 +11,6 @@ metadata:
   {{- end }}
   {{- end }}
   labels:
-    {{- with .autoscaling }}
-    {{- if .enabled }}
-    {{- .labels | toYaml | nindent 4 }}
-    {{- end }}
-    {{- end }}
     cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" $ | quote }}
   name: {{ include "cluster-api-kamaji-vsphere.cluster-name" $ }}-{{ .name }}-md
   namespace: {{ $.Release.Namespace }}
@@ -27,11 +22,6 @@ spec:
   template:
     metadata:
       labels:
-        {{- with .autoscaling }}
-        {{- if .enabled }}
-        {{- .labels | toYaml | nindent 8 }}
-        {{- end }}
-        {{- end }}
         cluster.x-k8s.io/cluster-name: {{ include "cluster-api-kamaji-vsphere.cluster-name" $ | quote }}
     spec:
       bootstrap:

charts/capi-kamaji-vsphere/values.yaml

@@ -140,9 +140,6 @@ nodePools:
     autoscaling:
       # -- Enable autoscaling
       enabled: false
-      labels:
-        # -- Labels to use for autoscaling: make sure to use the same labels on the autoscaler configuration
-        autoscaling: "enabled"
       # -- Minimum number of instances in the pool
       minSize: "2"
       # -- Maximum number of instances in the pool