AKS Service Target & template

.vscode/cspell.global.yaml

@@ -24,6 +24,7 @@ ignoreWords:
     - armauthorization
     - armappcontainers
     - armappservice
+    - armcontainerservice
     - armkeyvault
     - armresources
     - armruntime
@@ -34,6 +35,7 @@ ignoreWords:
     - Azdo
     - aztfmod
     - azurecaf
+    - azurecr
     - azuredevops
     - azurerm
     - armcontainerregistry
@@ -48,6 +50,7 @@ ignoreWords:
     - configlist
     - conjunction
     - containerregistry
+    - containerservice
     - databricks
     - dedb
     - devcontainer
@@ -73,6 +76,9 @@ ignoreWords:
     - JOBOBJECT
     - kubernetes
     - kusto
+    - kubeconfig
+    - kubeconfigs
+    - kustomize
     - magefile
     - mainfic
     - menuid
@@ -156,6 +162,7 @@ ignoreWords:
     - menuid
     - PLACEHOLDERIACTOOLS
     - LOGANALYTICS
+    - webapprouting
     - zipdeploy
     - appinsights
 useGitignore: true

.vscode/launch.json

@@ -1,15 +1,15 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Attach to Process",
-      "type": "go",
-      "request": "attach",
-      "mode": "local",
-      "processId": "${command:pickGoProcess}"
-    }
-  ]
-}
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Attach to Process",
+            "type": "go",
+            "request": "attach",
+            "mode": "local",
+            "processId": "${command:pickGoProcess}"
+        }
+    ]
+}

cli/azd/cmd/container.go

@@ -132,7 +132,9 @@ func registerCommonDependencies(container *ioc.NestedContainer) {
 			credProvider auth.MultiTenantCredentialProvider) (azcore.TokenCredential, error) {
 			if env == nil {
 				//nolint:lll
-				panic("command asked for azcore.TokenCredential, but prerequisite dependency environment.Environment was not registered.")
+				panic(
+					"command asked for azcore.TokenCredential, but prerequisite dependency environment. Environment was not registered.",
+				)
 			}
 
 			subscriptionId := env.GetSubscriptionId()

cli/azd/pkg/account/manager_test.go

@@ -111,7 +111,11 @@ func Test_GetAccountDefaults(t *testing.T) {
 		require.NoError(t, err)
 
 		accountDefaults, err := manager.GetAccountDefaults(context.Background())
-		require.Equal(t, &Account{DefaultSubscription: (*Subscription)(nil), DefaultLocation: (&defaultLocation)}, accountDefaults)
+		require.Equal(
+			t,
+			&Account{DefaultSubscription: (*Subscription)(nil), DefaultLocation: (&defaultLocation)},
+			accountDefaults,
+		)
 		require.NoError(t, err)
 	})
 

cli/azd/pkg/azure/resource_ids.go

@@ -51,6 +51,15 @@ func WebsiteRID(subscriptionId, resourceGroupName, websiteName string) string {
 	return returnValue
 }
 
+func AksRID(subscriptionId, resourceGroupName, clusterName string) string {
+	returnValue := fmt.Sprintf(
+		"%s/providers/Microsoft.ContainerService/managedClusters/%s",
+		ResourceGroupRID(subscriptionId, resourceGroupName),
+		clusterName,
+	)
+	return returnValue
+}
+
 func ContainerAppRID(subscriptionId, resourceGroupName, containerAppName string) string {
 	returnValue := fmt.Sprintf(
 		"%s/providers/Microsoft.App/containerApps/%s",
@@ -60,6 +69,15 @@ func ContainerAppRID(subscriptionId, resourceGroupName, containerAppName string)
 	return returnValue
 }
 
+func KubernetesServiceRID(subscriptionId, resourceGroupName, clusterName string) string {
+	returnValue := fmt.Sprintf(
+		"%s/providers/Microsoft.ContainerService/managedClusters/%s",
+		ResourceGroupRID(subscriptionId, resourceGroupName),
+		clusterName,
+	)
+	return returnValue
+}
+
 func StaticWebAppRID(subscriptionId, resourceGroupName, staticSiteName string) string {
 	returnValue := fmt.Sprintf(
 		"%s/providers/Microsoft.Web/staticSites/%s",

cli/azd/pkg/environment/environment.go

@@ -36,6 +36,9 @@ const TenantIdEnvVarName = "AZURE_TENANT_ID"
 // to.
 const ContainerRegistryEndpointEnvVarName = "AZURE_CONTAINER_REGISTRY_ENDPOINT"
 
+// AksClusterEnvVarName is the name of they key used to store the endpoint of the AKS cluster to push to.
+const AksClusterEnvVarName = "AZURE_AKS_CLUSTER_NAME"
+
 // ResourceGroupEnvVarName is the name of the azure resource group that should be used for deployments
 const ResourceGroupEnvVarName = "AZURE_RESOURCE_GROUP"
 

cli/azd/pkg/exec/command_runner.go

@@ -58,7 +58,14 @@ func (r *commandRunner) Run(ctx context.Context, args RunArgs) (RunResult, error
 
 	cmd.Dir = args.Cwd
 
-	var stdin, stdout, stderr bytes.Buffer
+	var stdin io.Reader
+	if args.StdIn != nil {
+		stdin = args.StdIn
+	} else {
+		stdin = new(bytes.Buffer)
+	}
+
+	var stdout, stderr bytes.Buffer
 
 	cmd.Env = appendEnv(args.Env)
 
@@ -67,7 +74,7 @@ func (r *commandRunner) Run(ctx context.Context, args RunArgs) (RunResult, error
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 	} else {
-		cmd.Stdin = &stdin
+		cmd.Stdin = stdin
 		cmd.Stdout = &stdout
 		cmd.Stderr = &stderr
 

cli/azd/pkg/exec/runargs.go

@@ -29,6 +29,9 @@ type RunArgs struct {
 
 	// When set will attach commands to std input/output
 	Interactive bool
+
+	// When set will call the command with the specified StdIn
+	StdIn io.Reader
 }
 
 // NewRunArgs creates a new instance with the specified cmd and args
@@ -81,3 +84,8 @@ func (b RunArgs) WithDebug(debug bool) RunArgs {
 	b.Debug = debug
 	return b
 }
+
+func (b RunArgs) WithStdIn(stdIn io.Reader) RunArgs {
+	b.StdIn = stdIn
+	return b
+}

cli/azd/pkg/infra/azure_resource_types.go

@@ -25,7 +25,10 @@ const (
 	AzureResourceTypeResourceGroup           AzureResourceType = "Microsoft.Resources/resourceGroups"
 	AzureResourceTypeStorageAccount          AzureResourceType = "Microsoft.Storage/storageAccounts"
 	AzureResourceTypeStaticWebSite           AzureResourceType = "Microsoft.Web/staticSites"
+	AzureResourceTypeContainerRegistry       AzureResourceType = "Microsoft.ContainerRegistry/registries"
+	AzureResourceTypeManagedCluster          AzureResourceType = "Microsoft.ContainerService/managedClusters"
 	AzureResourceTypeServicePlan             AzureResourceType = "Microsoft.Web/serverfarms"
+	AzureResourceTypeAgentPool               AzureResourceType = "Microsoft.ContainerService/managedClusters/agentPools"
 	AzureResourceTypeSqlServer               AzureResourceType = "Microsoft.Sql/servers"
 	AzureResourceTypeVirtualNetwork          AzureResourceType = "Microsoft.Network/virtualNetworks"
 	AzureResourceTypeWebSite                 AzureResourceType = "Microsoft.Web/sites"
@@ -78,6 +81,12 @@ func GetResourceTypeDisplayName(resourceType AzureResourceType) string {
 		return "Load Tests"
 	case AzureResourceTypeVirtualNetwork:
 		return "Virtual Network"
+	case AzureResourceTypeContainerRegistry:
+		return "Container Registry"
+	case AzureResourceTypeManagedCluster:
+		return "AKS Managed Cluster"
+	case AzureResourceTypeAgentPool:
+		return "AKS Agent Pool"
 	}
 
 	return ""

cli/azd/pkg/project/framework_service_docker.go

@@ -23,7 +23,7 @@ type DockerProjectOptions struct {
 type dockerProject struct {
 	config    *ServiceConfig
 	env       *environment.Environment
-	docker    *docker.Docker
+	docker    docker.Docker
 	framework FrameworkService
 }
 
@@ -66,7 +66,7 @@ func (p *dockerProject) Initialize(ctx context.Context) error {
 func NewDockerProject(
 	config *ServiceConfig,
 	env *environment.Environment,
-	docker *docker.Docker,
+	docker docker.Docker,
 	framework FrameworkService,
 ) FrameworkService {
 	return &dockerProject{

cli/azd/pkg/project/service_config.go

@@ -17,6 +17,7 @@ import (
 	"github.com/azure/azure-dev/cli/azd/pkg/tools"
 	"github.com/azure/azure-dev/cli/azd/pkg/tools/azcli"
 	"github.com/azure/azure-dev/cli/azd/pkg/tools/docker"
+	"github.com/azure/azure-dev/cli/azd/pkg/tools/kubectl"
 	"github.com/azure/azure-dev/cli/azd/pkg/tools/swa"
 )
 
@@ -39,6 +40,8 @@ type ServiceConfig struct {
 	Module string `yaml:"module"`
 	// The optional docker options
 	Docker DockerProjectOptions `yaml:"docker"`
+	// The optional K8S / AKS options
+	K8s AksOptions `yaml:"k8s"`
 	// The infrastructure provisioning configuration
 	Infra provisioning.Options `yaml:"infra"`
 	// Hook configuration for service
@@ -124,6 +127,20 @@ func (sc *ServiceConfig) GetServiceTarget(
 		target, err = NewFunctionAppTarget(sc, env, resource, azCli)
 	case string(StaticWebAppTarget):
 		target, err = NewStaticWebAppTarget(sc, env, resource, azCli, swa.NewSwaCli(commandRunner))
+	case string(AksTarget):
+		containerService, err := azCli.ContainerService(ctx, env.GetSubscriptionId())
+		if err != nil {
+			return nil, err
+		}
+		target = NewAksTarget(
+			sc,
+			env,
+			resource,
+			azCli,
+			containerService,
+			kubectl.NewKubectl(commandRunner),
+			docker.NewDocker(commandRunner),
+		)
 	default:
 		return nil, fmt.Errorf("unsupported host '%s' for service '%s'", sc.Host, sc.Name)
 	}
@@ -154,7 +171,7 @@ func (sc *ServiceConfig) GetFrameworkService(
 	}
 
 	// For containerized applications we use a nested framework service
-	if sc.Host == string(ContainerAppTarget) {
+	if sc.Host == string(ContainerAppTarget) || sc.Host == string(AksTarget) {
 		sourceFramework := frameworkService
 		frameworkService = NewDockerProject(sc, env, docker.NewDocker(commandRunner), sourceFramework)
 	}

cli/azd/pkg/project/service_target.go

@@ -20,6 +20,7 @@ const (
 	ContainerAppTarget  ServiceTargetKind = "containerapp"
 	AzureFunctionTarget ServiceTargetKind = "function"
 	StaticWebAppTarget  ServiceTargetKind = "staticwebapp"
+	AksTarget           ServiceTargetKind = "aks"
 )
 
 type ServiceDeploymentResult struct {
@@ -89,10 +90,5 @@ func resourceTypeMismatchError(
 // As an example, ContainerAppTarget is able to provision the container app as part of deployment,
 // and thus returns true.
 func (st ServiceTargetKind) SupportsDelayedProvisioning() bool {
-	return st == ContainerAppTarget
+	return st == ContainerAppTarget || st == AksTarget
 }
-
-var _ ServiceTarget = &appServiceTarget{}
-var _ ServiceTarget = &containerAppTarget{}
-var _ ServiceTarget = &functionAppTarget{}
-var _ ServiceTarget = &staticWebAppTarget{}