diff --git a/.github/workflows/deploy-docker-image-gcp.yml b/.github/workflows/deploy-docker-image-gcp.yml new file mode 100644 index 0000000000..0293a4793f --- /dev/null +++ b/.github/workflows/deploy-docker-image-gcp.yml @@ -0,0 +1,73 @@ +name: Deploy Docker image GCP +on: + push: + branches: + - GCP-migrering + +jobs: + deploy-docker-image: + name: Deploy Docker image + runs-on: ubuntu-latest + permissions: + issues: write + contents: read + id-token: write + outputs: + image: ${{ steps.docker-push.outputs.image }} + steps: + - name: Hente kode + uses: actions/checkout@v4 + + - name: Setup .yarnrc.yml + run: | + yarn config set npmScopes.navikt.npmRegistryServer "https://npm.pkg.github.com" + yarn config set npmScopes.navikt.npmAlwaysAuth true + yarn config set npmScopes.navikt.npmAuthToken $NPM_AUTH_TOKEN + env: + NPM_AUTH_TOKEN: ${{ secrets.READER_TOKEN }} + + - name: Sette opp Node + uses: actions/setup-node@v4 + with: + node-version: '18' + cache: 'yarn' + + - name: Set timestamp + run: echo "TIMESTAMP=$(expr $(date +%Y%m%d%H%M%S))" >> $GITHUB_ENV + + - name: Installere dependencies + run: HUSKY=0 yarn install --immutable + + - name: Bygge dist + run: yarn build + + - uses: nais/docker-build-push@v0 + id: docker-push + with: + team: k9saksbehandling + project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} + identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} + + - name: Sett image for nais deploy + run: | + echo "IMAGE=${{steps.docker-push.outputs.image}}" >> $GITHUB_ENV + + - name: Promoter til cluster og namespace + uses: nais/deploy/actions/deploy@v2 + env: + PRINT_PAYLOAD: true + CLUSTER: dev-gcp + RESOURCE: deploy/dev-gcp.yml + + trivy: + needs: [deploy-docker-image] + uses: navikt/sif-gha-workflows/.github/workflows/trivy.yml@main + permissions: + contents: write + id-token: write + security-events: write + actions: read + secrets: inherit + with: + image: ${{ needs.deploy-docker-image.outputs.image }} + team: k9saksbehandling diff --git a/.github/workflows/deploy-docker-image.yml b/.github/workflows/deploy-docker-image.yml index 9e22ed63f9..46940c890b 100644 --- a/.github/workflows/deploy-docker-image.yml +++ b/.github/workflows/deploy-docker-image.yml @@ -68,6 +68,7 @@ jobs: team: k9saksbehandling project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} + - name: Sett image for nais deploy run: | echo "IMAGE=${{steps.docker-push.outputs.image}}" >> $GITHUB_OUTPUT diff --git a/deploy/dev-gcp.yml b/deploy/dev-gcp.yml new file mode 100644 index 0000000000..74e3edcd7f --- /dev/null +++ b/deploy/dev-gcp.yml @@ -0,0 +1,104 @@ +apiVersion: "nais.io/v1alpha1" +kind: "Application" +metadata: + name: k9-sak-web + namespace: k9saksbehandling + labels: + team: k9saksbehandling + annotations: + nais.io/run-as-user: "101" # Fix permissions for nginx + nais.io/read-only-file-system: "false" # Fix permissions for nginx + nginx.ingress.kubernetes.io/proxy-buffer-size: "32k" + nginx.ingress.kubernetes.io/proxy-read-timeout: "600" + nginx.ingress.kubernetes.io/proxy-send-timeout: "600" +spec: + image: {{ image }} + port: 9000 + liveness: + path: /isAlive + initialDelay: 20 + timeout: 1 + periodSeconds: 5 + failureThreshold: 10 + readiness: + path: /isReady + initialDelay: 20 + timeout: 1 + replicas: + min: 2 + max: 3 + cpuThresholdPercentage: 50 + resources: + limits: + cpu: 500m + memory: 64Mi + requests: + cpu: 200m + memory: 32Mi + ingresses: + - "https://k9.intern.dev.nav.no" + accessPolicy: + outbound: + external: + - host: "k9-sak.dev-fss-pub.nais.io" + env: + - name: APP_NAME + value: k9-sak-web + - name: APP_URL + value: "https://k9-sak.dev-fss-pub.nais.io" + - name: APP_PORT + value: "9000" + - name: APP_URL_K9FORMIDLING + value: "https://k9-formidling.dev-fss-pub.nais.io" + - name: APP_URL_K9FORMIDLING_DD + value: "https://k9-formidling-dokumentdata.dev-fss-pub.nais.io" + - name: APP_URL_K9OPPDRAG + value: "https://k9-oppdrag.dev-fss-pub.nais.io" + - name: APP_URL_KLAGE + value: "https://k9-klage.dev-fss-pub.nais.io" + - name: APP_URL_K9TILBAKE + value: "https://k9-tilbake.dev-fss-pub.nais.io" + - name: APP_URL_K9FORDEL + value: "https://k9-fordel.dev-fss-pub.nais.io" + - name: ENDRINGSLOGG_URL + value: "https://familie-endringslogg.intern.dev.nav.no/" + + # Feature-flag + - name: KLAGE_KABAL + value: "true" + - name: VARSELTEKST + value: "true" + - name: DOKUMENTDATA + value: "true" + - name: UNNTAKSBEHANDLING + value: "true" + - name: KLAGEBEHANDLING + value: "true" + - name: TILBAKE + value: "true" + - name: SOKNADPERIODESTRIPE + value: "false" + - name: TYPE_MEDISINSKE_OPPLYSNINGER_BREV + value: "true" + - name: LOS_MARKER_BEHANDLING + value: "true" + - name: LOS_MARKER_BEHANDLING_SUBMIT + value: "true" + - name: AKSJONSPUNKT_9014 + value: "true" + - name: AKSJONSPUNKT_9015 + value: "true" + - name: FRITEKST_REDIGERING + value: "true" + - name: INKLUDER_KALENDER_PILS + value: "true" + - name: SKJUL_AVSLUTTET_ARBEIDSGIVER + value: "true" + - name: OMS_PUNSJSTRIPE + value: "true" + - name: OMSORGEN_FOR_PERIODISERT + value: "true" + - name: OVERSTYR_BEREGNING + value: "true" + - name: "OVERSTYRING_UTTAK" + value: "true" diff --git a/deploy/prod-fss-k9saksbehandling copy.yml b/deploy/prod-fss-k9saksbehandling copy.yml new file mode 100644 index 0000000000..8c5f9cf75f --- /dev/null +++ b/deploy/prod-fss-k9saksbehandling copy.yml @@ -0,0 +1,100 @@ +apiVersion: "nais.io/v1alpha1" +kind: "Application" +metadata: + name: k9-sak-web + namespace: k9saksbehandling + labels: + team: k9saksbehandling + annotations: + nais.io/run-as-user: "101" # Fix permissions for nginx + nais.io/read-only-file-system: "false" # Fix permissions for nginx + nginx.ingress.kubernetes.io/proxy-buffer-size: "32k" + nginx.ingress.kubernetes.io/proxy-read-timeout: "600" + nginx.ingress.kubernetes.io/proxy-send-timeout: "600" +spec: + image: {{ image }} + port: 9000 + liveness: + path: /isAlive + initialDelay: 20 + timeout: 1 + periodSeconds: 5 + failureThreshold: 10 + readiness: + path: /isReady + initialDelay: 20 + timeout: 1 + replicas: + min: 2 + max: 3 + cpuThresholdPercentage: 50 + resources: + limits: + cpu: 500m + memory: 64Mi + requests: + cpu: 200m + memory: 32Mi + ingresses: + - "https://k9.intern.nav.no/" + env: + - name: APP_NAME + value: k9-sak-web + - name: APP_URL + value: "http://k9-sak" + - name: APP_PORT + value: "9000" + - name: APP_URL_K9FORMIDLING + value: "http://k9-formidling" + - name: APP_URL_K9FORMIDLING_DD + value: "http://k9-formidling-dokumentdata.k9saksbehandling" + - name: APP_URL_K9OPPDRAG + value: "http://k9-oppdrag.k9saksbehandling" + - name: APP_URL_KLAGE + value: "http://k9-klage.k9saksbehandling" + - name: APP_URL_K9TILBAKE + value: "http://k9-tilbake.k9saksbehandling" + - name: APP_URL_K9FORDEL + value: "http://k9-fordel.k9saksbehandling" + - name: ENDRINGSLOGG_URL + value: "https://familie-endringslogg.intern.nav.no/" + + # Feature-flag + - name: KLAGE_KABAL + value: "true" + - name: VARSELTEKST + value: "false" + - name: DOKUMENTDATA + value: "false" + - name: UNNTAKSBEHANDLING + value: "false" + - name: KLAGEBEHANDLING + value: "true" + - name: TILBAKE + value: "true" + - name: SOKNADPERIODESTRIPE + value: "false" + - name: TYPE_MEDISINSKE_OPPLYSNINGER_BREV + value: "true" + - name: LOS_MARKER_BEHANDLING + value: "true" + - name: LOS_MARKER_BEHANDLING_SUBMIT + value: "false" + - name: AKSJONSPUNKT_9014 + value: "true" + - name: AKSJONSPUNKT_9015 + value: "true" + - name: FRITEKST_REDIGERING + value: "true" + - name: INKLUDER_KALENDER_PILS + value: "false" + - name: SKJUL_AVSLUTTET_ARBEIDSGIVER + value: "false" + - name: OMS_PUNSJSTRIPE + value: "true" + - name: OMSORGEN_FOR_PERIODISERT + value: "true" + - name: OVERSTYR_BEREGNING + value: "false" + - name: "OVERSTYRING_UTTAK" + value: "false" diff --git a/packages/rest-api/src/requestApi/RequestRunner.ts b/packages/rest-api/src/requestApi/RequestRunner.ts index 7ddbb1b912..9aac7dd6e1 100644 --- a/packages/rest-api/src/requestApi/RequestRunner.ts +++ b/packages/rest-api/src/requestApi/RequestRunner.ts @@ -136,7 +136,8 @@ class RequestRunner { if (popupWindow === null) { const location = `${response.headers.location}`; const queryParamAddition = location.includes('?') ? '&' : '?'; - const redirectLocation = `${location}${queryParamAddition}redirectTo=/k9/web/close`; + const redirectLocation = `${location}${queryParamAddition}redirectTo=/k9/web/close` + console.log('redirectLocation', redirectLocation); popupWindow = window.open(redirectLocation, undefined, 'height=600,width=800'); } const timer = setInterval(async () => { diff --git a/packages/sak-app/src/app/components/Home.tsx b/packages/sak-app/src/app/components/Home.tsx index 189bc55367..61fc48a44b 100644 --- a/packages/sak-app/src/app/components/Home.tsx +++ b/packages/sak-app/src/app/components/Home.tsx @@ -31,7 +31,7 @@ const Home = ({ headerHeight }: OwnProps) => ( } /> } /> } /> - } /> + {/* } /> */} } /> diff --git a/proxy.nginx b/proxy.nginx index 39a69ad55c..eca96a6a1b 100644 --- a/proxy.nginx +++ b/proxy.nginx @@ -64,7 +64,6 @@ server { proxy_intercept_errors on; error_page 401 = @401_json; error_page 403 = @403_json; - error_page 404 = @404_json; error_page 504 = @504_json; } diff --git a/start-server.sh b/start-server.sh index a92535f1f7..65805d1b68 100755 --- a/start-server.sh +++ b/start-server.sh @@ -20,7 +20,7 @@ export APP_PORT="${APP_PORT:-443}" export APP_NAME="${APP_NAME:-devimg}" export APP_VERSION="${APP_VERSION:-localhost}" -envsubst '$APP_URL $APP_PORT $APP_HOSTNAME $APP_NAME $APP_VERSION $APP_PATH_PREFIX $APP_URL_K9FORMIDLING $APP_URL_K9FORMIDLING_DD $APP_URL_K9OPPDRAG $APP_URL_KLAGE $APP_URL_K9TILBAKE $APP_URL_K9FORDEL $ENDRINGSLOGG_URL' < /etc/nginx/conf.d/app.conf.template > /etc/nginx/conf.d/default.conf +envsubst '$APP_URL $APP_PORT $APP_HOSTNAME $APP_NAME $APP_VERSION $APP_URL_K9FORMIDLING $APP_URL_K9FORMIDLING_DD $APP_URL_K9OPPDRAG $APP_URL_KLAGE $APP_URL_K9TILBAKE $APP_URL_K9FORDEL $ENDRINGSLOGG_URL' < /etc/nginx/conf.d/app.conf.template > /etc/nginx/conf.d/default.conf echo "### Nginx conf ###" cat /etc/nginx/conf.d/default.conf