Merge remote-tracking branch 'origin/cluster-api-simple-test' into cl…

…uster-api-simple-test

pkg/bootstrap/common.go

@@ -141,6 +141,8 @@ func getBootstrapFlags(prov string) []string {
 			"--set", "bootstrap.snapshot-controller.enabled=false",
 			"--set", "bootstrap.snapshot-validation-webhook.enabled=false",
 			"--set", "bootstrap.tigera-operator.enabled=false",
+			"--set", "bootstrap.external-dns.enabled=false",
+			"--set", "bootstrap.plural-certmanager-webhook.enabled=false",
 		}
 	case api.ProviderAzure:
 		return []string{

pkg/bootstrap/migrate.go

@@ -10,6 +10,7 @@ import (
 	tfjson "github.com/hashicorp/terraform-json"
 	migratorapi "github.com/pluralsh/cluster-api-migration/pkg/api"
 	"github.com/pluralsh/cluster-api-migration/pkg/migrator"
+	"github.com/pluralsh/polly/containers"
 	delinkeranalyze "github.com/pluralsh/terraform-delinker/api/analyze/v1alpha1"
 	delinkerdelink "github.com/pluralsh/terraform-delinker/api/delink/v1alpha1"
 	delinkerexec "github.com/pluralsh/terraform-delinker/api/exec/v1alpha1"
@@ -138,6 +139,26 @@ func generateValuesFile() error {
 		return err
 	}
 
+	prov, err := provider.GetProvider()
+	if err != nil {
+		return err
+	}
+
+	if prov.Name() == api.ProviderAWS {
+		availabilityZoneSet := containers.NewSet[string]()
+		for _, subnet := range migratorValues.Cluster.AWSCloudSpec.NetworkSpec.Subnets {
+			availabilityZoneSet.Add(subnet.AvailabilityZone)
+		}
+		projectManifest, err := manifest.FetchProject()
+		if err != nil {
+			return err
+		}
+		projectManifest.AvailabilityZones = availabilityZoneSet.List()
+		if err := projectManifest.Flush(); err != nil {
+			return err
+		}
+	}
+
 	chart, err := loader.Load(bootstrapHelmDir)
 	if err != nil {
 		return err