Implementerer hotbff og fjerner gammelt oppsett, deployer til dev

Author: murvold

.github/workflows/deploy-dev.yml

@@ -8,6 +8,7 @@ on:
       - 'CODEOWNERS'
     branches:
       - main
+      - hotbff
 
 jobs:
   build:

.gitignore

@@ -2,3 +2,4 @@
 dist
 node_modules
 *.iml
+server/server

.nais/dev.yml

@@ -12,12 +12,12 @@ spec:
   ingresses:
     - https://brilleavtale.intern.dev.nav.no/hjelpemidler/brilleavtale
   liveness:
-    path: /hjelpemidler/brilleavtale/internal/isalive
+    path: /isalive
   readiness:
-    path: /hjelpemidler/brilleavtale/internal/isready
+    path: /isready
   prometheus:
-    enabled: true
-    path: /hjelpemidler/brilleavtale/internal/metrics
+    enabled: false
+    path: /metrics
   replicas:
     max: 1
     min: 1
@@ -41,9 +41,7 @@ spec:
     - name: BRILLE_API_BASE_URL
       value: 'http://hm-brille-api.teamdigihot.svc.cluster.local'
     - name: BRILLE_API_TARGET_AUDIENCE
-      value: dev-gcp:teamdigihot:hm-brille-api
-    - name: PORT
-      value: '5000'
+      value: api://dev-gcp:teamdigihot:hm-brille-api/.default
     - name: GIT_COMMIT
       value: {{commit}}
   accessPolicy:

.nais/labs.yml

@@ -12,12 +12,12 @@ spec:
   ingresses:
     - https://brilleavtale-labs.ekstern.dev.nav.no/hjelpemidler/brilleavtale
   liveness:
-    path: /hjelpemidler/brilleavtale/internal/isalive
+    path: /isalive
   readiness:
-    path: /hjelpemidler/brilleavtale/internal/isready
+    path: /isready
   prometheus:
-    enabled: true
-    path: /hjelpemidler/brilleavtale/internal/metrics
+    enabled: false
+    path: /metrics
   replicas:
     max: 1
     min: 1
@@ -29,14 +29,10 @@ spec:
       cpu: 20m
       memory: 256Mi
   env:
-    - name: IS_LABS
-      value: 'true'
     - name: BRILLE_API_BASE_URL
       value: ''
     - name: BRILLE_API_TARGET_AUDIENCE
       value: ''
-    - name: PORT
-      value: '5000'
     - name: USE_MSW
       value: 'true'
     - name: GIT_COMMIT

.nais/prod.yml

@@ -12,12 +12,12 @@ spec:
   ingresses:
     - https://www.nav.no/hjelpemidler/brilleavtale
   liveness:
-    path: /hjelpemidler/brilleavtale/internal/isalive
+    path: /isalive
   readiness:
-    path: /hjelpemidler/brilleavtale/internal/isready
+    path: /isready
   prometheus:
-    enabled: true
-    path: /hjelpemidler/brilleavtale/internal/metrics
+    enabled: false
+    path: /metrics
   replicas:
     max: 2
     min: 2
@@ -41,9 +41,7 @@ spec:
     - name: BRILLE_API_BASE_URL
       value: 'http://hm-brille-api.teamdigihot.svc.cluster.local'
     - name: BRILLE_API_TARGET_AUDIENCE
-      value: prod-gcp:teamdigihot:hm-brille-api
-    - name: PORT
-      value: '5000'
+      value: api://prod-gcp:teamdigihot:hm-brille-api/.default
     - name: GIT_COMMIT
       value: {{commit}}
   accessPolicy:

Dockerfile

@@ -1,44 +1,30 @@
-FROM node:20.14.0-alpine as node
+FROM node:lts-alpine AS node
 RUN --mount=type=secret,id=NODE_AUTH_TOKEN \
     npm config set //npm.pkg.github.com/:_authToken=$(cat /run/secrets/NODE_AUTH_TOKEN)
 RUN npm config set @navikt:registry=https://npm.pkg.github.com
 
 # build client
-FROM node as client-builder
+FROM node AS client-builder
 WORKDIR /app
 COPY client/package.json client/package-lock.json ./
 RUN npm ci
 COPY client .
 RUN npm run build
 
 # build server
-FROM node as server-builder
+FROM golang:1.25.1-alpine AS server-builder
 WORKDIR /app
-COPY server/package.json server/package-lock.json ./
-RUN npm ci
-COPY server .
-RUN npm run build
-
-# install server dependencies
-FROM node as server-dependencies
-WORKDIR /app
-COPY server/package.json server/package-lock.json ./
-RUN npm ci --omit dev
+COPY server ./
+RUN go build .
 
 # runtime
-FROM gcr.io/distroless/nodejs20-debian12 as runtime
+FROM gcr.io/distroless/static-debian12 AS runtime
 WORKDIR /app
 
-ARG NODE_ENV=production
-ENV NODE_ENV=${NODE_ENV}
 ENV TZ="Europe/Oslo"
-EXPOSE 3000
-
-COPY --from=client-builder /app/dist ./client/dist
-COPY --from=server-builder /app/dist ./server/dist
-
-WORKDIR /app/server
+EXPOSE 5000
 
-COPY --from=server-dependencies /app/node_modules ./node_modules
+COPY --from=client-builder /app/dist ./dist
+COPY --from=server-builder /app/hm-brilleavtale-frontend .
 
-CMD [ "--enable-source-maps", "-r", "dotenv/config", "dist/server.mjs" ]
+CMD [ "./hm-brilleavtale-frontend" ]

client/index.html

@@ -1,18 +1,21 @@
 <!DOCTYPE html>
 <html lang="no">
+
 <head>
   <meta charset="utf-8" />
   <link rel="icon" href="/favicon.ico" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  {{{DECORATOR_STYLES}}}
+  {{.HeadAssets}}
   <title>NAV Brilleavtale</title>
 </head>
+
 <body>
-<noscript>You need to enable JavaScript to run this app.</noscript>
-{{{DECORATOR_HEADER}}}
-<div id="root"></div>
-{{{DECORATOR_FOOTER}}}
-{{{DECORATOR_SCRIPTS}}}
-<script type="module" src="/src/main.tsx"></script>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  {{.Header}}
+  <div id="root"></div>
+  {{.Footer}}
+  {{.Scripts}}
+  <script type="module" src="/src/main.tsx"></script>
 </body>
-</html>
+
+</html>

client/src/global.d.ts

@@ -1,7 +1,7 @@
 interface Window {
   appSettings: {
     GIT_COMMIT?: string
-    MILJO?: 'labs-gcp' | 'dev-gcp' | 'prod-gcp'
+    NAIS_CLUSTER_NAME?: 'labs-gcp' | 'dev-gcp' | 'prod-gcp'
     USE_MSW?: boolean
   }
 }

client/vite.config.mts

@@ -30,7 +30,7 @@ const htmlPlugin = ({ development }: { development?: boolean }): Plugin => ({
             tag: 'script',
             children: `window.appSettings = {
               GIT_COMMIT: 'ukjent',
-              MILJO: 'labs-gcp',
+              NAIS_CLUSTER_NAME: 'labs-gcp',
               USE_MSW: true,
             }`,
           },

docker-compose.yml

@@ -1,7 +1,11 @@
-version: "3"
 services:
   hm-brilleavtale-frontend:
     build: .
     image: "hm-brilleavtale-frontend"
     ports:
-      - "5000:5000"
+      - "9000:5000"
+    environment:
+      NAIS_CLUSTER_NAME: 'dev-gcp'
+      BIND_ADDRESS: ':5000'
+      BRILLE_API_BASE_URL: 'http://localhost:4040'
+      USE_MSW: 'true'