Add auth type for azure login in github workflow

pkg/config/draftconfig_template_test.go

@@ -66,6 +66,7 @@ var validVariableKinds = map[string]bool{
 	"scalingResourceType":        true,
 	"scalingResourceUtilization": true,
 	"resourceLimit":              true,
+	"workflowAuthType":           true,
 }
 
 /*

pkg/fixtures/workflows/github/helm/.github/workflows/azure-kubernetes-service-helm.yml

@@ -55,6 +55,7 @@ env:
   CHART_OVERRIDES: replicas:2
   NAMESPACE: default
   ENABLENAMESPACECREATION: false
+  AUTH_TYPE: SERVICE_PRINCIPAL
 
 jobs:
   buildImage:
@@ -68,11 +69,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Builds and pushes an image up to your Azure Container Registry
       - name: Build and push image to ACR
@@ -91,11 +93,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Use kubelogin to configure your kubeconfig for Azure auth
       - name: Set up kubelogin for non-interactive login

pkg/fixtures/workflows/github/kustomize/.github/workflows/azure-kubernetes-service-kustomize.yml

@@ -54,6 +54,7 @@ env:
   BUILD_CONTEXT_PATH: test
   NAMESPACE: default
   ENABLENAMESPACECREATION: false
+  AUTH_TYPE: SERVICE_PRINCIPAL
 
 jobs:
   buildImage:
@@ -67,11 +68,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Builds and pushes an image up to your Azure Container Registry
       - name: Build and push image to ACR
@@ -90,11 +92,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Use kubelogin to configure your kubeconfig for Azure auth
       - name: Set up kubelogin for non-interactive login

pkg/fixtures/workflows/github/manifests/.github/workflows/azure-kubernetes-service.yml

@@ -48,6 +48,7 @@ env:
   DOCKER_FILE: ./Dockerfile
   BUILD_CONTEXT_PATH: test
   NAMESPACE: default
+  AUTH_TYPE: SERVICE_PRINCIPAL
 
 jobs:
   buildImage:
@@ -61,11 +62,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Builds and pushes an image up to your Azure Container Registry
       - name: Build and push image to ACR
@@ -84,11 +86,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Use kubelogin to configure your kubeconfig for Azure auth
       - name: Set up kubelogin for non-interactive login

template/workflows/helm/.github/workflows/azure-kubernetes-service-helm.yml

@@ -55,6 +55,7 @@ env:
   CHART_OVERRIDES: {{ .Config.GetVariableValue "CHARTOVERRIDES" }}
   NAMESPACE: {{ .Config.GetVariableValue "NAMESPACE" }}
   ENABLENAMESPACECREATION: {{ .Config.GetVariableValue "ENABLENAMESPACECREATION" }}
+  AUTH_TYPE: {{ .Config.GetVariableValue "AZURELOGINAUTHTYPE" }}
 {{`
 jobs:
   buildImage:
@@ -68,11 +69,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Builds and pushes an image up to your Azure Container Registry
       - name: Build and push image to ACR
@@ -91,11 +93,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Use kubelogin to configure your kubeconfig for Azure auth
       - name: Set up kubelogin for non-interactive login

template/workflows/helm/draft.yaml

@@ -102,3 +102,14 @@ variables:
       value: "Microsoft.ContainerService/managedClusters"
     description: "ARM resource type for cluster"
     versions: ">=0.0.1"
+  - name: "AZURELOGINAUTHTYPE"
+    type: "string"
+    kind: "workflowAuthType"
+    default:
+      disablePrompt: true
+      value: "SERVICE_PRINCIPAL"
+    allowedValues:
+      - "SERVICE_PRINCIPAL"
+      - "IDENTITY"
+    description: "the authentication type to use for the azure/login github workflow"
+    versions: ">=0.0.1"

template/workflows/kustomize/.github/workflows/azure-kubernetes-service-kustomize.yml

@@ -54,6 +54,7 @@ env:
   BUILD_CONTEXT_PATH: {{ .Config.GetVariableValue "BUILDCONTEXTPATH" }}
   NAMESPACE: {{ .Config.GetVariableValue "NAMESPACE" }}
   ENABLENAMESPACECREATION: {{ .Config.GetVariableValue "ENABLENAMESPACECREATION" }}
+  AUTH_TYPE: {{ .Config.GetVariableValue "AZURELOGINAUTHTYPE" }}
 {{`
 jobs:
   buildImage:
@@ -67,11 +68,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Builds and pushes an image up to your Azure Container Registry
       - name: Build and push image to ACR
@@ -90,11 +92,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Use kubelogin to configure your kubeconfig for Azure auth
       - name: Set up kubelogin for non-interactive login

template/workflows/kustomize/draft.yaml

@@ -86,3 +86,14 @@ variables:
       value: "Microsoft.ContainerService/managedClusters"
     description: "ARM resource type for cluster"
     versions: ">=0.0.1"
+  - name: "AZURELOGINAUTHTYPE"
+    type: "string"
+    kind: "workflowAuthType"
+    default:
+      disablePrompt: true
+      value: "SERVICE_PRINCIPAL"
+    allowedValues:
+      - "SERVICE_PRINCIPAL"
+      - "IDENTITY"
+    description: "the authentication type to use for the azure/login github workflow"
+    versions: ">=0.0.1"

template/workflows/manifests/.github/workflows/azure-kubernetes-service.yml

@@ -49,6 +49,7 @@ env:
   BUILD_CONTEXT_PATH: {{ .Config.GetVariableValue "BUILDCONTEXTPATH" }}
   NAMESPACE: {{ .Config.GetVariableValue "NAMESPACE" }}
   ENABLENAMESPACECREATION: {{ .Config.GetVariableValue "ENABLENAMESPACECREATION" }}
+  AUTH_TYPE: {{ .Config.GetVariableValue "AZURELOGINAUTHTYPE" }}
 {{`
 jobs:
   buildImage:
@@ -62,11 +63,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Builds and pushes an image up to your Azure Container Registry
       - name: Build and push image to ACR
@@ -85,11 +87,12 @@ jobs:
 
       # Logs in with your Azure credentials
       - name: Azure login
-        uses: azure/login@v1.4.6
+        uses: azure/login@v2.2.0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+          auth-type: ${{ env.AUTH_TYPE }}
 
       # Use kubelogin to configure your kubeconfig for Azure auth
       - name: Set up kubelogin for non-interactive login

template/workflows/manifests/draft.yaml

@@ -86,3 +86,14 @@ variables:
       value: "Microsoft.ContainerService/managedClusters"
     description: "ARM resource type for cluster"
     versions: ">=0.0.1"
+  - name: "AZURELOGINAUTHTYPE"
+    type: "string"
+    kind: "workflowAuthType"
+    default:
+      disablePrompt: true
+      value: "SERVICE_PRINCIPAL"
+    allowedValues:
+      - "SERVICE_PRINCIPAL"
+      - "IDENTITY"
+    description: "the authentication type to use for the azure/login github workflow"
+    versions: ">=0.0.1"