diff --git a/.github/actions/chart_releaser/cr.yaml b/.github/actions/chart_releaser/cr.yaml index dc5f6966..6948bb52 100644 --- a/.github/actions/chart_releaser/cr.yaml +++ b/.github/actions/chart_releaser/cr.yaml @@ -1,4 +1,4 @@ -owner: bcgov -git-repo: vc-authn-oidc +owner: openwallet-foundation +git-repo: acapy-vc-authn-oidc git-base-url: https://api.github.com/ git-upload-url: https://uploads.github.com/ diff --git a/.github/workflows/chart_release.yaml b/.github/workflows/chart_release.yaml index 30aec428..5a1afb9d 100644 --- a/.github/workflows/chart_release.yaml +++ b/.github/workflows/chart_release.yaml @@ -27,77 +27,3 @@ jobs: config: .github/actions/chart_releaser/cr.yaml env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - - update-configs-and-sync: - runs-on: ubuntu-latest - name: Update Configs and Sync - needs: - - chart-release - steps: - - uses: actions/checkout@v4 - - - name: Set up Git - run: | - git config --global user.name "github-actions[bot]" - git config --global user.email "github-actions[bot]@users.noreply.github.com" - - - name: Checkout services directory from the trust-over-ip-configurations repo - uses: actions/checkout@v4 - with: - repository: bcgov/trust-over-ip-configurations - ssh-key: ${{ secrets.DITP_CONFIGS_REPO_SECRET }} - sparse-checkout: | - services - path: trust-over-ip-configurations - - - name: Lookup latest chart - id: chart_version - run: | - helm repo add vc-authn-oidc https://bcgov.github.io/vc-authn-oidc - helm repo update - echo "APP_VERSION=$(helm search repo vc-authn-oidc -ojson | jq '.[0].app_version')" >> $GITHUB_OUTPUT - echo "CHART_VERSION=$(helm search repo vc-authn-oidc -ojson | jq '.[0].version')" >> $GITHUB_OUTPUT - - - name: Update test - env: - APP_VERSION: ${{ steps.chart_version.outputs.APP_VERSION }} - CHART_VERSION: ${{ steps.chart_version.outputs.CHART_VERSION }} - run: | - cd trust-over-ip-configurations - yq e -i '.appVersion = env(APP_VERSION)' services/vc-authn-oidc/charts/test/Chart.yaml - yq e -i '.version = env(CHART_VERSION)' services/vc-authn-oidc/charts/test/Chart.yaml - yq e -i '.dependencies[0].version = env(CHART_VERSION)' services/vc-authn-oidc/charts/test/Chart.yaml - - - name: Update prod - env: - APP_VERSION: ${{ steps.chart_version.outputs.APP_VERSION }} - CHART_VERSION: ${{ steps.chart_version.outputs.CHART_VERSION }} - run: | - cd trust-over-ip-configurations - yq e -i '.appVersion = env(APP_VERSION)' services/vc-authn-oidc/charts/prod/Chart.yaml - yq e -i '.version = env(CHART_VERSION)' services/vc-authn-oidc/charts/prod/Chart.yaml - yq e -i '.dependencies[0].version = env(CHART_VERSION)' services/vc-authn-oidc/charts/prod/Chart.yaml - - - name: Commit and Push to trust-over-ip-configurations Repo - run: | - cd trust-over-ip-configurations - git add services/vc-authn-oidc/charts/test/Chart.yaml services/vc-authn-oidc/charts/prod/Chart.yaml - git commit -m "Update chart and app versions" || echo "No changes to commit" - git push origin main - - - name: Trigger and wait for GitOps sync workflow - uses: convictional/trigger-workflow-and-wait@v1.6.5 - id: workflow-trigger - with: - owner: bcgov - repo: trust-over-ip-configurations - github_token: ${{ secrets.DITP_CONFIGS_REPO_TOKEN }} - workflow_file_name: gitops_sync.yaml - - - name: Trigger ArgoCD Sync of e79518-test-vc-authn-oidc - uses: OpsVerseIO/argocd-sync@0.2.0 - with: - address: gitops-shared.apps.silver.devops.gov.bc.ca - token: ${{ secrets.DITP_GITOPS_ARGO_SECRET}} - action: sync - appName: "e79518-test-vc-authn-oidc" diff --git a/.github/workflows/on_push_main.yaml b/.github/workflows/on_push_main.yaml index 793feea4..eb765f0e 100644 --- a/.github/workflows/on_push_main.yaml +++ b/.github/workflows/on_push_main.yaml @@ -6,7 +6,7 @@ on: - main jobs: build: - name: "Build VC-AuthN" + name: "Build ACAPy VC-AuthN" if: github.repository_owner == 'bcgov' uses: ./.github/workflows/publish.yml with: @@ -14,46 +14,3 @@ jobs: ref: "main" platforms: "linux/amd64" - # Build vc-authn - deploy_dev: - name: Deploy VC-AuthN to Dev - environment: dev - runs-on: ubuntu-latest - needs: - - build - if: ${{ contains(needs.*.result, 'success') && !(contains(needs.*.result, 'failure')) && (github.repository_owner == 'bcgov') }} - - steps: - - uses: actions/checkout@v4 - - - name: Checkout services directory from the trust-over-ip-configurations repo - uses: actions/checkout@v4 - with: - repository: bcgov/trust-over-ip-configurations - ssh-key: ${{ secrets.DITP_CONFIGS_REPO_SECRET }} - sparse-checkout: | - services - path: trust-over-ip-configurations - - - name: Install OpenShift CLI tools - uses: redhat-actions/openshift-tools-installer@v1 - with: - oc: "4.14" - - - name: Authenticate and set context - uses: redhat-actions/oc-login@v1 - with: - openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }} - openshift_token: ${{ secrets.OPENSHIFT_TOKEN }} - namespace: ${{ secrets.OPENSHIFT_NAMESPACE }} - - - name: Deploy VC-Authn-OIDC to Development - run: | - cp trust-over-ip-configurations/services/vc-authn-oidc/charts/dev/values.yaml ./dev-values.yaml - yq e -i 'del(.vc-authn-oidc) | . *= load("trust-over-ip-configurations/services/vc-authn-oidc/charts/dev/values.yaml").vc-authn-oidc' ./dev-values.yaml - helm upgrade --install vc-authn-oidc -f ./dev-values.yaml --set image.tag=${{ needs.build.outputs.image_version }} ./charts/vc-authn-oidc --wait - - - name: Restart Deployments - run: | - oc rollout restart deployment/vc-authn-oidc-agent - oc rollout restart deployment/vc-authn-oidc diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5534c937..b6aa35b7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,5 +1,5 @@ -name: Publish VC-AuthN Image -run-name: Publish VC-AuthN ${{ inputs.tag || github.event.release.tag_name }} Image +name: Publish ACAPy VC-AuthN Image +run-name: Publish ACAPy VC-AuthN ${{ inputs.tag || github.event.release.tag_name }} Image on: release: types: [published] @@ -47,11 +47,11 @@ env: jobs: publish_image: - if: github.repository_owner == 'bcgov' + if: github.repository_owner == 'openwallet-foundation' strategy: fail-fast: false - name: Publish VC-AuthN Image + name: Publish ACAPy VC-AuthN Image runs-on: ubuntu-latest outputs: image_tag: ${{ steps.values.outputs.image_tag }} @@ -90,7 +90,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ghcr.io/${{ steps.info.outputs.repo-owner }}/vc-authn-oidc + ghcr.io/${{ steps.info.outputs.repo-owner }}/acapy-vc-authn-oidc tags: | type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}}