From 297211ff4af583666e561fc2782dd417db76c5bb Mon Sep 17 00:00:00 2001 From: Sneha Date: Thu, 10 Oct 2024 14:34:01 +0200 Subject: [PATCH] Fjernet fss workflows (#367) --- .../build-deploy-feature-branch-q1.yml | 56 ------- .github/workflows/main.yaml | 103 ------------- nais-dev.yaml | 144 ------------------ nais-prod.yaml | 135 ---------------- 4 files changed, 438 deletions(-) delete mode 100644 .github/workflows/build-deploy-feature-branch-q1.yml delete mode 100644 .github/workflows/main.yaml delete mode 100644 nais-dev.yaml delete mode 100644 nais-prod.yaml diff --git a/.github/workflows/build-deploy-feature-branch-q1.yml b/.github/workflows/build-deploy-feature-branch-q1.yml deleted file mode 100644 index a4f9fe23..00000000 --- a/.github/workflows/build-deploy-feature-branch-q1.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Deploy til Q1 -on: - workflow_dispatch: -env: - IMAGE_TAG: ${{ github.sha }} - IMAGE: ghcr.io/${{ github.repository }}/veilarbperson - PRINT_PAYLOAD: true -permissions: - packages: write - -jobs: - build-and-push: - name: Build and push - runs-on: ubuntu-latest - outputs: - image: ${{ steps.docker-build-push.outputs.image }} - permissions: - id-token: write - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Java - uses: actions/setup-java@v4 - with: - java-version: 21 - distribution: 'temurin' - cache: 'maven' - - - name: Build maven artifacts - run: mvn -B package -D skipTests - - - name: Build and push Docker image - uses: nais/docker-build-push@v0 - id: docker-build-push - with: - team: pto - identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} - - deploy-dev: - name: Deploy application to dev - needs: build-and-push - runs-on: ubuntu-latest - permissions: - id-token: write - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Deploy application - uses: nais/deploy/actions/deploy@v2 - env: - CLUSTER: dev-fss - RESOURCE: nais-dev.yaml - VAR: image=${{ needs.build-and-push.outputs.image }} diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml deleted file mode 100644 index ed194776..00000000 --- a/.github/workflows/main.yaml +++ /dev/null @@ -1,103 +0,0 @@ -name: Build, push and deploy -on: push -env: - IMAGE_TAG: ${{ github.sha }} - PRINT_PAYLOAD: true -permissions: - packages: write - contents: write - id-token: write - -jobs: - test: - name: Run tests - runs-on: ubuntu-latest - if: github.ref != 'refs/heads/main' - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Java - uses: actions/setup-java@v4 - with: - java-version: 21 - distribution: 'temurin' - cache: 'maven' - - - name: Run maven tests - env: - MAVEN_OPTS: -Xss1024M -Xmx2048M - run: mvn -B verify - - build-and-push: - name: Build and push - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' - outputs: - image: ${{ steps.docker-build-push.outputs.image }} - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Java - uses: actions/setup-java@v4 - with: - java-version: 21 - distribution: 'temurin' - cache: 'maven' - - - name: Build maven artifacts - run: mvn -B package -D skipTests - - - name: Build and push Docker image - uses: nais/docker-build-push@v0 - id: docker-build-push - with: - team: pto - identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} - - deploy-dev: - name: Deploy application to dev - if: github.ref == 'refs/heads/main' - needs: build-and-push - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Deploy application - uses: nais/deploy/actions/deploy@v2 - env: - CLUSTER: dev-fss - RESOURCE: nais-dev.yaml - VAR: image=${{ needs.build-and-push.outputs.image }} - - deploy-prod: - name: Deploy application to prod - if: github.ref == 'refs/heads/main' - needs: [deploy-dev, build-and-push] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Deploy application - uses: nais/deploy/actions/deploy@v2 - env: - CLUSTER: prod-fss - RESOURCE: nais-prod.yaml - VAR: image=${{ needs.build-and-push.outputs.image }} - - release-prod: - name: Create prod release - needs: deploy-prod - runs-on: ubuntu-latest - steps: - - name: Create release - uses: softprops/action-gh-release@v2 - with: - name: Release to prod - target_commitish: main - tag_name: release/prod@${{ env.IMAGE_TAG }} - prerelease: false diff --git a/nais-dev.yaml b/nais-dev.yaml deleted file mode 100644 index fbe6ec34..00000000 --- a/nais-dev.yaml +++ /dev/null @@ -1,144 +0,0 @@ -apiVersion: "nais.io/v1alpha1" -kind: "Application" -metadata: - name: veilarbperson - namespace: pto - labels: - team: pto -spec: - image: {{image}} - port: 8080 - webproxy: true - ingresses: - - https://veilarbperson.dev-fss-pub.nais.io - - https://veilarbperson.dev.intern.nav.no - - https://veilarbperson-q1.nais.preprod.local - - https://app-q1.dev.adeo.no/veilarbperson - - https://app.dev.adeo.no/veilarbperson - - https://app-q1.adeo.no/veilarbperson - - https://app.dev.intern.nav.no/veilarbperson - liveness: - path: veilarbperson/internal/isAlive - initialDelay: 30 - readiness: - path: veilarbperson/internal/isReady - initialDelay: 30 - prometheus: - enabled: true - path: veilarbperson/internal/prometheus - resources: - limits: - cpu: "2" - memory: 2048Mi - requests: - cpu: 200m - memory: 1024Mi - replicas: - min: 0 - max: 0 - cpuThresholdPercentage: 75 - vault: - enabled: true - paths: - - kvPath: /serviceuser/data/dev/srvveilarbperson - mountPath: /var/run/secrets/nais.io/service_user - - kvPath: /serviceuser/data/dev/srvveilarbpersonsbs-sbs - mountPath: /var/run/secrets/nais.io/service_user_sbs - - kvPath: /kv/preprod/fss/veilarbperson/q1 - mountPath: /var/run/secrets/nais.io/vault - secureLogs: - enabled: true - azure: - application: - enabled: true - allowAllUsers: true - claims: - extra: - - "NAVident" - accessPolicy: - outbound: - rules: - - application: veilarboppfolging - namespace: poao - inbound: - rules: - - application: veilarbdialog - namespace: pto - - application: veilarbaktivitet - namespace: pto - - application: paw-proxy - namespace: paw - - application: veilarbpersonflate - namespace: poao - cluster: dev-gcp - - application: veilarbvedtaksstotte - namespace: pto - - application: veilarboppgave - namespace: obo - cluster: dev-gcp - - application: mulighetsrommet-api - namespace: team-mulighetsrommet - cluster: dev-gcp - - application: arbeidssokerregistrering-for-veileder - namespace: paw - cluster: dev-gcp - - application: azure-token-generator - namespace: aura - cluster: dev-gcp - - env: - - name: KODEVERK_URL - value: https://kodeverk-api.nav.no - - name: KODEVERK_SCOPE - value: api://dev-gcp.team-rocket.kodeverk-api/.default - - name: KONTAKT_OG_RESERVASJONSREGISTERET_API_URL - value: https://digdir-krr-proxy.intern.dev.nav.no - - name: KONTAKT_OG_RESERVASJONSREGISTERET_SCOPE - value: api://dev-gcp.team-rocket.digdir-krr-proxy/.default - - name: PAM_CV_API_SCOPE - value: api://dev-gcp.teampam.pam-cv-api-gcp/.default - - name: PAM_CV_API_URL - value: https://pam-cv-api-gcp.intern.dev.nav.no/pam-cv-api - - name: PDL_API_SCOPE - value: api://dev-fss.pdl.pdl-api/.default - - name: REPR_API_SCOPE - value: api://dev-fss.pdl.pdl-fullmakt/.default - - name: REPR_API_URL - value: https://pdl-fullmakt.dev.intern.nav.no - - name: PDL_API_URL - value: http://pdl-api.pdl.svc.nais.local - - name: POAO_TILGANG_URL - value: http://poao-tilgang.poao.svc.nais.local - - name: POAO_TILGANG_SCOPE - value: api://dev-fss.poao.poao-tilgang/.default - - name: REGOPPSLAG_SCOPE - value: api://dev-fss.teamdokumenthandtering.regoppslag/.default - - name: REGOPPSLAG_URL - value: https://regoppslag.dev.intern.nav.no - - name: SKJERMEDE_PERSONER_PIP_SCOPE - value: api://dev-gcp.nom.skjermede-personer-pip/.default - - name: SKJERMEDE_PERSONER_PIP_URL - value: https://skjermede-personer-pip.intern.dev.nav.no - - name: VEILARBOPPFOLGING_SCOPE - value: api://dev-gcp.poao.veilarboppfolging/.default - - name: VEILARBOPPFOLGING_URL - value: http://veilarboppfolging.poao/veilarboppfolging - - name: VEILARBREGISTRERING_SCOPE - value: api://dev-gcp.paw.veilarbregistrering/.default - - name: VEILARBREGISTRERING_URL - value: https://veilarbregistrering.intern.dev.nav.no - - name: KONTOREGISTER_PERSON_V1_SCOPE - value: api://dev-gcp.okonomi.sokos-kontoregister-person/.default - - name: KONTOREGISTER_PERSON_V1_URL - value: https://sokos-kontoregister-person.intern.dev.nav.no - - name: AIA_BACKEND_URL - value: https://www.intern.dev.nav.no/aia-backend - - name: AIA_BACKEND_SCOPE - value: api://dev-gcp.paw.paw-arbeidssoker-besvarelse/.default - - name: OPPSLAG_ARBEIDSSOEKERREGISTERET_URL - value: https://oppslag-arbeidssoekerregisteret.intern.dev.nav.no - - name: OPPSLAG_ARBEIDSSOEKERREGISTERET_SCOPE - value: api://dev-gcp.paw.paw-arbeidssoekerregisteret-api-oppslag/.default - - envFrom: - - configmap: pto-config diff --git a/nais-prod.yaml b/nais-prod.yaml deleted file mode 100644 index 581e4629..00000000 --- a/nais-prod.yaml +++ /dev/null @@ -1,135 +0,0 @@ -apiVersion: "nais.io/v1alpha1" -kind: "Application" -metadata: - name: veilarbperson - namespace: pto - labels: - team: pto -spec: - image: {{image}} - port: 8080 - webproxy: true - ingresses: - - https://veilarbperson.prod-fss-pub.nais.io - - https://veilarbperson.intern.nav.no - - https://veilarbperson.nais.adeo.no - - https://app.adeo.no/veilarbperson - liveness: - path: veilarbperson/internal/isAlive - initialDelay: 30 - readiness: - path: veilarbperson/internal/isReady - initialDelay: 30 - prometheus: - enabled: true - path: veilarbperson/internal/prometheus - resources: - limits: - cpu: "2" - memory: 2048Mi - requests: - cpu: 200m - memory: 1024Mi - replicas: - min: 0 - max: 0 - cpuThresholdPercentage: 75 - vault: - enabled: true - paths: - - kvPath: /serviceuser/data/prod/srvveilarbperson - mountPath: /var/run/secrets/nais.io/service_user - - kvPath: /serviceuser/data/prod/srvveilarbpersonsbs-sbs - mountPath: /var/run/secrets/nais.io/service_user_sbs - - kvPath: /kv/prod/fss/veilarbperson/default - mountPath: /var/run/secrets/nais.io/vault - secureLogs: - enabled: true - azure: - application: - enabled: true - allowAllUsers: true - claims: - extra: - - "NAVident" - accessPolicy: - outbound: - rules: - - application: veilarboppfolging - namespace: poao - inbound: - rules: - - application: veilarbdialog - namespace: pto - - application: veilarbaktivitet - namespace: pto - - application: paw-proxy - namespace: paw - - application: veilarbpersonflate - namespace: poao - cluster: prod-gcp - - application: veilarbvedtaksstotte - namespace: pto - - application: veilarboppgave - namespace: pto - - application: veilarboppgave - namespace: obo - cluster: prod-gcp - - application: mulighetsrommet-api - namespace: team-mulighetsrommet - cluster: prod-gcp - - application: arbeidssokerregistrering-for-veileder - namespace: paw - cluster: prod-gcp - - env: - - name: KODEVERK_URL - value: https://kodeverk-api.nav.no - - name: KODEVERK_SCOPE - value: api://prod-gcp.team-rocket.kodeverk-api/.default - - name: KONTAKT_OG_RESERVASJONSREGISTERET_API_URL - value: https://digdir-krr-proxy.intern.nav.no - - name: KONTAKT_OG_RESERVASJONSREGISTERET_SCOPE - value: api://prod-gcp.team-rocket.digdir-krr-proxy/.default - - name: PAM_CV_API_SCOPE - value: api://prod-gcp.teampam.pam-cv-api-gcp/.default - - name: PAM_CV_API_URL - value: https://pam-cv-api-gcp.intern.nav.no/pam-cv-api - - name: PDL_API_SCOPE - value: api://prod-fss.pdl.pdl-api/.default - - name: PDL_API_URL - value: http://pdl-api.pdl.svc.nais.local - - name: POAO_TILGANG_URL - value: http://poao-tilgang.poao.svc.nais.local - - name: POAO_TILGANG_SCOPE - value: api://prod-fss.poao.poao-tilgang/.default - - name: REGOPPSLAG_SCOPE - value: api://prod-fss.teamdokumenthandtering.regoppslag/.default - - name: REGOPPSLAG_URL - value: https://regoppslag.intern.nav.no - - name: SKJERMEDE_PERSONER_PIP_SCOPE - value: api://prod-gcp.nom.skjermede-personer-pip/.default - - name: SKJERMEDE_PERSONER_PIP_URL - value: https://skjermede-personer-pip.intern.nav.no - - name: VEILARBOPPFOLGING_SCOPE - value: api://prod-gcp.poao.veilarboppfolging/.default - - name: VEILARBOPPFOLGING_URL - value: http://veilarboppfolging.poao/veilarboppfolging - - name: VEILARBREGISTRERING_SCOPE - value: api://prod-gcp.paw.veilarbregistrering/.default - - name: VEILARBREGISTRERING_URL - value: https://veilarbregistrering.intern.nav.no - - name: KONTOREGISTER_PERSON_V1_SCOPE - value: api://prod-gcp.okonomi.sokos-kontoregister-person/.default - - name: KONTOREGISTER_PERSON_V1_URL - value: https://sokos-kontoregister-person.intern.nav.no - - name: AIA_BACKEND_URL - value: https://www.nav.no/aia-backend - - name: AIA_BACKEND_SCOPE - value: api://prod-gcp.paw.paw-arbeidssoker-besvarelse/.default - - name: OPPSLAG_ARBEIDSSOEKERREGISTERET_URL - value: https://oppslag-arbeidssoekerregisteret.intern.nav.no - - name: OPPSLAG_ARBEIDSSOEKERREGISTERET_SCOPE - value: api://prod-gcp.paw.paw-arbeidssoekerregisteret-api-oppslag/.default - envFrom: - - configmap: pto-config