Skip to content

Commit

Permalink
Justerte vars
Browse files Browse the repository at this point in the history
  • Loading branch information
eilifjohansen committed Feb 25, 2024
1 parent d36bc51 commit 084f950
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 74 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/deploy_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ on:

env:
IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }}
CLUSTER: prod-gcp
RESOURCE: ./nais/deploy.yaml

jobs:
build:
Expand Down Expand Up @@ -44,7 +42,7 @@ jobs:
uses: actions/checkout@v4
- name: Generate nais variables
run: |
cat > .nais/dev-gcp.yaml <<EOF
cat > .nais/vars.yaml <<EOF
ingresses: - 'https://reops-proxy.intern.nav.no'
SITEIMPROVE: ${{ secrets.SITEIMPROVE }}
AMPLITUDE_100000009: ${{ secrets.AMPLITUDE_100000009 }}
Expand All @@ -62,9 +60,9 @@ jobs:
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-gcp
RESOURCE: .nais/deploy.yaml
RESOURCE: .nais/dev-gcp.yaml
VAR: image=${{ env.IMAGE }}
VARS: .nais/dev-gcp.yaml
VARS: .nais/vars.yaml

deploy-prod:
name: Deploy to prod-gcp
Expand All @@ -76,7 +74,7 @@ jobs:
uses: actions/checkout@v4
- name: Generate nais variables
run: |
cat > .nais/prod-gcp.yaml <<EOF
cat > .nais/vars.yaml <<EOF
SITEIMPROVE: ${{ secrets.SITEIMPROVE }}
AMPLITUDE_100000009: ${{ secrets.AMPLITUDE_100000009 }}
AMPLITUDE_100000264: ${{ secrets.AMPLITUDE_100000264 }}
Expand All @@ -93,6 +91,6 @@ jobs:
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: prod-gcp
RESOURCE: .nais/deploy.yaml
RESOURCE: .nais/prod-gcp.yaml
VAR: image=${{ env.IMAGE }}
VARS: .nais/prod-gcp.yaml
VARS: .nais/vars.yaml
62 changes: 0 additions & 62 deletions .nais/deploy.yaml

This file was deleted.

62 changes: 60 additions & 2 deletions .nais/dev-gcp.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,60 @@
ingresses:
- 'https://reops-proxy.intern.dev.nav.no'
apiVersion: nais.io/v1alpha1
kind: Application
metadata:
name: reops-proxy
namespace: team-researchops
labels:
team: team-researchops
spec:
image: {{ image }}
port: 8080
resources:
limits:
cpu: 100m
memory: 256Mi
requests:
cpu: 100m
memory: 256Mi
accessPolicy:
inbound:
rules:
- application: ia-key-metrics
namespace: teamia
- application: memu-data
namespace: fugl-fonix
outbound:
external:
- host: api.siteimprove.com
- host: api.eu.siteimprove.com
- host: siteimprove.com
- host: raw.githubusercontent.com
- host: analytics.eu.amplitude.com
ingresses:
- https://reops-proxy.intern.dev.nav.no
liveness:
path: /isAlive
initialDelay: 20
readiness:
path: /isReady
initialDelay: 20
env:
- name: SITEIMPROVE
value: {{SITEIMPROVE}}
- name: AMPLITUDE_100000009
value: {{AMPLITUDE_100000009}}
- name: AMPLITUDE_100000264
value: {{AMPLITUDE_100000264}}
- name: AMPLITUDE_100000243
value: {{AMPLITUDE_100000243}}
- name: AMPLITUDE_100000244
value: {{AMPLITUDE_100000244}}
- name: AMPLITUDE_100002286
value: {{AMPLITUDE_100002286}}
- name: AMPLITUDE_100003868
value: {{AMPLITUDE_100003868}}
- name: AMPLITUDE_100003867
value: {{AMPLITUDE_100003867}}
- name: AMPLITUDE_100002016
value: {{AMPLITUDE_100002016}}
- name: REOPS
value: {{REOPS}}
62 changes: 60 additions & 2 deletions .nais/prod-gcp.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,60 @@
ingresses:
- 'https://reops-proxy.intern.nav.no'
apiVersion: nais.io/v1alpha1
kind: Application
metadata:
name: reops-proxy
namespace: team-researchops
labels:
team: team-researchops
spec:
image: {{ image }}
port: 8080
resources:
limits:
cpu: 100m
memory: 256Mi
requests:
cpu: 100m
memory: 256Mi
accessPolicy:
inbound:
rules:
- application: ia-key-metrics
namespace: teamia
- application: memu-data
namespace: fugl-fonix
outbound:
external:
- host: api.siteimprove.com
- host: api.eu.siteimprove.com
- host: siteimprove.com
- host: raw.githubusercontent.com
- host: analytics.eu.amplitude.com
ingresses:
- https://reops-proxy.intern.nav.no
liveness:
path: /isAlive
initialDelay: 20
readiness:
path: /isReady
initialDelay: 20
env:
- name: SITEIMPROVE
value: {{SITEIMPROVE}}
- name: AMPLITUDE_100000009
value: {{AMPLITUDE_100000009}}
- name: AMPLITUDE_100000264
value: {{AMPLITUDE_100000264}}
- name: AMPLITUDE_100000243
value: {{AMPLITUDE_100000243}}
- name: AMPLITUDE_100000244
value: {{AMPLITUDE_100000244}}
- name: AMPLITUDE_100002286
value: {{AMPLITUDE_100002286}}
- name: AMPLITUDE_100003868
value: {{AMPLITUDE_100003868}}
- name: AMPLITUDE_100003867
value: {{AMPLITUDE_100003867}}
- name: AMPLITUDE_100002016
value: {{AMPLITUDE_100002016}}
- name: REOPS
value: {{REOPS}}

0 comments on commit 084f950

Please sign in to comment.