kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17504 from hakman/azure-test 

azure: Add defaults for network CIDR and subscription ID
This commit is contained in:
Kubernetes Prow Robot 2025-07-20 03:48:26 -07:00 committed by GitHub
parent 4570455f78 29fb3d3587
commit 1a0d074510
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kops/create_cluster.go
View File

@ -536,6 +536,16 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
c.NetworkID = c.OpenstackNetworkID
}
if featureflag.Azure.Enabled() {
if c.AzureSubscriptionID == "" {
if id, ok := os.LookupEnv("AZURE_SUBSCRIPTION_ID"); ok {
c.AzureSubscriptionID = id
} else {
return fmt.Errorf("--azure-subscription-id is required")
}
}
}
clusterResult, err := cloudup.NewCluster(&c.NewClusterOptions, clientset)
if err != nil {
return err

4
tests/e2e/kubetest2-kops/deployer/up.go
View File

@ -20,7 +20,6 @@ import (
"context"
"errors"
"fmt"
"os"
osexec "os/exec"
"path"
"strconv"
@ -193,14 +192,11 @@ 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_D2s_v3")
// TODO: Check if we can use "kops" as SSH user
args = appendIfUnset(args, "--azure-admin-user", "ubuntu")
args = appendIfUnset(args, "--azure-subscription-id", os.Getenv("AZURE_SUBSCRIPTION_ID"))
case "gce":
if isArm {
args = appendIfUnset(args, "--master-size", "t2a-standard-2")

48
upup/pkg/fi/cloudup/defaults.go
View File

@ -70,24 +70,11 @@ func PerformAssignments(c *kops.Cluster, vfsContext *vfs.VFSContext, cloud fi.Cl
}
}
setNetworkCIDR := (cloud.ProviderID() == kops.CloudProviderAWS) || (cloud.ProviderID() == kops.CloudProviderAzure)
if setNetworkCIDR && c.Spec.Networking.NetworkCIDR == "" {
if cloud.ProviderID() == kops.CloudProviderAWS && c.Spec.Networking.NetworkCIDR == "" {
if c.SharedVPC() {
var vpcInfo *fi.VPCInfo
var err error
if cloud.ProviderID() == kops.CloudProviderAzure {
if c.Spec.CloudProvider.Azure == nil || c.Spec.CloudProvider.Azure.ResourceGroupName == "" {
return fmt.Errorf("missing required --azure-resource-group-name when specifying Network ID")
}
vpcInfo, err = cloud.(azure.AzureCloud).FindVNetInfo(c.Spec.Networking.NetworkID, c.Spec.CloudProvider.Azure.ResourceGroupName)
if err != nil {
return err
}
} else {
vpcInfo, err = cloud.FindVPCInfo(c.Spec.Networking.NetworkID)
if err != nil {
return err
}
vpcInfo, err := cloud.FindVPCInfo(c.Spec.Networking.NetworkID)
if err != nil {
return err
}
if vpcInfo == nil {
return fmt.Errorf("unable to find Network ID %q", c.Spec.Networking.NetworkID)
@ -97,10 +84,8 @@ func PerformAssignments(c *kops.Cluster, vfsContext *vfs.VFSContext, cloud fi.Cl
return fmt.Errorf("unable to infer NetworkCIDR from Network ID, please specify --network-cidr")
}
} else {
if cloud.ProviderID() == kops.CloudProviderAWS {
// TODO: Choose non-overlapping networking CIDRs for VPCs, using vpcInfo
c.Spec.Networking.NetworkCIDR = "172.20.0.0/16"
}
// TODO: Choose non-overlapping networking CIDRs for VPCs, using vpcInfo
c.Spec.Networking.NetworkCIDR = "172.20.0.0/16"
}
// Amazon VPC CNI uses the same network
@ -109,6 +94,27 @@ func PerformAssignments(c *kops.Cluster, vfsContext *vfs.VFSContext, cloud fi.Cl
}
}
if cloud.ProviderID() == kops.CloudProviderAzure && c.Spec.Networking.NetworkCIDR == "" {
if c.SharedVPC() {
if c.Spec.CloudProvider.Azure == nil || c.Spec.CloudProvider.Azure.ResourceGroupName == "" {
return fmt.Errorf("missing required --azure-resource-group-name when specifying Network ID")
}
vpcInfo, err := cloud.(azure.AzureCloud).FindVNetInfo(c.Spec.Networking.NetworkID, c.Spec.CloudProvider.Azure.ResourceGroupName)
if err != nil {
return err
}
if vpcInfo == nil {
return fmt.Errorf("unable to find Network ID %q", c.Spec.Networking.NetworkID)
}
c.Spec.Networking.NetworkCIDR = vpcInfo.CIDR
if c.Spec.Networking.NetworkCIDR == "" {
return fmt.Errorf("unable to infer NetworkCIDR from Network ID, please specify --network-cidr")
}
} else {
c.Spec.Networking.NetworkCIDR = "10.0.0.0/16"
}
}
if c.Spec.Networking.NonMasqueradeCIDR == "" {
c.Spec.Networking.NonMasqueradeCIDR = "100.64.0.0/10"
}