Deployer til dev-gcp. (#12)

* Deployer til dev-gcp.

Legger til write permissions for id-token i kafka.yaml.

* Fjerner init-app.sh fra Dockerfile.

* Deploy manuelt til GCP

* Endrer på DB-tiers.

Author: ramrock93

.github/workflows/build.yaml

@@ -72,20 +72,20 @@ jobs:
       image_version: ${{ needs.build-app.outputs.build-version }}
 
 
-#  deploy-dev:
-#    name: Deploy dev
-#    permissions:
-#      id-token: write
-#      contents: write
-#    if: github.ref_name == 'master'
-#    needs: [build-app]
-#    uses: navikt/sif-gha-workflows/.github/workflows/maven-deploy.yml@main
-#    with:
-#      gar: true
-#      image: ${{ needs.build-app.outputs.build-version }}
-#      cluster: dev-gcp
-#      naiserator_file: deploy/dev-gcp.yml
-#    secrets: inherit
+  deploy-dev:
+    name: Deploy dev
+    permissions:
+      id-token: write
+      contents: write
+    if: github.ref_name == 'master'
+    needs: [build-app]
+    uses: navikt/sif-gha-workflows/.github/workflows/maven-deploy.yml@main
+    with:
+      gar: true
+      image: ${{ needs.build-app.outputs.build-version }}
+      cluster: dev-gcp
+      naiserator_file: deploy/dev-gcp.yml
+    secrets: inherit
 
 #  check-change-compat-typescript-client:
 #    name: Change and compatibility check typescript client

.github/workflows/deploy-manuelt.yml

@@ -25,6 +25,6 @@ jobs:
       gar: true
       image: ${{ inputs.image }}
       cluster: ${{ inputs.environment }}-gcp
-      naiserator_file: deploy/${{ inputs.environment }}-fss.yml
+      naiserator_file: deploy/${{ inputs.environment }}-gcp.yml
       namespace: k9saksbehandling
     secrets: inherit

.github/workflows/kafka.yaml

@@ -8,8 +8,8 @@ on:
 
 jobs:
   deploy-kafka-topics-dev:
-#    permissions:
-#      id-token: write
+    permissions:
+      id-token: write
     name: Deploy to Aiven Dev
     if: startsWith(github.ref, 'refs/heads/master')
     runs-on: ubuntu-latest
@@ -32,8 +32,8 @@ jobs:
           RESOURCE: deploy/kafka/ung-vedtakhendelse-dev.yml
 
   deploy-kafka-topics-prod:
-#    permissions:
-#      id-token: write
+    permissions:
+      id-token: write
     name: Deploy to Aiven Prod
     if: startsWith(github.ref, 'refs/heads/master')  # If the branch is master
     runs-on: ubuntu-latest

Dockerfile

@@ -7,9 +7,6 @@ RUN mkdir /app/conf
 
 ENV JAVA_OPTS="-XX:MaxRAMPercentage=75.0 -XX:ActiveProcessorCount=4 -Djdk.virtualThreadScheduler.parallelism=8 -Djava.security.egd=file:/dev/./urandom -Duser.timezone=Europe/Oslo "
 
-# Application Start Konfigurasjon
-COPY build/init-app.sh /init-scripts/init-app.sh
-
 # Config
 COPY web/target/classes/logback.xml /app/conf/
 

build/init-app.sh

@@ -97,7 +97,7 @@ spec:
     sqlInstances:
       - type: POSTGRES_16
         name: ung-sak-db
-        tier: db-custom-1-3840
+        tier: db-g1-small # delt CPU, 1.7 RAM
         diskSize: 10
         diskAutoresize: false
         highAvailability: false

deploy/dev-gcp.yml

@@ -90,7 +90,7 @@ spec:
     sqlInstances:
       - type: POSTGRES_16
         name: ung-sak-db
-        tier: db-custom-2-7680
+        tier: db-custom-1-3840 # 1 CPU, 3.75 GB RAM
         diskSize: 100
         diskAutoresize: true
         highAvailability: true