Merge pull request kubernetes#3460 from marwanad/restructure-code

Break up the logic in azure_manager

cluster-autoscaler/cloudprovider/azure/azure_autodiscovery.go

@@ -0,0 +1,103 @@
+/*
+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 azure
+
+import (
+	"fmt"
+	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
+	"strings"
+)
+
+const (
+	autoDiscovererTypeLabel = "label"
+)
+
+// A labelAutoDiscoveryConfig specifies how to auto-discover Azure scale sets.
+type labelAutoDiscoveryConfig struct {
+	// Key-values to match on.
+	Selector map[string]string
+}
+
+// ParseLabelAutoDiscoverySpecs returns any provided NodeGroupAutoDiscoverySpecs
+// parsed into configuration appropriate for ASG autodiscovery.
+func ParseLabelAutoDiscoverySpecs(o cloudprovider.NodeGroupDiscoveryOptions) ([]labelAutoDiscoveryConfig, error) {
+	cfgs := make([]labelAutoDiscoveryConfig, len(o.NodeGroupAutoDiscoverySpecs))
+	var err error
+	for i, spec := range o.NodeGroupAutoDiscoverySpecs {
+		cfgs[i], err = parseLabelAutoDiscoverySpec(spec)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return cfgs, nil
+}
+
+// parseLabelAutoDiscoverySpec parses a single spec and returns the corresponding node group spec.
+func parseLabelAutoDiscoverySpec(spec string) (labelAutoDiscoveryConfig, error) {
+	cfg := labelAutoDiscoveryConfig{
+		Selector: make(map[string]string),
+	}
+
+	tokens := strings.Split(spec, ":")
+	if len(tokens) != 2 {
+		return cfg, fmt.Errorf("spec \"%s\" should be discoverer:key=value,key=value", spec)
+	}
+	discoverer := tokens[0]
+	if discoverer != autoDiscovererTypeLabel {
+		return cfg, fmt.Errorf("unsupported discoverer specified: %s", discoverer)
+	}
+
+	for _, arg := range strings.Split(tokens[1], ",") {
+		kv := strings.Split(arg, "=")
+		if len(kv) != 2 {
+			return cfg, fmt.Errorf("invalid key=value pair %s", kv)
+		}
+		k, v := kv[0], kv[1]
+		if k == "" || v == "" {
+			return cfg, fmt.Errorf("empty value not allowed in key=value tag pairs")
+		}
+		cfg.Selector[k] = v
+	}
+	return cfg, nil
+}
+
+func matchDiscoveryConfig(labels map[string]*string, configs []labelAutoDiscoveryConfig) bool {
+	if len(configs) == 0 {
+		return false
+	}
+
+	for _, c := range configs {
+		if len(c.Selector) == 0 {
+			return false
+		}
+
+		for k, v := range c.Selector {
+			value, ok := labels[k]
+			if !ok {
+				return false
+			}
+
+			if len(v) > 0 {
+				if value == nil || *value != v {
+					return false
+				}
+			}
+		}
+	}
+
+	return true
+}

cluster-autoscaler/cloudprovider/azure/azure_autodiscovery_test.go

@@ -0,0 +1,77 @@
+/*
+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 azure
+
+import (
+	"github.com/stretchr/testify/assert"
+	"k8s.io/autoscaler/cluster-autoscaler/cloudprovider"
+	"testing"
+)
+
+func TestParseLabelAutoDiscoverySpecs(t *testing.T) {
+	testCases := []struct {
+		name        string
+		specs       []string
+		expected    []labelAutoDiscoveryConfig
+		expectedErr bool
+	}{
+		{
+			name: "ValidSpec",
+			specs: []string{
+				"label:cluster-autoscaler-enabled=true,cluster-autoscaler-name=fake-cluster",
+				"label:test-tag=test-value,another-test-tag=another-test-value",
+			},
+			expected: []labelAutoDiscoveryConfig{
+				{Selector: map[string]string{"cluster-autoscaler-enabled": "true", "cluster-autoscaler-name": "fake-cluster"}},
+				{Selector: map[string]string{"test-tag": "test-value", "another-test-tag": "another-test-value"}},
+			},
+		},
+		{
+			name:        "MissingAutoDiscoverLabel",
+			specs:       []string{"test-tag=test-value,another-test-tag"},
+			expectedErr: true,
+		},
+		{
+			name:        "InvalidAutoDiscoerLabel",
+			specs:       []string{"invalid:test-tag=test-value,another-test-tag"},
+			expectedErr: true,
+		},
+		{
+			name:        "MissingValue",
+			specs:       []string{"label:test-tag="},
+			expectedErr: true,
+		},
+		{
+			name:        "MissingKey",
+			specs:       []string{"label:=test-val"},
+			expectedErr: true,
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			ngdo := cloudprovider.NodeGroupDiscoveryOptions{NodeGroupAutoDiscoverySpecs: tc.specs}
+			actual, err := ParseLabelAutoDiscoverySpecs(ngdo)
+			if tc.expectedErr {
+				assert.Error(t, err)
+				return
+			}
+			assert.NoError(t, err)
+			assert.True(t, assert.ObjectsAreEqualValues(tc.expected, actual), "expected %#v, but found: %#v", tc.expected, actual)
+		})
+	}
+}