Skip to content

Commit e42c3f2

Browse files
sneha-d-desaisneha-d-desai
authored
Merge branch 'main' into oppdatere-poao-frontend
2 parents 40630d4 + 5a1a9bf commit e42c3f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2055
-3056
lines changed

‎.github/labeler.yml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.github/workflows/automatisk-labeling.yaml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎.github/workflows/deploy-dev-gcp.yaml‎

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,41 @@
11
name: Deploy to dev
22
on:
3-
workflow_dispatch:
4-
push:
5-
branches:
6-
- master
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- main
77
env:
8-
CI: true
9-
TZ: Europe/Amsterdam
8+
CI: true
9+
TZ: Europe/Amsterdam
1010

1111
jobs:
12-
deploy-dev:
13-
name: Deploy application to dev
14-
runs-on: ubuntu-latest
15-
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v4
18-
- name: Setup node
19-
uses: actions/setup-node@v4
20-
with:
21-
node-version: 20
22-
cache: npm
23-
- name: Install dependencies
24-
run: npm ci
25-
- name: Run tests
26-
run: npm run test
27-
- name: Build application
28-
run: npm run build:dev
29-
- name: Authenticate to Google Cloud
30-
uses: google-github-actions/auth@v2
31-
with:
32-
credentials_json: ${{ secrets.GCS_SA_KEY_DEV }}
33-
- name: Set up Cloud SDK
34-
uses: google-github-actions/setup-gcloud@v2
35-
- name: Upload files to GCS
36-
run: gsutil -m rsync -r dist gs://obo-beslutteroversikt-dev
12+
deploy-dev:
13+
name: Deploy application to dev
14+
permissions:
15+
contents: read
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
- name: Setup node
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: 22
24+
cache: npm
25+
registry-url: "https://npm.pkg.github.com"
26+
- name: Install dependencies
27+
run: npm ci
28+
env:
29+
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
30+
- name: Run tests
31+
run: npm run test
32+
- name: Build application
33+
run: npm run build:dev
34+
- name: Authenticate to Google Cloud
35+
uses: google-github-actions/auth@v2
36+
with:
37+
credentials_json: ${{ secrets.GCS_SA_KEY_DEV }}
38+
- name: Set up Cloud SDK
39+
uses: google-github-actions/setup-gcloud@v2
40+
- name: Upload files to GCS
41+
run: gsutil -m rsync -r dist gs://obo-beslutteroversikt-dev

‎.github/workflows/deploy-prod-gcp.yaml‎

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,41 @@
11
name: Deploy to prod
22
on:
3-
workflow_dispatch:
4-
push:
5-
branches:
6-
- master
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- main
77
env:
8-
CI: true
9-
TZ: Europe/Amsterdam
8+
CI: true
9+
TZ: Europe/Amsterdam
1010

1111
jobs:
12-
deploy-prod:
13-
name: Deploy application to prod
14-
runs-on: ubuntu-latest
15-
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v4
18-
- name: Setup node
19-
uses: actions/setup-node@v4
20-
with:
21-
node-version: 20
22-
cache: npm
23-
- name: Install dependencies
24-
run: npm ci
25-
- name: Run tests
26-
run: npm run test
27-
- name: Build application
28-
run: npm run build:prod
29-
- name: Authenticate to Google Cloud
30-
uses: google-github-actions/auth@v2
31-
with:
32-
credentials_json: ${{ secrets.GCS_SA_KEY_PROD }}
33-
- name: Set up Cloud SDK
34-
uses: google-github-actions/setup-gcloud@v2
35-
- name: Upload files to GCS
36-
run: gsutil -m rsync -r dist gs://obo-beslutteroversikt-prod
12+
deploy-prod:
13+
name: Deploy application to prod
14+
permissions:
15+
contents: read
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
- name: Setup node
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: 22
24+
cache: npm
25+
registry-url: "https://npm.pkg.github.com"
26+
- name: Install dependencies
27+
run: npm ci
28+
env:
29+
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
30+
- name: Run tests
31+
run: npm run test
32+
- name: Build application
33+
run: npm run build:prod
34+
- name: Authenticate to Google Cloud
35+
uses: google-github-actions/auth@v2
36+
with:
37+
credentials_json: ${{ secrets.GCS_SA_KEY_PROD }}
38+
- name: Set up Cloud SDK
39+
uses: google-github-actions/setup-gcloud@v2
40+
- name: Upload files to GCS
41+
run: gsutil -m rsync -r dist gs://obo-beslutteroversikt-prod

‎.github/workflows/poao-frontend-container-dev.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: paoa frontend container dev
33
on:
44
push:
55
branches:
6-
- 'master'
6+
- "main"
77
paths:
8-
- '.github/workflows/poao-frontend-container-dev.yaml'
9-
- '.nais/obo-nais-dev.yaml'
8+
- ".github/workflows/poao-frontend-container-dev.yaml"
9+
- ".nais/obo-nais-dev.yaml"
1010
workflow_dispatch:
1111

1212
concurrency:

‎.github/workflows/poao-frontend-container-prod.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: paoa frontend container prod
33
on:
44
push:
55
branches:
6-
- 'master'
6+
- "main"
77
paths:
8-
- '.github/workflows/poao-frontend-container-prod.yaml'
9-
- '.nais/obo-nais-prod.yaml'
8+
- ".github/workflows/poao-frontend-container-prod.yaml"
9+
- ".nais/obo-nais-prod.yaml"
1010
workflow_dispatch:
1111

1212
concurrency:

‎.github/workflows/update-github-pages.yaml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,35 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- master
7-
permissions:
8-
contents: write
6+
- main
7+
98
env:
109
CI: true
1110
TZ: Europe/Amsterdam
1211

1312
jobs:
1413
update-gh-pages:
1514
name: Update GitHub pages
15+
permissions:
16+
contents: write
1617
runs-on: ubuntu-latest
1718
steps:
1819
- name: Checkout
1920
uses: actions/checkout@v4
2021
- name: Setup node
2122
uses: actions/setup-node@v4
2223
with:
23-
node-version: 20
24-
cache: 'npm'
24+
node-version: 22
25+
cache: npm
26+
registry-url: "https://npm.pkg.github.com"
2527
- name: Install dependencies
2628
run: npm ci
29+
env:
30+
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
2731
- name: Build mock application
2832
run: npm run build:mock
2933
- name: Update GitHub pages
3034
uses: peaceiris/actions-gh-pages@v4
3135
with:
32-
github_token: ${{ secrets.GITHUB_TOKEN }}
33-
publish_dir: ./dist
36+
github_token: ${{ secrets.GITHUB_TOKEN }}
37+
publish_dir: ./dist

‎.nais/obo-nais-dev.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ spec:
2727
requests:
2828
cpu: 250m
2929
memory: 256Mi
30+
observability:
31+
logging:
32+
destinations:
33+
- id: elastic
34+
- id: loki
3035
secureLogs:
3136
enabled: true
3237
azure:
@@ -49,6 +54,8 @@ spec:
4954
namespace: obo
5055
- application: veilarbveileder
5156
namespace: obo
57+
- application: obo-unleash
58+
namespace: obo
5259
env:
5360
- name: JSON_CONFIG
5461
value: >
@@ -111,6 +118,16 @@ spec:
111118
"namespace": "obo",
112119
"cluster": "dev-gcp"
113120
}
121+
},
122+
{
123+
"fromPath": "/obo-unleash",
124+
"toUrl": "http://obo-unleash.obo",
125+
"preserveFromPath": false,
126+
"toApp": {
127+
"name": "obo-unleash",
128+
"namespace": "obo",
129+
"cluster": "dev-gcp"
130+
}
114131
}
115132
]
116133
}

‎.nais/obo-nais-prod.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ spec:
2626
memory: 500Mi
2727
limits:
2828
memory: 1Gi
29+
observability:
30+
logging:
31+
destinations:
32+
- id: elastic
33+
- id: loki
2934
secureLogs:
3035
enabled: true
3136
azure:
@@ -46,6 +51,8 @@ spec:
4651
namespace: personoversikt
4752
- application: veilarbveileder
4853
- application: veilarbvedtaksstotte
54+
- application: obo-unleash
55+
namespace: obo
4956
env:
5057
- name: JSON_CONFIG
5158
value: >
@@ -108,6 +115,16 @@ spec:
108115
"namespace": "obo",
109116
"cluster": "prod-gcp"
110117
}
118+
},
119+
{
120+
"fromPath": "/obo-unleash",
121+
"toUrl": "http://obo-unleash.obo",
122+
"preserveFromPath": false,
123+
"toApp": {
124+
"name": "obo-unleash",
125+
"namespace": "obo",
126+
"cluster": "prod-gcp"
127+
}
111128
}
112129
]
113130
}

‎.prettierignore‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)