Skip to content

Commit 84c0329

Browse files
authored
[fleet] enabling azure pipelines to deploy to fleet hub (#606)
1 parent b83768d commit 84c0329

File tree

10 files changed

+31
-0
lines changed

10 files changed

+31
-0
lines changed

pkg/fixtures/pipelines/kustomize.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ variables:
1212
namespace: testNamespace
1313
tag: "$(Build.BuildId)"
1414
vmImageName: "ubuntu-latest"
15+
resourceType: Microsoft.ContainerService/managedClusters
1516

1617
trigger:
1718
- main
@@ -64,5 +65,6 @@ stages:
6465
kubernetesCluster: $(clusterName)
6566
namespace: $(namespace)
6667
manifests: $(bake.manifestsBundle)
68+
resourceType: $(resourceType)
6769
containers: |
6870
$(azureContainerRegistry).azurecr.io/$(containerName):$(tag)

pkg/fixtures/pipelines/manifests.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ variables:
1212
namespace: testNamespace
1313
tag: "$(Build.BuildId)"
1414
vmImageName: "ubuntu-latest"
15+
resourceType: Microsoft.ContainerService/managedClusters
1516

1617
name: testPipeline
1718

@@ -46,6 +47,7 @@ stages:
4647
pool:
4748
vmImage: $(vmImageName)
4849
steps:
50+
- task: KubeloginInstaller@0
4951
- task: KubernetesManifest@1
5052
displayName: Deploy to Kubernetes cluster
5153
inputs:
@@ -56,5 +58,6 @@ stages:
5658
kubernetesCluster: $(clusterName)
5759
manifests: $(manifestPath)
5860
namespace: $(namespace)
61+
resourceType: $(resourceType)
5962
containers: |
6063
$(azureContainerRegistry).azurecr.io/$(containerName):$(tag)

pkg/fixtures/workflows/azurepipelines/kustomize/.pipelines/azure-kubernetes-service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ variables:
1414
dockerfile: ./Dockerfile
1515
tag: "$(Build.BuildId)"
1616
vmImageName: "ubuntu-latest"
17+
resourceType: Microsoft.ContainerService/managedClusters
1718

1819
trigger:
1920
- main
@@ -66,5 +67,6 @@ stages:
6667
kubernetesCluster: $(clusterName)
6768
namespace: $(namespace)
6869
manifests: $(bake.manifestsBundle)
70+
resourceType: $(resourceType)
6971
containers: |
7072
$(azureContainerRegistry).azurecr.io/$(containerName):$(tag)

pkg/fixtures/workflows/azurepipelines/manifests/.pipelines/azure-kubernetes-service.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ variables:
1414
dockerfile: ./Dockerfile
1515
tag: "$(Build.BuildId)"
1616
vmImageName: "ubuntu-latest"
17+
resourceType: Microsoft.ContainerService/managedClusters
1718

1819
name: Build and deploy an app to AKS
1920

@@ -48,6 +49,7 @@ stages:
4849
pool:
4950
vmImage: $(vmImageName)
5051
steps:
52+
- task: KubeloginInstaller@0
5153
- task: KubernetesManifest@1
5254
displayName: Deploy to Kubernetes cluster
5355
inputs:
@@ -58,5 +60,6 @@ stages:
5860
kubernetesCluster: $(clusterName)
5961
manifests: $(manifestPath)
6062
namespace: $(namespace)
63+
resourceType: $(resourceType)
6164
containers: |
6265
$(azureContainerRegistry).azurecr.io/$(containerName):$(tag)

pkg/handlers/templatetests/workflows_azure_kustomize_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ func TestAzureWorkflowKustomizeTemplates(t *testing.T) {
2222
"CLUSTERRESOURCEGROUP": "myrg",
2323
"ACRRESOURCEGROUP": "myrg",
2424
"CLUSTERNAME": "testcluster",
25+
"CLUSTERRESOURCETYPE": "Microsoft.ContainerService/managedClusters",
2526
},
2627
},
2728
}

pkg/handlers/templatetests/workflows_azure_manifest_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ func TestAzureWorkflowManifestTemplates(t *testing.T) {
2222
"CLUSTERRESOURCEGROUP": "myrg",
2323
"ACRRESOURCEGROUP": "myrg",
2424
"CLUSTERNAME": "testcluster",
25+
"CLUSTERRESOURCETYPE": "Microsoft.ContainerService/managedClusters",
2526
},
2627
},
2728
}

template/azurePipelines/kustomize/.pipelines/azure-kubernetes-service.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ variables:
1414
dockerfile: {{ .Config.GetVariableValue "DOCKERFILE" }}
1515
tag: "$(Build.BuildId)"
1616
vmImageName: "ubuntu-latest"
17+
resourceType: {{ .Config.GetVariableValue "CLUSTERRESOURCETYPE" }}
1718

1819
trigger:
1920
- {{ .Config.GetVariableValue "BRANCHNAME" }}
@@ -66,6 +67,7 @@ stages:
6667
kubernetesCluster: $(clusterName)
6768
namespace: $(namespace)
6869
manifests: $(bake.manifestsBundle)
70+
resourceType: $(resourceType)
6971
containers: |
7072
$(azureContainerRegistry).azurecr.io/$(containerName):$(tag)
7173
`}}

template/azurePipelines/kustomize/draft.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,10 @@ variables:
7777
value: "./Dockerfile"
7878
description: "the path to the Dockerfile"
7979
versions: ">=0.0.1"
80+
- name: "CLUSTERRESOURCETYPE"
81+
type: "string"
82+
kind: "clusterResourceType"
83+
default:
84+
value: "Microsoft.ContainerService/managedClusters"
85+
description: "the Azure resource type for the AKS cluster"
86+
versions: ">=0.0.1"

template/azurePipelines/manifests/.pipelines/azure-kubernetes-service.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ variables:
1414
dockerfile: {{ .Config.GetVariableValue "DOCKERFILE" }}
1515
tag: "$(Build.BuildId)"
1616
vmImageName: "ubuntu-latest"
17+
resourceType: {{ .Config.GetVariableValue "CLUSTERRESOURCETYPE" }}
1718

1819
name: {{ .Config.GetVariableValue "PIPELINENAME" }}
1920

@@ -48,6 +49,7 @@ stages:
4849
pool:
4950
vmImage: $(vmImageName)
5051
steps:
52+
- task: KubeloginInstaller@0
5153
- task: KubernetesManifest@1
5254
displayName: Deploy to Kubernetes cluster
5355
inputs:
@@ -58,6 +60,7 @@ stages:
5860
kubernetesCluster: $(clusterName)
5961
manifests: $(manifestPath)
6062
namespace: $(namespace)
63+
resourceType: $(resourceType)
6164
containers: |
6265
$(azureContainerRegistry).azurecr.io/$(containerName):$(tag)
6366
`}}

template/azurePipelines/manifests/draft.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ variables:
4848
kind: "azureManagedCluster"
4949
description: "the AKS cluster name"
5050
versions: ">=0.0.1"
51+
- name: "CLUSTERRESOURCETYPE"
52+
type: "string"
53+
kind: "clusterResourceType"
54+
default:
55+
value: "Microsoft.ContainerService/managedClusters"
56+
description: "the Azure resource type for the AKS cluster"
57+
versions: ">=0.0.1"
5158
- name: "MANIFESTPATH"
5259
type: "string"
5360
kind: "dirPath"

0 commit comments

Comments
 (0)