Merge branch 'main' into dependabot/github_actions/dot-github/workflows/actions/download-artifact-5.0.0

Author: davidgamero

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/yannh/kubeconform v0.6.7
 	go.uber.org/mock v0.5.0
-	golang.org/x/mod v0.20.0
+	golang.org/x/mod v0.26.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.14.4

go.sum

@@ -502,8 +502,8 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
-golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
+golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -577,8 +577,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
-golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
+golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
+golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

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)

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)

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)

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)

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",
 			},
 		},
 	}

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",
 			},
 		},
 	}

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)
 `}}

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"