public_git
/
oauth2-proxy
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from philips-forks/separatepr 

separating pr and main deployment
This commit is contained in:
aswin-in-philips 2022-11-03 12:05:49 +05:30 committed by GitHub
parent 340a2066ac 254bd0e59b
commit 49bb6232cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/api-gw-integrated-test.yaml vendored
View File

@ -2,6 +2,10 @@ name: API-GW-INTEGRATED-TEST
on:
workflow_call:
inputs:
OAUTH2_PROXY_IMAGE:
type: string
required: true
secrets:
VAULT_HOST:
required: true
@ -31,5 +35,6 @@ jobs:
owner: philips-internal
repo: hds-auth-gateway
github_token: ${{ env.GITHUB_TOKEN }}
client_payload: '{"oauth2proxytag": "${{ inputs.OAUTH2_PROXY_IMAGE }}"}'
workflow_file_name: cd.yaml
ref: master

44
.github/workflows/ci.yaml vendored
View File

@ -109,8 +109,8 @@ jobs:
needs: [Init]
runs-on: ubuntu-20.04
outputs:
envoyAlphaTag: ${{ steps.setVariables.outputs.alphaTag }}
ciImage: ${{ steps.setVariables.outputs.ciImage }}
oauth2proxyPRTag: ${{ steps.setVariables.outputs.alphaTag }}
oauth2proxyCITag: ${{ steps.setVariables.outputs.betaTag }}
steps:
- uses: actions/checkout@v2
@ -137,12 +137,14 @@ jobs:
run: |
new_version=`cat VERSION`
alpha_tag="${new_version}-alpha"
beta_tag="${new_version}-beta"
echo "New version is: $new_version"
echo "VERSION=$new_version" >> "$GITHUB_ENV"
echo "CI_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${alpha_tag}" >> "$GITHUB_ENV"
echo "::set-output name=ciImage::${{ env.CI_IMAGE }}"
echo "CI_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${beta_tag}" >> "$GITHUB_ENV"
echo "PR_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${alpha_tag}" >> "$GITHUB_ENV"
echo "CI_LATEST_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:latest" >> "$GITHUB_ENV"
echo "::set-output name=alphaTag::${alpha_tag}"
echo "alphaTag=${alpha_tag}" >> $GITHUB_OUTPUT
echo "betaTag=${beta_tag}" >> $GITHUB_OUTPUT
- name: Docker Build
run: |
@ -155,22 +157,44 @@ jobs:
- name: Docker tag
run: |
docker tag '${{ secrets.DOCKER_REPO }}'/oauth2-proxy:latest ${{ env.CI_IMAGE }}
docker tag ${{ env.CI_IMAGE }} ${{ env.PR_IMAGE }}
- name: PR Image Docker Push
if: github.event_name == 'pull_request'
run: |
docker push ${{ env.PR_IMAGE }}
- name: Docker Push
if: github.ref == 'refs/heads/edi-foundation-integration'
run: |
docker tag ${{ env.CI_IMAGE }} ${{ env.CI_LATEST_IMAGE }}
docker push ${{ env.CI_LATEST_IMAGE }}
docker push ${{ env.CI_IMAGE }}
Deploy_Test_HDS_AUTH_GATEWAY:
PR_Deploy_Test_HDS_AUTH_GATEWAY:
if: github.event_name == 'pull_request'
needs: [Build, Blackduck, Fortify, unit-test]
uses: ./.github/workflows/deploy-hds-auth-gateway.yaml
with:
OAUTH2_PROXY_IMAGE: ${{ needs.Build.outputs.envoyAlphaTag }}
OAUTH2_PROXY_IMAGE: ${{ needs.Build.outputs.envoyPRTag }}
secrets:
VAULT_HOST: ${{ secrets.VAULT_HOST }}
VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID }}
VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID }}
CI_Deploy_Test_HDS_AUTH_GATEWAY:
if: github.ref == 'refs/heads/edi-foundation-integration'
needs: [Build, Blackduck, Fortify, unit-test]
uses: ./.github/workflows/api-gw-integrated-test.yaml
with:
OAUTH2_PROXY_IMAGE: ${{ needs.Build.outputs.envoyCITag }}
secrets:
VAULT_HOST: ${{ secrets.VAULT_HOST }}
VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID }}
VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID }}
Promote_Version:
needs: [Deploy_Test_HDS_AUTH_GATEWAY]
needs: [CI_Deploy_Test_HDS_AUTH_GATEWAY]
if: github.ref == 'refs/heads/edi-foundation-integration'
runs-on: ubuntu-20.04
outputs:
@ -197,9 +221,9 @@ jobs:
run: |
new_version=`cat VERSION`
echo "New version is: $new_version"
echo "CI_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${new_version}-alpha" >> "$GITHUB_ENV"
echo "CI_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${new_version}-beta" >> "$GITHUB_ENV"
echo "RC_IMAGE=docker.na1.hsdp.io/edisp-releases/edi-foundation-oauth2-proxy:${new_version}-rc" >> "$GITHUB_ENV"
echo "::set-output name=versionTag::${new_version}-rc"
echo "versionTag=${new_version}-rc" >> $GITHUB_OUTPUT
echo "${new_version}-rc"
- name: Docker login