diff --git a/pkg/fixtures/pipelines/kustomize.yaml b/pkg/fixtures/pipelines/kustomize.yaml index ae60918fb..7b81c24ef 100644 --- a/pkg/fixtures/pipelines/kustomize.yaml +++ b/pkg/fixtures/pipelines/kustomize.yaml @@ -12,6 +12,7 @@ variables: namespace: testNamespace tag: "$(Build.BuildId)" vmImageName: "ubuntu-latest" + resourceType: Microsoft.ContainerService/managedClusters trigger: - main @@ -64,5 +65,6 @@ stages: kubernetesCluster: $(clusterName) namespace: $(namespace) manifests: $(bake.manifestsBundle) + resourceType: $(resourceType) containers: | $(azureContainerRegistry).azurecr.io/$(containerName):$(tag) diff --git a/pkg/fixtures/pipelines/manifests.yaml b/pkg/fixtures/pipelines/manifests.yaml index 754cef97f..84429d0c8 100644 --- a/pkg/fixtures/pipelines/manifests.yaml +++ b/pkg/fixtures/pipelines/manifests.yaml @@ -12,6 +12,7 @@ variables: namespace: testNamespace tag: "$(Build.BuildId)" vmImageName: "ubuntu-latest" + resourceType: Microsoft.ContainerService/managedClusters name: testPipeline @@ -46,6 +47,7 @@ stages: pool: vmImage: $(vmImageName) steps: + - task: KubeloginInstaller@0 - task: KubernetesManifest@1 displayName: Deploy to Kubernetes cluster inputs: @@ -56,5 +58,6 @@ stages: kubernetesCluster: $(clusterName) manifests: $(manifestPath) namespace: $(namespace) + resourceType: $(resourceType) containers: | $(azureContainerRegistry).azurecr.io/$(containerName):$(tag) diff --git a/pkg/fixtures/workflows/azurepipelines/kustomize/.pipelines/azure-kubernetes-service.yaml b/pkg/fixtures/workflows/azurepipelines/kustomize/.pipelines/azure-kubernetes-service.yaml index 0b78ed02b..0edfe4ff4 100644 --- a/pkg/fixtures/workflows/azurepipelines/kustomize/.pipelines/azure-kubernetes-service.yaml +++ b/pkg/fixtures/workflows/azurepipelines/kustomize/.pipelines/azure-kubernetes-service.yaml @@ -14,6 +14,7 @@ variables: dockerfile: ./Dockerfile tag: "$(Build.BuildId)" vmImageName: "ubuntu-latest" + resourceType: Microsoft.ContainerService/managedClusters trigger: - main @@ -66,5 +67,6 @@ stages: kubernetesCluster: $(clusterName) namespace: $(namespace) manifests: $(bake.manifestsBundle) + resourceType: $(resourceType) containers: | $(azureContainerRegistry).azurecr.io/$(containerName):$(tag) diff --git a/pkg/fixtures/workflows/azurepipelines/manifests/.pipelines/azure-kubernetes-service.yaml b/pkg/fixtures/workflows/azurepipelines/manifests/.pipelines/azure-kubernetes-service.yaml index df4b19b28..61c92cd7e 100644 --- a/pkg/fixtures/workflows/azurepipelines/manifests/.pipelines/azure-kubernetes-service.yaml +++ b/pkg/fixtures/workflows/azurepipelines/manifests/.pipelines/azure-kubernetes-service.yaml @@ -14,6 +14,7 @@ variables: dockerfile: ./Dockerfile tag: "$(Build.BuildId)" vmImageName: "ubuntu-latest" + resourceType: Microsoft.ContainerService/managedClusters name: Build and deploy an app to AKS @@ -48,6 +49,7 @@ stages: pool: vmImage: $(vmImageName) steps: + - task: KubeloginInstaller@0 - task: KubernetesManifest@1 displayName: Deploy to Kubernetes cluster inputs: @@ -58,5 +60,6 @@ stages: kubernetesCluster: $(clusterName) manifests: $(manifestPath) namespace: $(namespace) + resourceType: $(resourceType) containers: | $(azureContainerRegistry).azurecr.io/$(containerName):$(tag) diff --git a/pkg/handlers/templatetests/workflows_azure_kustomize_test.go b/pkg/handlers/templatetests/workflows_azure_kustomize_test.go index 897d42910..eb4a3c9e9 100644 --- a/pkg/handlers/templatetests/workflows_azure_kustomize_test.go +++ b/pkg/handlers/templatetests/workflows_azure_kustomize_test.go @@ -22,6 +22,7 @@ func TestAzureWorkflowKustomizeTemplates(t *testing.T) { "CLUSTERRESOURCEGROUP": "myrg", "ACRRESOURCEGROUP": "myrg", "CLUSTERNAME": "testcluster", + "CLUSTERRESOURCETYPE": "Microsoft.ContainerService/managedClusters", }, }, } diff --git a/pkg/handlers/templatetests/workflows_azure_manifest_test.go b/pkg/handlers/templatetests/workflows_azure_manifest_test.go index 988e30bc2..587671fd1 100644 --- a/pkg/handlers/templatetests/workflows_azure_manifest_test.go +++ b/pkg/handlers/templatetests/workflows_azure_manifest_test.go @@ -22,6 +22,7 @@ func TestAzureWorkflowManifestTemplates(t *testing.T) { "CLUSTERRESOURCEGROUP": "myrg", "ACRRESOURCEGROUP": "myrg", "CLUSTERNAME": "testcluster", + "CLUSTERRESOURCETYPE": "Microsoft.ContainerService/managedClusters", }, }, } diff --git a/template/azurePipelines/kustomize/.pipelines/azure-kubernetes-service.yaml b/template/azurePipelines/kustomize/.pipelines/azure-kubernetes-service.yaml index 725b59c85..8a6aefd18 100644 --- a/template/azurePipelines/kustomize/.pipelines/azure-kubernetes-service.yaml +++ b/template/azurePipelines/kustomize/.pipelines/azure-kubernetes-service.yaml @@ -14,6 +14,7 @@ variables: dockerfile: {{ .Config.GetVariableValue "DOCKERFILE" }} tag: "$(Build.BuildId)" vmImageName: "ubuntu-latest" + resourceType: {{ .Config.GetVariableValue "CLUSTERRESOURCETYPE" }} trigger: - {{ .Config.GetVariableValue "BRANCHNAME" }} @@ -66,6 +67,7 @@ stages: kubernetesCluster: $(clusterName) namespace: $(namespace) manifests: $(bake.manifestsBundle) + resourceType: $(resourceType) containers: | $(azureContainerRegistry).azurecr.io/$(containerName):$(tag) `}} \ No newline at end of file diff --git a/template/azurePipelines/kustomize/draft.yaml b/template/azurePipelines/kustomize/draft.yaml index 15128d5be..3062ba002 100644 --- a/template/azurePipelines/kustomize/draft.yaml +++ b/template/azurePipelines/kustomize/draft.yaml @@ -77,3 +77,10 @@ variables: value: "./Dockerfile" description: "the path to the Dockerfile" versions: ">=0.0.1" + - name: "CLUSTERRESOURCETYPE" + type: "string" + kind: "clusterResourceType" + default: + value: "Microsoft.ContainerService/managedClusters" + description: "the Azure resource type for the AKS cluster" + versions: ">=0.0.1" \ No newline at end of file diff --git a/template/azurePipelines/manifests/.pipelines/azure-kubernetes-service.yaml b/template/azurePipelines/manifests/.pipelines/azure-kubernetes-service.yaml index 20b5f0101..f135515fc 100644 --- a/template/azurePipelines/manifests/.pipelines/azure-kubernetes-service.yaml +++ b/template/azurePipelines/manifests/.pipelines/azure-kubernetes-service.yaml @@ -14,6 +14,7 @@ variables: dockerfile: {{ .Config.GetVariableValue "DOCKERFILE" }} tag: "$(Build.BuildId)" vmImageName: "ubuntu-latest" + resourceType: {{ .Config.GetVariableValue "CLUSTERRESOURCETYPE" }} name: {{ .Config.GetVariableValue "PIPELINENAME" }} @@ -48,6 +49,7 @@ stages: pool: vmImage: $(vmImageName) steps: + - task: KubeloginInstaller@0 - task: KubernetesManifest@1 displayName: Deploy to Kubernetes cluster inputs: @@ -58,6 +60,7 @@ stages: kubernetesCluster: $(clusterName) manifests: $(manifestPath) namespace: $(namespace) + resourceType: $(resourceType) containers: | $(azureContainerRegistry).azurecr.io/$(containerName):$(tag) `}} \ No newline at end of file diff --git a/template/azurePipelines/manifests/draft.yaml b/template/azurePipelines/manifests/draft.yaml index b66be1d1a..8459c1608 100644 --- a/template/azurePipelines/manifests/draft.yaml +++ b/template/azurePipelines/manifests/draft.yaml @@ -48,6 +48,13 @@ variables: kind: "azureManagedCluster" description: "the AKS cluster name" versions: ">=0.0.1" + - name: "CLUSTERRESOURCETYPE" + type: "string" + kind: "clusterResourceType" + default: + value: "Microsoft.ContainerService/managedClusters" + description: "the Azure resource type for the AKS cluster" + versions: ">=0.0.1" - name: "MANIFESTPATH" type: "string" kind: "dirPath"