Cleanup

Author: hakman

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(true))
+	Azure = new("Azure", Bool(false))
 	// 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/kubetest2-kops/azure/zones.go

@@ -22,6 +22,8 @@ import (
 
 var allZones = []string{
 	"uksouth-1",
+	"uksouth-2",
+	"uksouth-3",
 }
 
 // RandomZones returns a random set of availability zones within a region

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

@@ -233,7 +233,7 @@ func (d *deployer) env() []string {
 		vars = append(vars, fmt.Sprintf("KUBE_SSH_KEY_PATH=%v", d.SSHPrivateKeyPath))
 	} else if d.CloudProvider == "azure" {
 		// Pass through some env vars if set
-		for _, k := range []string{"AZURE_TENANT_ID", "AZURE_SUBSCRIPTION_ID", "AZURE_CLIENT_ID", "AZURE_FEDERATED_TOKEN_FILE"} {
+		for _, k := range []string{"AZURE_TENANT_ID", "AZURE_SUBSCRIPTION_ID", "AZURE_CLIENT_ID", "AZURE_FEDERATED_TOKEN_FILE", "AZURE_STORAGE_ACCOUNT"} {
 			v := os.Getenv(k)
 			if v != "" {
 				vars = append(vars, k+"="+v)
@@ -359,6 +359,7 @@ func (d *deployer) stateStore() string {
 			d.createBucket = true
 			ss = "s3://" + bucketName
 		case "azure":
+			// TODO: Use dynamic container name
 			ss = "azureblob://cluster-state"
 		case "gce":
 			d.createBucket = true

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

@@ -62,8 +62,6 @@ 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

@@ -36,6 +36,7 @@ import (
 	"k8s.io/kops/tests/e2e/kubetest2-kops/do"
 	"k8s.io/kops/tests/e2e/kubetest2-kops/gce"
 	"k8s.io/kops/tests/e2e/pkg/kops"
+	"k8s.io/kops/tests/e2e/pkg/util"
 	"k8s.io/kops/tests/e2e/pkg/version"
 	"sigs.k8s.io/kubetest2/pkg/exec"
 )
@@ -79,13 +80,12 @@ func (d *deployer) Up() error {
 
 	adminAccess := d.AdminAccess
 	if adminAccess == "" {
-		adminAccess = "0.0.0.0/0"
-		//publicIP, err := util.ExternalIPRange()
-		//if err != nil {
-		//	return err
-		//}
-		//
-		//adminAccess = publicIP
+		publicIP, err := util.ExternalIPRange()
+		if err != nil {
+			return err
+		}
+
+		adminAccess = publicIP
 	}
 
 	zones, err := d.zones()
@@ -193,7 +193,9 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 			args = appendIfUnset(args, "--master-size", "c5.large")
 		}
 	case "azure":
+		// TODO: Check why Azure requires --network-cidr
 		args = appendIfUnset(args, "--network-cidr", "10.0.0.0/16")
+		args = appendIfUnset(args, "--cloud-labels", "DO-NOT-DELETE=kOps")
 		args = appendIfUnset(args, "--control-plane-size", "Standard_D4s_v3")
 		args = appendIfUnset(args, "--node-size", "Standard_D4s_v3")
 		args = appendIfUnset(args, "--azure-admin-user", "ubuntu")

tests/e2e/pkg/tester/tester.go

@@ -253,6 +253,8 @@ func (t *Tester) addRegionFlag() error {
 	case "aws":
 		zone := cluster.Spec.Subnets[0].Zone
 		region = zone[:len(zone)-1]
+	case "azure":
+		region = cluster.Spec.Subnets[0].Region
 	case "gce":
 		region = cluster.Spec.Subnets[0].Region
 	default:

upup/pkg/fi/cloudup/utils.go

@@ -156,9 +156,9 @@ func BuildCloud(cluster *kops.Cluster) (fi.Cloud, error) {
 				return nil, fmt.Errorf("on Azure, subnets must include Regions")
 			}
 
-			cloudTags := map[string]string{
-				azure.TagClusterName: cluster.ObjectMeta.Name,
-				"DO-NOT-DELETE":      "contact kOps",
+			cloudTags := map[string]string{azure.TagClusterName: cluster.ObjectMeta.Name}
+			for k, v := range cluster.Spec.CloudLabels {
+				cloudTags[k] = v
 			}
 
 			subscriptionID := cluster.Spec.CloudProvider.Azure.SubscriptionID

util/pkg/vfs/azureclient.go

@@ -19,41 +19,21 @@ package vfs
 import (
 	"context"
 	"fmt"
-	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"os"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
-	"k8s.io/klog/v2"
 )
 
 func newAzureClient(ctx context.Context) (*azblob.Client, error) {
-	klog.Infof("New Azure Blob client")
 	accountName := os.Getenv("AZURE_STORAGE_ACCOUNT")
 	if accountName == "" {
 		return nil, fmt.Errorf("AZURE_STORAGE_ACCOUNT must be set")
 	}
 
 	url := fmt.Sprintf("https://%s.blob.core.windows.net/", accountName)
 
-	klog.Infof("AZURE_TENANT_ID: %s", os.Getenv("AZURE_TENANT_ID"))
-	klog.Infof("AZURE_SUBSCRIPTION_ID: %s", os.Getenv("AZURE_SUBSCRIPTION_ID"))
-	klog.Infof("AZURE_CLIENT_ID: %s", os.Getenv("AZURE_CLIENT_ID"))
-	klog.Infof("AZURE_FEDERATED_TOKEN_FILE: %s", os.Getenv("AZURE_FEDERATED_TOKEN_FILE"))
-
-	var credential azcore.TokenCredential
-	var err error
-	if token, found := os.LookupEnv("AZURE_FEDERATED_TOKEN_FILE"); found {
-		klog.Infof("New WI Credential")
-		clientID := os.Getenv("AZURE_CLIENT_ID")
-		credential, err = azidentity.NewWorkloadIdentityCredential(&azidentity.WorkloadIdentityCredentialOptions{
-			ClientID:      clientID,
-			TokenFilePath: token,
-		})
-	} else {
-		klog.Infof("New Default Credential")
-		credential, err = azidentity.NewDefaultAzureCredential(nil)
-	}
+	credential, err := azidentity.NewDefaultAzureCredential(nil)
 	if err != nil {
 		return nil, err
 	}