Merge pull request #1036 from jsturtevant/windows-support

Windows support via kubeadm

Author: k8s-ci-robot

Makefile

@@ -455,8 +455,10 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
 	# apply CNI ClusterResourceSets
 	kubectl create configmap calico-addon --from-file=templates/addons/calico.yaml
 	kubectl create configmap calico-ipv6-addon --from-file=templates/addons/calico-ipv6.yaml
+	kubectl create configmap flannel-windows-addon --from-file=templates/addons/windows/
 	kubectl apply -f templates/addons/calico-resource-set.yaml
-
+	kubectl apply -f templates/addons/flannel-resource-set.yaml
+	
 	# Wait for CAPZ deployments
 	kubectl wait --for=condition=Available --timeout=5m -n capz-system deployment -l cluster.x-k8s.io/provider=infrastructure-azure
 
@@ -478,6 +480,9 @@ create-workload-cluster: $(ENVSUBST)
 	@if [[ "${CLUSTER_TEMPLATE}" == *prow* ]]; then \
 		if [[ "${CLUSTER_TEMPLATE}" == *ipv6* ]]; then \
 			kubectl --kubeconfig=./kubeconfig apply -f templates/addons/calico-ipv6.yaml; \
+		elif [[ "${CLUSTER_TEMPLATE}" == *windows* ]]; then \
+			echo "windows being applied" \
+			kubectl --kubeconfig=./kubeconfig apply -f templates/addons/windows; \
 		else \
 			kubectl --kubeconfig=./kubeconfig apply -f templates/addons/calico.yaml; \
 		fi \

Tiltfile

@@ -196,13 +196,24 @@ def capz():
 
     k8s_yaml(blob(yaml))
 
-def calico_crs():
+def create_crs():
+    # create config maps
     local("kubectl delete configmaps calico-addon --ignore-not-found=true")
     local("kubectl create configmap calico-addon --from-file=templates/addons/calico.yaml")
     local("kubectl delete configmaps calico-ipv6-addon --ignore-not-found=true")
     local("kubectl create configmap calico-ipv6-addon --from-file=templates/addons/calico-ipv6.yaml")
+    local("kubectl delete configmaps flannel-windows-addon --ignore-not-found=true")
+
+    # need to set version for kube-proxy on windows.  
+    # This file is processed then reapply \\ due to the named pipes which need to be escaped for a bug in envsubst library
+	# https://github.com/kubernetes-sigs/cluster-api/issues/4016
+    os.putenv("KUBERNETES_VERSION", settings.get("kubernetes_version", {}))
+    local("kubectl create configmap flannel-windows-addon --from-file=templates/addons/windows/ --dry-run=client -o yaml | " + envsubst_cmd + " | sed -e 's/\\\\/\\\\\\\\/' | kubectl apply -f -")
+
+    # set up crs
     local("kubectl wait --for=condition=Available --timeout=300s -n capi-webhook-system deployment/capi-controller-manager")
     local("kubectl apply -f templates/addons/calico-resource-set.yaml")
+    local("kubectl apply -f templates/addons/flannel-resource-set.yaml")
 
 # run worker clusters specified from 'tilt up' or in 'tilt_config.json'
 def flavors():
@@ -264,8 +275,9 @@ def deploy_worker_templates(template, substitutions):
                 yaml = yaml.replace("${" + substitution + "}", value)
 
     # programmatically define any remaining vars
+    # "windows" can not be for cluster name because it sets the dns to trademarked name during reconciliation
     substitutions = {
-        "CLUSTER_NAME": flavor + "-template",
+        "CLUSTER_NAME": flavor.replace("windows", "win") + "-template",
         "AZURE_LOCATION": "eastus",
         "AZURE_VNET_NAME": flavor + "-template-vnet",
         "AZURE_RESOURCE_GROUP": flavor + "-template-rg",
@@ -334,6 +346,6 @@ deploy_capi()
 
 capz()
 
-calico_crs()
+create_crs()
 
 flavors()

cloud/defaults.go

@@ -35,12 +35,19 @@ const (
 const (
 	// DefaultImageOfferID is the default Azure Marketplace offer ID
 	DefaultImageOfferID = "capi"
+	// DefaultWindowsImageOfferID is the default Azure Marketplace offer ID for Windows
+	DefaultWindowsImageOfferID = "capi-windows"
 	// DefaultImagePublisherID is the default Azure Marketplace publisher ID
 	DefaultImagePublisherID = "cncf-upstream"
 	// LatestVersion is the image version latest
 	LatestVersion = "latest"
 )
 
+const (
+	// WindowsOS is Windows OS value for OSDisk
+	WindowsOS = "Windows"
+)
+
 const (
 	// Global is the Azure global location value.
 	Global = "global"
@@ -177,17 +184,17 @@ func NATRuleID(subscriptionID, resourceGroup, loadBalancerName, natRuleName stri
 }
 
 // GetDefaultImageSKUID gets the SKU ID of the image to use for the provided version of Kubernetes.
-func getDefaultImageSKUID(k8sVersion string) (string, error) {
+func getDefaultImageSKUID(k8sVersion, os, osVersion string) (string, error) {
 	version, err := semver.ParseTolerant(k8sVersion)
 	if err != nil {
 		return "", errors.Wrapf(err, "unable to parse Kubernetes version \"%s\" in spec, expected valid SemVer string", k8sVersion)
 	}
-	return fmt.Sprintf("k8s-%ddot%ddot%d-ubuntu-1804", version.Major, version.Minor, version.Patch), nil
+	return fmt.Sprintf("k8s-%ddot%ddot%d-%s-%s", version.Major, version.Minor, version.Patch, os, osVersion), nil
 }
 
 // GetDefaultUbuntuImage returns the default image spec for Ubuntu.
 func GetDefaultUbuntuImage(k8sVersion string) (*infrav1.Image, error) {
-	skuID, err := getDefaultImageSKUID(k8sVersion)
+	skuID, err := getDefaultImageSKUID(k8sVersion, "ubuntu", "1804")
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get default image")
 	}
@@ -204,6 +211,25 @@ func GetDefaultUbuntuImage(k8sVersion string) (*infrav1.Image, error) {
 	return defaultImage, nil
 }
 
+// GetDefaultWindowsImage returns the default image spec for Windows.
+func GetDefaultWindowsImage(k8sVersion string) (*infrav1.Image, error) {
+	skuID, err := getDefaultImageSKUID(k8sVersion, "windows", "2019")
+	if err != nil {
+		return nil, errors.Wrapf(err, "failed to get default image")
+	}
+
+	defaultImage := &infrav1.Image{
+		Marketplace: &infrav1.AzureMarketplaceImage{
+			Publisher: DefaultImagePublisherID,
+			Offer:     DefaultWindowsImageOfferID,
+			SKU:       skuID,
+			Version:   LatestVersion,
+		},
+	}
+
+	return defaultImage, nil
+}
+
 // UserAgent specifies a string to append to the agent identifier.
 func UserAgent() string {
 	return fmt.Sprintf("cluster-api-provider-azure/%s", version.Get().String())

cloud/defaults_test.go

@@ -29,54 +29,77 @@ func TestGetDefaultImageSKUID(t *testing.T) {
 
 	var tests = []struct {
 		k8sVersion     string
+		os             string
+		osVersion      string
 		expectedResult string
 		expectedError  bool
 	}{
 		{
 			k8sVersion:     "v1.14.9",
 			expectedResult: "k8s-1dot14dot9-ubuntu-1804",
 			expectedError:  false,
+			os:             "ubuntu",
+			osVersion:      "1804",
 		},
 		{
 			k8sVersion:     "v1.14.10",
 			expectedResult: "k8s-1dot14dot10-ubuntu-1804",
 			expectedError:  false,
+			os:             "ubuntu",
+			osVersion:      "1804",
 		},
 		{
 			k8sVersion:     "v1.15.6",
 			expectedResult: "k8s-1dot15dot6-ubuntu-1804",
 			expectedError:  false,
+			os:             "ubuntu",
+			osVersion:      "1804",
 		},
 		{
 			k8sVersion:     "v1.15.7",
 			expectedResult: "k8s-1dot15dot7-ubuntu-1804",
 			expectedError:  false,
+			os:             "ubuntu",
+			osVersion:      "1804",
 		},
 		{
 			k8sVersion:     "v1.16.3",
 			expectedResult: "k8s-1dot16dot3-ubuntu-1804",
 			expectedError:  false,
+			os:             "ubuntu",
+			osVersion:      "1804",
 		},
 		{
 			k8sVersion:     "v1.16.4",
 			expectedResult: "k8s-1dot16dot4-ubuntu-1804",
 			expectedError:  false,
+			os:             "ubuntu",
+			osVersion:      "1804",
 		},
 		{
 			k8sVersion:     "1.12.0",
 			expectedResult: "k8s-1dot12dot0-ubuntu-1804",
 			expectedError:  false,
+			os:             "ubuntu",
+			osVersion:      "1804",
 		},
 		{
 			k8sVersion:     "1.1.notvalid.semver",
 			expectedResult: "",
 			expectedError:  true,
 		},
+		{
+			k8sVersion:     "v1.19.3",
+			expectedResult: "k8s-1dot19dot3-windows-2019",
+			expectedError:  false,
+			os:             "windows",
+			osVersion:      "2019",
+		},
 	}
 
 	for _, test := range tests {
 		t.Run(test.k8sVersion, func(t *testing.T) {
-			id, err := getDefaultImageSKUID(test.k8sVersion)
+			id, err := getDefaultImageSKUID(test.k8sVersion, test.os, test.osVersion)
 
 			if test.expectedError {
 				g.Expect(err).To(HaveOccurred())

cloud/scope/machine.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"strings"
 
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/go-logr/logr"
@@ -260,6 +261,15 @@ func (m *MachineScope) AvailabilityZone() string {
 
 // Name returns the AzureMachine name.
 func (m *MachineScope) Name() string {
+	// Windows Machine names cannot be longer than 15 chars
+	if m.AzureMachine.Spec.OSDisk.OSType == azure.WindowsOS && len(m.AzureMachine.Name) > 15 {
+		clustername := m.ClusterName()
+		if len(m.ClusterName()) > 9 {
+			clustername = strings.TrimSuffix(clustername[0:9], "-")
+		}
+
+		return clustername + "-" + m.AzureMachine.Name[len(m.AzureMachine.Name)-5:]
+	}
 	return m.AzureMachine.Name
 }
 
@@ -440,6 +450,12 @@ func (m *MachineScope) GetVMImage() (*infrav1.Image, error) {
 	if m.AzureMachine.Spec.Image != nil {
 		return m.AzureMachine.Spec.Image, nil
 	}
-	m.Info("No image specified for machine, using default", "machine", m.AzureMachine.GetName())
+
+	if m.AzureMachine.Spec.OSDisk.OSType == azure.WindowsOS {
+		m.Info("No image specified for machine, using default Windows Image", "machine", m.AzureMachine.GetName())
+		return azure.GetDefaultWindowsImage(to.String(m.Machine.Spec.Version))
+	}
+
+	m.Info("No image specified for machine, using default Linux Image", "machine", m.AzureMachine.GetName())
 	return azure.GetDefaultUbuntuImage(to.String(m.Machine.Spec.Version))
 }

cloud/scope/machine_test.go

@@ -0,0 +1,122 @@
+/*
+Copyright 2018 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 scope
+
+import (
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha3"
+	azure "sigs.k8s.io/cluster-api-provider-azure/cloud"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
+)
+
+func TestMachineScope_Name(t *testing.T) {
+	type fields struct {
+		ClusterScoper azure.ClusterScoper
+		AzureMachine  *infrav1.AzureMachine
+	}
+	tests := []struct {
+		name         string
+		machineScope MachineScope
+		want         string
+		testLength   bool
+	}{
+		{
+			name: "linux can be any length",
+			machineScope: MachineScope{
+				AzureMachine: &infrav1.AzureMachine{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "machine-with-really-really-long-name",
+					},
+					Spec: infrav1.AzureMachineSpec{
+						OSDisk: infrav1.OSDisk{
+							OSType: "Linux",
+						},
+					},
+				},
+			},
+			want: "machine-with-really-really-long-name",
+		},
+		{
+			name: "Windows name with long MachineName and short cluster name",
+			machineScope: MachineScope{
+				ClusterScoper: &ClusterScope{
+					Cluster: &clusterv1.Cluster{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: "cluster",
+						},
+					},
+				},
+				AzureMachine: &infrav1.AzureMachine{
+					TypeMeta: metav1.TypeMeta{},
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "machine-90123456",
+					},
+					Spec: infrav1.AzureMachineSpec{
+						OSDisk: infrav1.OSDisk{
+							OSType: "Windows",
+						},
+					},
+					Status: infrav1.AzureMachineStatus{},
+				},
+			},
+			want:       "cluster-23456",
+			testLength: true,
+		},
+		{
+			name: "Windows name with long MachineName and long cluster name",
+			machineScope: MachineScope{
+				ClusterScoper: &ClusterScope{
+					Cluster: &clusterv1.Cluster{
+						ObjectMeta: metav1.ObjectMeta{
+							Name: "cluster8901234",
+						},
+					},
+				},
+				AzureMachine: &infrav1.AzureMachine{
+					TypeMeta: metav1.TypeMeta{},
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "machine-90123456",
+					},
+					Spec: infrav1.AzureMachineSpec{
+						OSDisk: infrav1.OSDisk{
+							OSType: "Windows",
+						},
+					},
+					Status: infrav1.AzureMachineStatus{},
+				},
+			},
+			want:       "cluster89-23456",
+			testLength: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			got := tt.machineScope.Name()
+			if got != tt.want {
+				t.Errorf("MachineScope.Name() = %v, want %v", got, tt.want)
+			}
+
+			if tt.testLength && len(got) > 15 {
+				t.Errorf("Length of MachineScope.Name() = %v, want less than %v", len(got), 15)
+			}
+		})
+	}
+}

cloud/scope/machinepool.go

@@ -124,6 +124,10 @@ func (m *MachinePoolScope) ScaleSetSpec() azure.ScaleSetSpec {
 
 // Name returns the Azure Machine Pool Name.
 func (m *MachinePoolScope) Name() string {
+	// Windows Machine pools names cannot be longer than 9 chars
+	if m.AzureMachinePool.Spec.Template.OSDisk.OSType == azure.WindowsOS && len(m.AzureMachinePool.Name) > 9 {
+		return "win-" + m.AzureMachinePool.Name[len(m.AzureMachinePool.Name)-5:]
+	}
 	return m.AzureMachinePool.Name
 }
 
@@ -310,6 +314,12 @@ func (m *MachinePoolScope) GetVMImage() (*infrav1.Image, error) {
 	if m.AzureMachinePool.Spec.Template.Image != nil {
 		return m.AzureMachinePool.Spec.Template.Image, nil
 	}
+
+	if m.AzureMachinePool.Spec.Template.OSDisk.OSType == azure.WindowsOS {
+		m.Info("No image specified for machine, using default Windows Image", "machine", m.MachinePool.GetName())
+		return azure.GetDefaultWindowsImage(to.String(m.MachinePool.Spec.Template.Spec.Version))
+	}
+
 	m.Info("No image specified for machine, using default", "machine", m.MachinePool.GetName())
 	return azure.GetDefaultUbuntuImage(to.String(m.MachinePool.Spec.Template.Spec.Version))
 }