diff --git a/.github/workflows/mr-veileder-flate-container.yaml b/.github/workflows/mr-veileder-flate-container.yaml index a3ca1baf3b..c269b08974 100644 --- a/.github/workflows/mr-veileder-flate-container.yaml +++ b/.github/workflows/mr-veileder-flate-container.yaml @@ -46,34 +46,6 @@ jobs: CLUSTER: dev-gcp RESOURCE: frontend/mulighetsrommet-veileder-flate/.nais/nais-demo.yaml - deploy-modia-dev: - runs-on: ubuntu-latest - needs: [ci] - if: github.event_name == 'push' && github.ref_name == 'main' || github.event_name == 'workflow_dispatch' - permissions: - id-token: write # Needed for `nais/deploy/actions/deploy` - steps: - - uses: actions/checkout@v4 - - name: Deploy (dev) - uses: nais/deploy/actions/deploy@v2 - env: - CLUSTER: dev-gcp - RESOURCE: frontend/mulighetsrommet-veileder-flate/.nais/nais-dev.yaml - - deploy-modia-prod: - runs-on: ubuntu-latest - needs: [deploy-modia-dev] - if: github.event_name == 'push' && github.ref_name == 'main' || github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'dev_and_prod' - permissions: - id-token: write # Needed for `nais/deploy/actions/deploy` - steps: - - uses: actions/checkout@v4 - - name: Deploy (prod) - uses: nais/deploy/actions/deploy@v2 - env: - CLUSTER: prod-gcp - RESOURCE: frontend/mulighetsrommet-veileder-flate/.nais/nais-prod.yaml - deploy-nav-dev: runs-on: ubuntu-latest needs: [ci] diff --git a/frontend/mulighetsrommet-veileder-flate/.nais/nais-dev.yaml b/frontend/mulighetsrommet-veileder-flate/.nais/nais-dev.yaml deleted file mode 100644 index 851ca0446a..0000000000 --- a/frontend/mulighetsrommet-veileder-flate/.nais/nais-dev.yaml +++ /dev/null @@ -1,82 +0,0 @@ -apiVersion: nais.io/v1alpha1 -kind: Application -metadata: - name: mulighetsrommet-veileder-flate - namespace: team-mulighetsrommet - labels: - team: team-mulighetsrommet -spec: - image: europe-north1-docker.pkg.dev/nais-management-233d/poao/poao-frontend:2024.01.12_07.12-9746fba905ca - port: 8080 - ingresses: - - https://mulighetsrommet-veileder-flate.intern.dev.nav.no - liveness: - path: /internal/alive - initialDelay: 10 - readiness: - path: /internal/ready - initialDelay: 10 - replicas: - min: 1 - max: 1 - scalingStrategy: - cpu: - thresholdPercentage: 75 - resources: - limits: - memory: 512Mi - requests: - cpu: 250m - memory: 256Mi - azure: - application: - enabled: true - allowAllUsers: true - sidecar: - enabled: true - autoLogin: true - autoLoginIgnorePaths: - - /assets/* - - /asset-manifest.json - gcp: - buckets: - - name: mulighetsrommet-veilederflate-dev - cascadingDelete: false - accessPolicy: - outbound: - rules: - - application: mulighetsrommet-api - env: - - name: JSON_CONFIG - value: > - { - "gcs": { - "bucketName": "mulighetsrommet-veilederflate-dev" - }, - "auth": { - "loginProvider": "AZURE_AD" - }, - "cors": { - "origin": ["https://veilarbpersonflate.intern.dev.nav.no"] - }, - "header": { - "csp": { - "imgSrc": ["'self'", "*.nav.no", "cdn.sanity.io"] - }, - "corp": { - "policy": "cross-origin" - } - }, - "proxies": [ - { - "fromPath": "/mulighetsrommet-api", - "toUrl": "http://mulighetsrommet-api", - "preserveFromPath": false, - "toApp": { - "name": "mulighetsrommet-api", - "namespace": "team-mulighetsrommet", - "cluster": "dev-gcp" - } - } - ] - } diff --git a/frontend/mulighetsrommet-veileder-flate/.nais/nais-prod.yaml b/frontend/mulighetsrommet-veileder-flate/.nais/nais-prod.yaml deleted file mode 100644 index ea77b1822f..0000000000 --- a/frontend/mulighetsrommet-veileder-flate/.nais/nais-prod.yaml +++ /dev/null @@ -1,82 +0,0 @@ -apiVersion: nais.io/v1alpha1 -kind: Application -metadata: - name: mulighetsrommet-veileder-flate - namespace: team-mulighetsrommet - labels: - team: team-mulighetsrommet -spec: - image: europe-north1-docker.pkg.dev/nais-management-233d/poao/poao-frontend:2024.01.12_07.12-9746fba905ca - port: 8080 - ingresses: - - https://mulighetsrommet-veileder-flate.intern.nav.no - liveness: - path: /internal/alive - initialDelay: 10 - readiness: - path: /internal/ready - initialDelay: 10 - replicas: - min: 2 - max: 3 - scalingStrategy: - cpu: - thresholdPercentage: 75 - resources: - limits: - memory: 512Mi - requests: - cpu: 250m - memory: 256Mi - azure: - application: - enabled: true - allowAllUsers: true - sidecar: - enabled: true - autoLogin: true - autoLoginIgnorePaths: - - /assets/* - - /asset-manifest.json - gcp: - buckets: - - name: mulighetsrommet-veilederflate-prod - cascadingDelete: false - accessPolicy: - outbound: - rules: - - application: mulighetsrommet-api - env: - - name: JSON_CONFIG - value: > - { - "gcs": { - "bucketName": "mulighetsrommet-veilederflate-prod" - }, - "auth": { - "loginProvider": "AZURE_AD" - }, - "cors": { - "origin": "https://veilarbpersonflate.intern.nav.no" - }, - "header": { - "csp": { - "imgSrc": ["'self'", "*.nav.no", "cdn.sanity.io"] - }, - "corp": { - "policy": "cross-origin" - } - }, - "proxies": [ - { - "fromPath": "/mulighetsrommet-api", - "toUrl": "http://mulighetsrommet-api", - "preserveFromPath": false, - "toApp": { - "name": "mulighetsrommet-api", - "namespace": "team-mulighetsrommet", - "cluster": "prod-gcp" - } - } - ] - }