kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10935 from cloudnatix/kenji/fix_node_name_conversion 

Fix node label conversion in Azure
This commit is contained in:
Kubernetes Prow Robot 2021-03-01 00:38:40 -08:00 committed by GitHub
parent f294793e44 a2bfbdd4cb
commit c802127528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/model/azuremodel/context.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package azuremodel
import (
"fmt"
"strings"
"k8s.io/kops/pkg/apis/kops"
@ -97,8 +98,12 @@ func (c *AzureModelContext) CloudTagsForInstanceGroup(ig *kops.InstanceGroup) ma
}
// Apply labels for cluster node labels.
i := 0
for k, v := range ig.Spec.NodeLabels {
labels[clusterNodeTemplateLabel+k] = v
// Store the label key in the tag value
// so that we don't need to espace "/" in the label key.
labels[fmt.Sprintf("%s%d", clusterNodeTemplateLabel, i)] = fmt.Sprintf("%s=%s", k, v)
i++
}
// Apply labels for cluster node taints.

15
pkg/model/azuremodel/context_test.go
View File

@ -43,14 +43,15 @@ func TestCloudTagsForInstanceGroup(t *testing.T) {
actual := c.CloudTagsForInstanceGroup(c.InstanceGroups[0])
expected := map[string]*string{
"cluster_label_key": fi.String("cluster_label_value"),
"ig_label_key": fi.String("ig_label_value"),
"test_label": fi.String("from_ig"),
"k8s.io_cluster_node-template_label_node_label_key": fi.String("node_label_value"),
"k8s.io_cluster_node-template_taint_taint_key": fi.String("taint_value"),
"k8s.io_role_node": fi.String("1"),
"kops.k8s.io_instancegroup": fi.String("nodes"),
"cluster_label_key": fi.String("cluster_label_value"),
"ig_label_key": fi.String("ig_label_value"),
"test_label": fi.String("from_ig"),
"k8s.io_cluster_node-template_label_0": fi.String("node_label/key=node_label_value"),
"k8s.io_cluster_node-template_taint_taint_key": fi.String("taint_value"),
"k8s.io_role_node": fi.String("1"),
"kops.k8s.io_instancegroup": fi.String("nodes"),
}
if !reflect.DeepEqual(actual, expected) {
t.Errorf("expected tags %+v, but got %+v", expected, actual)
}

1
pkg/nodeidentity/azure/BUILD.bazel generated
View File

@ -11,7 +11,6 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/nodeidentity:go_default_library",
"//upup/pkg/fi:go_default_library",
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute:go_default_library",
"//vendor/github.com/Azure/go-autorest/autorest/azure/auth:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",

10
pkg/nodeidentity/azure/identify.go
View File

@ -27,7 +27,6 @@ import (
expirationcache "k8s.io/client-go/tools/cache"
"k8s.io/klog/v2"
"k8s.io/kops/pkg/nodeidentity"
"k8s.io/kops/upup/pkg/fi"
)
const (
@ -109,9 +108,14 @@ func (i *nodeIdentifier) IdentifyNode(ctx context.Context, node *corev1.Node) (*
}
for k, v := range vmss.Tags {
if strings.HasPrefix(k, ClusterNodeTemplateLabel) {
info.Labels[strings.TrimPrefix(k, ClusterNodeTemplateLabel)] = fi.StringValue(v)
if !strings.HasPrefix(k, ClusterNodeTemplateLabel) {
continue
}
l := strings.SplitN(*v, "=", 2)
if len(l) <= 1 {
return nil, fmt.Errorf("malformed tag value %s", *v)
}
labels[l[0]] = l[1]
}
// If caching is enabled add the nodeidentity.Info to cache.