Merge pull request #8 from rosskirkpat/rke2-provider

add rke2-windows provider

Author: dramich

detector.go

@@ -26,6 +26,7 @@ func init() {
 	allProviders[providers.RKE] = providers.IsRKE
 	allProviders[providers.RKE_WINDOWS] = providers.IsRKEWindows
 	allProviders[providers.RKE2] = providers.IsRKE2
+	allProviders[providers.RKE2_WINDOWS] = providers.IsRKE2Windows
 }
 
 // DetectProvider accepts a k8s interface and checks all registered providers for a match

providers/rke2-windows.go

@@ -0,0 +1,36 @@
+package providers
+
+import (
+	"context"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+)
+
+const RKE2_WINDOWS = "rke2.windows"
+
+
+func IsRKE2Windows(ctx context.Context, k8sClient kubernetes.Interface) (bool, error) {
+	// Check if the cluster is rke2 to avoid false positive of rke1 windows clusters
+	if isRKE2, err := IsRKE2(ctx, k8sClient); err != nil || !isRKE2 {
+		return false, err
+	}
+	if isHarvester, err := IsHarvester(ctx, k8sClient); err != nil || isHarvester {
+		return false, err
+	}
+	// Look for nodes that have a Windows specific label
+	listOpts := metav1.ListOptions{
+		Limit:         1,
+		LabelSelector: "kubernetes.io/os=windows",
+	}
+
+	windowsNodes, err := k8sClient.CoreV1().Nodes().List(ctx, listOpts)
+	if err != nil {
+		return false, err
+	}
+	if len(windowsNodes.Items) == 0 {
+		return false, nil
+	}
+
+	return len(windowsNodes.Items) > 0, nil
+}

providers/rke2.go

@@ -2,6 +2,7 @@ package providers
 
 import (
 	"context"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"strings"
 
 	"k8s.io/client-go/kubernetes"
@@ -10,6 +11,18 @@ import (
 const RKE2 = "rke2"
 
 func IsRKE2(ctx context.Context, k8sClient kubernetes.Interface) (bool, error) {
+	// if there are windows nodes then this should not be counted as rke2.linux
+	windowsNodes, err := k8sClient.CoreV1().Nodes().List(ctx, metav1.ListOptions{
+		Limit:         1,
+		LabelSelector: "kubernetes.io/os=windows",
+	})
+	if err != nil {
+		return false, err
+	}
+	if len(windowsNodes.Items) != 0 {
+		return false, nil
+	}
+
 	if isHarvester, err := IsHarvester(ctx, k8sClient); err != nil || isHarvester {
 		return false, err
 	}