Legger til mulighet for å prodsette til gcp

navikt · Jan 3, 2024 · 71711a1 · 71711a1
1 parent 62a5207
commit 71711a1
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 31 deletions.
diff --git a/.deploy/dev-fss-teamforeldrepenger.json b/.deploy/dev-fss-teamforeldrepenger.json
@@ -1,12 +1,4 @@
 {
   "minReplicas": "1",
-  "maxReplicas": "2",
-  "limits": {
-    "cpu": "1",
-    "mem": "1024Mi"
-  },
-  "requests": {
-    "cpu": "200m",
-    "mem": "512Mi"
-  }
+  "maxReplicas": "2"
 }
diff --git a/.deploy/dev-gcp-teamforeldrepenger.json b/.deploy/dev-gcp-teamforeldrepenger.json
@@ -0,0 +1,4 @@
+{
+  "minReplicas": "1",
+  "maxReplicas": "2"
+}
diff --git a/.deploy/naiserator.yaml b/.deploy/naiserator.yaml
@@ -27,10 +27,10 @@ spec:
     path: actuator/prometheus
   resources:
     limits:
-      cpu: "{{limits.cpu}}"
-      memory: "{{limits.mem}}"
+      cpu: "1"
+      memory: "1024Mi"
     requests:
-      cpu: "{{requests.cpu}}"
-      memory: "{{requests.mem}}"
+      cpu: "200m"
+      memory: "512Mi"
   secureLogs:
     enabled: true
diff --git a/.deploy/prod-fss-teamforeldrepenger.json b/.deploy/prod-fss-teamforeldrepenger.json
@@ -1,12 +1,4 @@
 {
   "minReplicas": "2",
-  "maxReplicas": "3",
-  "limits": {
-    "cpu": "1",
-    "mem": "1024Mi"
-  },
-  "requests": {
-    "cpu": "200m",
-    "mem": "512Mi"
-  }
+  "maxReplicas": "3"
 }
diff --git a/.deploy/prod-gcp-teamforeldrepenger.json b/.deploy/prod-gcp-teamforeldrepenger.json
@@ -0,0 +1,4 @@
+{
+  "minReplicas": "2",
+  "maxReplicas": "3"
+}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -49,8 +49,8 @@ jobs:
       build-version: ${{ needs.build-app.outputs.build-version }}
     secrets: inherit
 
-  deploy-dev:
-    name: Deploy dev
+  deploy-dev-fss:
+    name: Deploy dev-fss
     permissions:
       id-token: write
     if: github.ref_name == 'master'
@@ -62,8 +62,21 @@ jobs:
       cluster: dev-fss
     secrets: inherit
 
-  deploy-prod:
-    name: Deploy prod
+  deploy-dev-gcp:
+    name: Deploy dev-gcp
+    permissions:
+      id-token: write
+    if: github.ref_name == 'master'
+    needs: [build-app, verdikjede]
+    uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
+    with:
+      gar: true
+      image: ${{ needs.build-app.outputs.build-version }}
+      cluster: dev-gcp
+    secrets: inherit
+
+  deploy-prod-fss:
+    name: Deploy prod-fss
     permissions:
       id-token: write
     if: github.ref_name == 'master'
@@ -74,3 +87,16 @@ jobs:
       image: ${{ needs.build-app.outputs.build-version }}
       cluster: prod-fss
     secrets: inherit
+
+  deploy-prod-gcp:
+    name: Deploy prod-gcp
+    permissions:
+      id-token: write
+    if: github.ref_name == 'master'
+    needs: [build-app, verdikjede, deploy-dev]
+    uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
+    with:
+      gar: true
+      image: ${{ needs.build-app.outputs.build-version }}
+      cluster: prod-gcp
+    secrets: inherit
diff --git a/.github/workflows/deploy-manuelt.yml b/.github/workflows/deploy-manuelt.yml
@@ -9,19 +9,21 @@ on:
       environment:
         required: true
         type: choice
-        description: 'The environment to deployed to (dev|prod)'
+        description: 'Deploy to (dev|prod)-(fss|gcp)'
         options:
-          - dev
-          - prod
+          - dev-fss
+          - prod-fss
+          - dev-gcp
+          - prod-gcp
 
 jobs:
   deploy:
-    name: Deploy dev
+    name: Deploy manuelt
     permissions:
       id-token: write
     uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
     with:
       gar: true
       image: ${{ inputs.image }}
-      cluster: ${{ inputs.environment }}-fss
+      cluster: ${{ inputs.environment }}
     secrets: inherit