Merge branch 'dev' into shlok-official/43-automation-script

.github/workflows/ci.yml

@@ -38,8 +38,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: brew install FairwindsOps/tap/pluto
-      - run: helm template ./charts/msal-proxy | pluto detect -
+      ###- run: helm template ./charts/msal-proxy --api-versions v1.13.0 | pluto detect -
-      #- run: pluto detect-files -d ./charts/msal-proxy
+      - run: pluto detect-files -d ./charts/msal-proxy
       
   push_to_registries:
   

.github/workflows/main.yml

@@ -0,0 +1,33 @@
+name: Unattended Deploy v2
+
+env:
+  iteration: ${{github.run_number}}
+  
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  run_main-sh:
+
+    runs-on: ubuntu-latest
+    name: Run main.sh script
+
+    steps:
+    # nothing
+    - name: 'Login via Azure CLI'
+      uses: azure/login@v1
+      with:
+        creds: ${{ secrets.KGATES_AZURE_SP }}
+          
+    - uses: actions/checkout@v2
+    - name: Call the script
+      run: bash ./main.sh -a msal-test-kgates$iteration -c easyauth-kgates$iteration -r easy-auth$iteration -e kgates@microsoft.com -d microsoft.com -l eastus

.github/workflows/pluto.yml

@@ -3,8 +3,12 @@
 name: Check deprecated APIs
 
 on:
-  push:
   workflow_dispatch:
+    inputs:
+      targetEnv:
+        description: 'Target environment: dev, test, prod'     
+        required: false
+        default: 'dev' 
 
 jobs:
   mac:
@@ -12,6 +16,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: brew install FairwindsOps/tap/pluto
-      - run: helm template ./charts/msal-proxy | pluto detect -
+      - run: helm template ./charts/msal-proxy --api-versions v1.16.0 | pluto detect -
       
       #pluto detect-files -d ./

.github/workflows/unattended_deployment.yml

@@ -0,0 +1,33 @@
+name: Unattended Deployment
+
+env:
+  iteration: ${{github.run_number}}
+  
+# Controls when the workflow will run
+on:
+  push:
+    branches:
+    - master
+    - dev
+  
+  workflow_dispatch: 
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  run_main-sh:
+
+    runs-on: ubuntu-latest
+    name: Run main.sh script
+
+    steps:
+    # nothing
+    - name: 'Login via Azure CLI'
+      uses: azure/login@v1
+      with:
+        creds: ${{ secrets.KGATES_AZURE_SP }}
+          
+    - uses: actions/checkout@v2
+    - name: Call the script
+      run: bash ./main.sh -a msal-test-kgates$iteration -c easyauth-kgates$iteration -r easy-auth$iteration -e kgates@microsoft.com -d microsoft.com -l eastus
+      
+    

charts/msal-proxy/templates/ingress.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "msal-proxy.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.14-0" Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1