Skip to content

Commit

Permalink
Add node autodiscovery to cluster-autoscaler clusterapi provider
Browse files Browse the repository at this point in the history
  • Loading branch information
detiber committed Jul 13, 2020
1 parent 9b96e0d commit d2b26da
Show file tree
Hide file tree
Showing 12 changed files with 996 additions and 162 deletions.
31 changes: 31 additions & 0 deletions cluster-autoscaler/cloudprovider/clusterapi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,37 @@ Please note, this example only shows the cloud provider options, you will
most likely need other command line flags. For more information you can invoke
`cluster-autoscaler --help` to see a full list of options.

## Configuring node group auto discovery

If you do not configure node group auto discovery, cluster autoscaler will attempt
to match nodes against any scalable resources found in any namespace and belonging
to any Cluster.

Limiting cluster autoscaler to only match against resources in the blue namespace

```
--node-group-auto-discovery=clusterapi:namespace=blue
```

Limiting cluster autoscaler to only match against resources belonging to Cluster test1

```
--node-group-auto-discovery=clusterapi:clusterName=test1
```

Limiting cluster autoscaler to only match against resources matching the provided labels

```
--node-group-auto-discovery=clusterapi:color=green,shape=square
```

These can be mixed and matched in any combination, for example to only match resources
in the staging namespace, belonging to the purple cluster, with the label owner=jim:

```
--node-group-auto-discovery=clusterapi:namespace=staging,clusterName=purple,owner=jim
```

## Enabling Autoscaling

To enable the automatic scaling of components in your cluster-api managed
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/*
Copyright 2020 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package clusterapi

import (
"fmt"
"strings"

"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection"

"k8s.io/autoscaler/cluster-autoscaler/utils/errors"
)

type clusterAPIAutoDiscoveryConfig struct {
clusterName string
namespace string
labelSelector labels.Selector
}

func parseAutoDiscoverySpec(spec string) (*clusterAPIAutoDiscoveryConfig, error) {
cfg := &clusterAPIAutoDiscoveryConfig{
labelSelector: labels.NewSelector(),
}

tokens := strings.Split(spec, ":")
if len(tokens) != 2 {
return cfg, errors.NewAutoscalerError(errors.ConfigurationError, fmt.Sprintf("spec \"%s\" should be discoverer:key=value,key=value", spec))
}
discoverer := tokens[0]
if discoverer != autoDiscovererTypeClusterAPI {
return cfg, errors.NewAutoscalerError(errors.ConfigurationError, fmt.Sprintf("unsupported discoverer specified: %s", discoverer))
}

for _, arg := range strings.Split(tokens[1], ",") {
if len(arg) == 0 {
continue
}
kv := strings.Split(arg, "=")
if len(kv) != 2 {
return cfg, errors.NewAutoscalerError(errors.ConfigurationError, fmt.Sprintf("invalid key=value pair %s", kv))
}
k, v := kv[0], kv[1]

switch k {
case autoDiscovererClusterNameKey:
cfg.clusterName = v
case autoDiscovererNamespaceKey:
cfg.namespace = v
default:
req, err := labels.NewRequirement(k, selection.Equals, []string{v})
if err != nil {
return cfg, errors.NewAutoscalerError(errors.ConfigurationError, fmt.Sprintf("failed to create label selector; %v", err))
}
cfg.labelSelector = cfg.labelSelector.Add(*req)
}
}
return cfg, nil
}

func parseAutoDiscovery(specs []string) ([]*clusterAPIAutoDiscoveryConfig, error) {
result := make([]*clusterAPIAutoDiscoveryConfig, 0, len(specs))
for _, spec := range specs {
autoDiscoverySpec, err := parseAutoDiscoverySpec(spec)
if err != nil {
return result, err
}
result = append(result, autoDiscoverySpec)
}
return result, nil
}

func allowedByAutoDiscoverySpec(spec *clusterAPIAutoDiscoveryConfig, r *unstructured.Unstructured) bool {
switch {
case spec.namespace != "" && spec.namespace != r.GetNamespace():
return false
case spec.clusterName != "" && spec.clusterName != clusterNameFromResource(r):
return false
case !spec.labelSelector.Matches(labels.Set(r.GetLabels())):
return false
default:
return true
}
}
Loading

0 comments on commit d2b26da

Please sign in to comment.