azure: Add e2e testing

Author: hakman

Makefile

@@ -50,7 +50,7 @@ UPLOAD_CMD=$(KOPS_ROOT)/hack/upload ${UPLOAD_ARGS}
 unexport AWS_ACCESS_KEY_ID AWS_REGION AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN CNI_VERSION_URL DNS_IGNORE_NS_CHECK DNSCONTROLLER_IMAGE DO_ACCESS_TOKEN GOOGLE_APPLICATION_CREDENTIALS
 unexport KOPS_BASE_URL KOPS_CLUSTER_NAME KOPS_RUN_OBSOLETE_VERSION KOPS_STATE_STORE KOPS_STATE_S3_ACL KUBE_API_VERSIONS NODEUP_URL OPENSTACK_CREDENTIAL_FILE SKIP_PACKAGE_UPDATE
 unexport SKIP_REGION_CHECK S3_ACCESS_KEY_ID S3_ENDPOINT S3_REGION S3_SECRET_ACCESS_KEY HCLOUD_TOKEN SCW_ACCESS_KEY SCW_SECRET_KEY SCW_DEFAULT_PROJECT_ID SCW_PROFILE
-unexport AZURE_CLIENT_ID AZURE_CLIENT_SECRET AZURE_STORAGE_ACCOUNT AZURE_SUBSCRIPTION_ID AZURE_TENANT_ID
+#unexport AZURE_CLIENT_ID AZURE_CLIENT_SECRET AZURE_STORAGE_ACCOUNT AZURE_SUBSCRIPTION_ID AZURE_TENANT_ID
 
 
 VERSION=$(shell tools/get_version.sh | grep VERSION | awk '{print $$2}')

pkg/featureflag/featureflag.go

@@ -74,7 +74,7 @@ var (
 	// ClusterAddons activates experimental cluster-addons support
 	ClusterAddons = new("ClusterAddons", Bool(false))
 	// Azure toggles the Azure support.
-	Azure = new("Azure", Bool(false))
+	Azure = new("Azure", Bool(true))
 	// APIServerNodes enables ability to provision nodes that only run the kube-apiserver.
 	APIServerNodes = new("APIServerNodes", Bool(false))
 	// UseAddonOperators activates experimental addon operator support

tests/e2e/e2e.mk

@@ -17,6 +17,7 @@ GOARCH ?= $(shell go env GOARCH)
 
 .PHONY: test-e2e-install
 test-e2e-install:
+	env
 	cd $(KOPS_ROOT)/tests/e2e && \
 		go install ./kubetest2-tester-kops && \
 		go install ./kubetest2-kops

tests/e2e/kubetest2-kops/azure/zones.go

@@ -0,0 +1,36 @@
+/*
+Copyright 2025 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 (
+	"math/rand"
+)
+
+var allZones = []string{
+	"uksouth-1",
+}
+
+// RandomZones returns a random set of availability zones within a region
+func RandomZones(count int) ([]string, error) {
+	n := rand.Intn(1000) % len(allZones)
+	chosenZone := allZones[n]
+
+	chosenZones := make([]string, 0)
+	chosenZones = append(chosenZones, chosenZone)
+
+	return chosenZones, nil
+}

tests/e2e/kubetest2-kops/deployer/common.go

@@ -73,6 +73,14 @@ func (d *deployer) initialize() error {
 			d.SSHPublicKeyPath = publicKeyPath
 			d.SSHPrivateKeyPath = privateKeyPath
 		}
+	case "azure":
+		publicKeyPath, privateKeyPath, err := util.CreateSSHKeyPair(d.ClusterName)
+		if err != nil {
+			return err
+		}
+		d.SSHPublicKeyPath = publicKeyPath
+		d.SSHPrivateKeyPath = privateKeyPath
+		d.SSHUser = "ubuntu"
 	case "digitalocean":
 		if d.SSHPrivateKeyPath == "" {
 			d.SSHPrivateKeyPath = os.Getenv("DO_SSH_PRIVATE_KEY_FILE")
@@ -180,6 +188,7 @@ func (d *deployer) verifyKopsFlags() error {
 
 	switch d.CloudProvider {
 	case "aws":
+	case "azure":
 	case "gce":
 	case "digitalocean":
 	default:
@@ -339,6 +348,8 @@ func (d *deployer) stateStore() string {
 			}
 			d.createBucket = true
 			ss = "s3://" + bucketName
+		case "azure":
+			ss = "azureblob://cluster-state"
 		case "gce":
 			d.createBucket = true
 			ss = "gs://" + gce.GCSBucketName(d.GCPProject, "state")

tests/e2e/kubetest2-kops/deployer/deployer.go

@@ -62,6 +62,8 @@ type deployer struct {
 	// ControlPlaneCount specifies the number of VMs in the control-plane.
 	ControlPlaneCount int `flag:"control-plane-count" desc:"Number of control-plane instances"`
 
+	AzureSubscriptionID string `flag:"azure-subscription-id" desc:"DELETEME"`
+
 	ControlPlaneIGOverrides []string `flag:"control-plane-instance-group-overrides" desc:"overrides for the control plane instance groups"`
 	NodeIGOverrides         []string `flag:"node-instance-group-overrides" desc:"overrides for the node instance groups"`
 

tests/e2e/kubetest2-kops/deployer/up.go

@@ -31,6 +31,7 @@ import (
 
 	"k8s.io/klog/v2"
 	"k8s.io/kops/tests/e2e/kubetest2-kops/aws"
+	"k8s.io/kops/tests/e2e/kubetest2-kops/azure"
 	"k8s.io/kops/tests/e2e/kubetest2-kops/do"
 	"k8s.io/kops/tests/e2e/kubetest2-kops/gce"
 	"k8s.io/kops/tests/e2e/pkg/kops"
@@ -190,6 +191,10 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 		} else {
 			args = appendIfUnset(args, "--master-size", "c5.large")
 		}
+	case "azure":
+		args = appendIfUnset(args, "--master-size", "Standard_D4s_v3")
+		args = appendIfUnset(args, "--node-size", "Standard_D4s_v3")
+		args = appendIfUnset(args, "--azure-admin-user", "ubuntu")
 	case "gce":
 		if isArm {
 			args = appendIfUnset(args, "--master-size", "t2a-standard-2")
@@ -346,6 +351,8 @@ func (d *deployer) zones() ([]string, error) {
 	switch d.CloudProvider {
 	case "aws":
 		return aws.RandomZones(d.ControlPlaneCount)
+	case "azure":
+		return azure.RandomZones(1)
 	case "gce":
 		return gce.RandomZones(1)
 	case "digitalocean":

tests/e2e/pkg/tester/tester.go

@@ -150,7 +150,7 @@ func (t *Tester) addProviderFlag() error {
 	switch cluster.Spec.LegacyCloudProvider {
 	case "aws", "gce":
 		provider = cluster.Spec.LegacyCloudProvider
-	case "digitalocean":
+	case "azure", "digitalocean":
 	default:
 		klog.Warningf("unhandled cluster.spec.cloudProvider %q for determining ginkgo Provider", cluster.Spec.LegacyCloudProvider)
 	}