Skip to content

Commit 35dfb04

Browse files
hestadhestad
committed
Fix dev ingress
1 parent e4e106e commit 35dfb04

File tree

2 files changed

+90
-90
lines changed

2 files changed

+90
-90
lines changed

‎.nais/dev.yaml

+89-89
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,100 @@
11
apiVersion: nais.io/v1alpha1
22
kind: Application
33
metadata:
4-
annotations:
5-
nginx.ingress.kubernetes.io/proxy-body-size: "20m"
6-
name: su-se-framover
7-
namespace: supstonad
8-
labels:
9-
team: supstonad
4+
annotations:
5+
nginx.ingress.kubernetes.io/proxy-body-size: '20m'
6+
name: su-se-framover
7+
namespace: supstonad
8+
labels:
9+
team: supstonad
1010
spec:
11-
port: 8080
12-
image: {{ image }}
13-
azure:
14-
application:
15-
enabled: true
16-
tenant: trygdeetaten.no
17-
claims:
18-
extra:
19-
- "NAVident"
20-
groups:
21-
- id: "d75164fa-39e6-4149-956e-8404bc9080b6" # 0000-GA-SU-UFOR-ATTESTANT
22-
- id: "0ba009c4-d148-4a51-b501-4b1cf906889d" # 0000-GA-SU-UFOR-VEILEDER
23-
- id: "062d4814-8538-4f3a-bcb9-32821af7909a" # 0000-GA-SU-UFOR-SAKSBEHANDLER
24-
- id: "5ccd88bd-58d6-41a7-9652-5e0597b00f9b" # 0000-GA-SU-UFOR-DRIFT
25-
replyURLs:
26-
- "http://localhost/oauth2/callback"
27-
- "https://supplerendestonad.dev.adeo.no/oauth2/callback"
28-
- "https://supplerendestonad.intern.dev.nav.no/oauth2/callback"
29-
webproxy: true
30-
replicas:
31-
min: 2
32-
liveness:
33-
path: isAlive
3411
port: 8080
35-
initialDelay: 5
36-
readiness:
37-
path: isReady
38-
port: 8080
39-
initialDelay: 5
40-
ingresses:
41-
- https://supplerendestonad.dev.adeo.no
42-
- https://supplerendestonad.intern.dev.adeo.no
43-
vault:
44-
enabled: true
45-
env:
46-
- name: NODE_ENV
47-
value: production
48-
- name: REDIS_HOST
49-
value: su-se-framover-redis
50-
- name: SU_SE_BAKOVER_URL
51-
value: http://su-se-bakover
52-
- name: NPM_CONFIG_CACHE
53-
value: /tmp
54-
- name: AZURE_GROUP_ATTESTANT
55-
value: "d75164fa-39e6-4149-956e-8404bc9080b6"
56-
- name: AZURE_GROUP_VEILEDER
57-
value: "062d4814-8538-4f3a-bcb9-32821af7909a"
58-
- name: AZURE_GROUP_SAKSBEHANDLER
59-
value: "0ba009c4-d148-4a51-b501-4b1cf906889d"
60-
- name: AZURE_GROUP_DRIFT
61-
value: "5ccd88bd-58d6-41a7-9652-5e0597b00f9b"
62-
- name: SU_SE_BAKOVER_AAD_APP_NAME
63-
value: "dev-fss.supstonad.su-se-bakover"
64-
- name: AUTH_LOGIN_REDIRECT_URI
65-
value: "https://supplerendestonad.intern.dev.adeo.no/oauth2/callback"
66-
- name: AUTH_LOGOUT_REDIRECT_URI
67-
value: "https://supplerendestonad.intern.dev.adeo.no/"
68-
- name: LOG_LEVEL
69-
value: "debug"
70-
envFrom:
71-
- secret: redis-password
72-
- secret: su-se-framover-session-key
12+
image: { { image } }
13+
azure:
14+
application:
15+
enabled: true
16+
tenant: trygdeetaten.no
17+
claims:
18+
extra:
19+
- 'NAVident'
20+
groups:
21+
- id: 'd75164fa-39e6-4149-956e-8404bc9080b6' # 0000-GA-SU-UFOR-ATTESTANT
22+
- id: '0ba009c4-d148-4a51-b501-4b1cf906889d' # 0000-GA-SU-UFOR-VEILEDER
23+
- id: '062d4814-8538-4f3a-bcb9-32821af7909a' # 0000-GA-SU-UFOR-SAKSBEHANDLER
24+
- id: '5ccd88bd-58d6-41a7-9652-5e0597b00f9b' # 0000-GA-SU-UFOR-DRIFT
25+
replyURLs:
26+
- 'http://localhost/oauth2/callback'
27+
- 'https://supplerendestonad.dev.adeo.no/oauth2/callback'
28+
- 'https://supplerendestonad.intern.dev.nav.no/oauth2/callback'
29+
webproxy: true
30+
replicas:
31+
min: 2
32+
liveness:
33+
path: isAlive
34+
port: 8080
35+
initialDelay: 5
36+
readiness:
37+
path: isReady
38+
port: 8080
39+
initialDelay: 5
40+
ingresses:
41+
- https://supplerendestonad.dev.adeo.no
42+
- https://supplerendestonad.intern.dev.nav.no
43+
vault:
44+
enabled: true
45+
env:
46+
- name: NODE_ENV
47+
value: production
48+
- name: REDIS_HOST
49+
value: su-se-framover-redis
50+
- name: SU_SE_BAKOVER_URL
51+
value: http://su-se-bakover
52+
- name: NPM_CONFIG_CACHE
53+
value: /tmp
54+
- name: AZURE_GROUP_ATTESTANT
55+
value: 'd75164fa-39e6-4149-956e-8404bc9080b6'
56+
- name: AZURE_GROUP_VEILEDER
57+
value: '062d4814-8538-4f3a-bcb9-32821af7909a'
58+
- name: AZURE_GROUP_SAKSBEHANDLER
59+
value: '0ba009c4-d148-4a51-b501-4b1cf906889d'
60+
- name: AZURE_GROUP_DRIFT
61+
value: '5ccd88bd-58d6-41a7-9652-5e0597b00f9b'
62+
- name: SU_SE_BAKOVER_AAD_APP_NAME
63+
value: 'dev-fss.supstonad.su-se-bakover'
64+
- name: AUTH_LOGIN_REDIRECT_URI
65+
value: 'https://supplerendestonad.intern.dev.nav.no/oauth2/callback'
66+
- name: AUTH_LOGOUT_REDIRECT_URI
67+
value: 'https://supplerendestonad.intern.dev.nav.no/'
68+
- name: LOG_LEVEL
69+
value: 'debug'
70+
envFrom:
71+
- secret: redis-password
72+
- secret: su-se-framover-session-key
7373
---
7474
apiVersion: nais.io/v1alpha1
7575
kind: Application
7676
metadata:
77-
labels:
78-
team: supstonad
79-
name: su-se-framover-redis
80-
namespace: supstonad
81-
annotations:
82-
nais.io/run-as-group: "0" # Fix permissions for bitnami/redis
83-
nais.io/read-only-file-system: "false" # Fix permissions for bitnami/redis
77+
labels:
78+
team: supstonad
79+
name: su-se-framover-redis
80+
namespace: supstonad
81+
annotations:
82+
nais.io/run-as-group: '0' # Fix permissions for bitnami/redis
83+
nais.io/read-only-file-system: 'false' # Fix permissions for bitnami/redis
8484
spec:
85-
image: bitnami/redis:6.0
86-
port: 6379
87-
replicas: # A single Redis-app doesn't scale
88-
min: 1
89-
max: 1 # More replicas doesn't sync
90-
resources: # you need to monitor the resource usage yourself
91-
limits:
92-
memory: 128Mi
93-
requests:
94-
cpu: 100m
95-
memory: 128Mi
96-
service:
85+
image: bitnami/redis:6.0
9786
port: 6379
98-
protocol: redis
99-
envFrom:
100-
- secret: redis-password
87+
replicas: # A single Redis-app doesn't scale
88+
min: 1
89+
max: 1 # More replicas doesn't sync
90+
resources: # you need to monitor the resource usage yourself
91+
limits:
92+
memory: 128Mi
93+
requests:
94+
cpu: 100m
95+
memory: 128Mi
96+
service:
97+
port: 6379
98+
protocol: redis
99+
envFrom:
100+
- secret: redis-password

‎server/redirect.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Request, Response, NextFunction } from 'express';
33
const redirectMiddleware = (request: Request, res: Response, next: NextFunction) => {
44
const forwardedHostHeader: string | undefined = request.header('x-forwarded-host');
55
if (forwardedHostHeader && forwardedHostHeader?.includes('dev.adeo.no')) {
6-
res.redirect('https://supplerendestonad.intern.dev.adeo.no');
6+
res.redirect('https://supplerendestonad.intern.dev.nav.no');
77
} else if (forwardedHostHeader && forwardedHostHeader?.includes('nais.adeo.no')) {
88
res.redirect('https://supplerendestonad.intern.nav.no');
99
} else {

0 commit comments

Comments
 (0)