diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ee6734..4540832 100644 --- a/.github/workflows/ci.yml +++ b/.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: pluto detect-files -d ./charts/msal-proxy + ###- run: helm template ./charts/msal-proxy --api-versions v1.13.0 | pluto detect - + - run: pluto detect-files -d ./charts/msal-proxy push_to_registries: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..b84c90f --- /dev/null +++ b/.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 diff --git a/.github/workflows/pluto.yml b/.github/workflows/pluto.yml index 83c14c4..475bcf5 100644 --- a/.github/workflows/pluto.yml +++ b/.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 ./ diff --git a/.github/workflows/unattended_deployment.yml b/.github/workflows/unattended_deployment.yml new file mode 100644 index 0000000..65538fa --- /dev/null +++ b/.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 + + diff --git a/charts/msal-proxy/templates/ingress.yaml b/charts/msal-proxy/templates/ingress.yaml index 84931db..f0e745b 100644 --- a/charts/msal-proxy/templates/ingress.yaml +++ b/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