report both old and new styles of OS information

virtual-kubelet · Mar 6, 2023 · 8715d35 · 8715d35
1 parent 095e7a7
commit 8715d35
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/pkg/provider/vk_node.go b/pkg/provider/vk_node.go
@@ -7,6 +7,7 @@ package provider
 import (
 	"context"
 	"os"
+	"strings"
 
 	"github.com/virtual-kubelet/virtual-kubelet/trace"
 	v1 "k8s.io/api/core/v1"
@@ -26,6 +27,11 @@ func (p *ACIProvider) ConfigureNode(ctx context.Context, node *v1.Node) {
 	node.ObjectMeta.Labels["alpha.service-controller.kubernetes.io/exclude-balancer"] = "true"
 	node.ObjectMeta.Labels["node.kubernetes.io/exclude-from-external-load-balancers"] = "true"
 
+	// report both old and new styles of OS information
+	os := strings.ToLower(p.operatingSystem)
+	node.ObjectMeta.Labels["beta.kubernetes.io/os"] = os
+	node.ObjectMeta.Labels["kubernetes.io/os"] = os
+
 	// Virtual node would be skipped for cloud provider operations (e.g. CP should not add route).
 	node.ObjectMeta.Labels["kubernetes.azure.com/managed"] = "false"
 }

diff --git a/provider/aci.go b/provider/aci.go
@@ -1122,6 +1122,11 @@ func (p *ACIProvider) ConfigureNode(ctx context.Context, node *v1.Node) {
 	node.ObjectMeta.Labels["alpha.service-controller.kubernetes.io/exclude-balancer"] = "true"
 	node.ObjectMeta.Labels["node.kubernetes.io/exclude-from-external-load-balancers"] = "true"
 
+	// report both old and new styles of OS information
+	os := strings.ToLower(p.operatingSystem)
+	node.ObjectMeta.Labels["beta.kubernetes.io/os"] = os
+	node.ObjectMeta.Labels["kubernetes.io/os"] = os
+
 	// Virtual node would be skipped for cloud provider operations (e.g. CP should not add route).
 	node.ObjectMeta.Labels["kubernetes.azure.com/managed"] = "false"
 }