Rydder opp java opts som ligger i baseimage. Ny felles. (#2040)

navikt · Dec 12, 2023 · 160fcf7 · 160fcf7
1 parent 096a44a
commit 160fcf7
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 9 deletions.
diff --git a/.deploy/dev-fss-teamforeldrepenger.json b/.deploy/dev-fss-teamforeldrepenger.json
@@ -11,6 +11,14 @@
   ],
   "minReplica": "2",
   "maxReplica": "2",
+  "limits": {
+    "cpu": "1",
+    "mem": "2048Mi"
+  },
+  "requests": {
+    "cpu": "200m",
+    "mem": "1024Mi"
+  },
   "env": {
     "APPD_ENABLED": "false"
   },

diff --git a/.deploy/naiserator.yaml b/.deploy/naiserator.yaml
@@ -38,11 +38,11 @@ spec:
         thresholdPercentage: 80
   resources:
     limits:
-      cpu: 2000m
-      memory: 2560Mi
+      cpu: "{{limits.cpu}}"
+      memory: "{{limits.mem}}"
     requests:
-      cpu: 500m
-      memory: 1536Mi
+      cpu: "{{requests.cpu}}"
+      memory: "{{requests.mem}}"
   kafka:
       pool: {{kafkaPool}}
   vault:

diff --git a/.deploy/prod-fss-teamforeldrepenger.json b/.deploy/prod-fss-teamforeldrepenger.json
@@ -11,6 +11,14 @@
   ],
   "minReplica": "2",
   "maxReplica": "3",
+  "limits": {
+    "cpu": "2",
+    "mem": "3072Mi"
+  },
+  "requests": {
+    "cpu": "500m",
+    "mem": "1536Mi"
+  },
   "env": {
     "APPD_ENABLED": "true"
   },

diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
@@ -0,0 +1,16 @@
+name: Dependency Submission
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "pom.xml"
+      - "**/pom.xml"
+  workflow_dispatch:
+
+jobs:
+  deps:
+    permissions:
+      contents: write
+    uses: navikt/fp-gha-workflows/.github/workflows/mvn-dependency-submission.yml@main
+    secrets: inherit
diff --git a/Dockerfile b/Dockerfile
@@ -6,10 +6,7 @@ ENV TZ=Europe/Oslo
 RUN mkdir lib
 RUN mkdir conf
 
-ENV JAVA_OPTS="-XX:MaxRAMPercentage=75 \
-                -XX:+PrintCommandLineFlags \
-                -Djava.security.egd=file:/dev/urandom \
-                -Duser.timezone=Europe/Oslo \
+ENV JAVA_OPTS="-Djava.security.egd=file:/dev/urandom \
                 -Dlogback.configurationFile=conf/logback.xml"
 
 # Config

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
         <sonar.projectKey>navikt_fplos</sonar.projectKey>
 
         <fp-kontrakter.version>9.0.2</fp-kontrakter.version>
-        <felles.version>7.0.2</felles.version>
+        <felles.version>7.0.3</felles.version>
         <prosesstask.version>5.0.2</prosesstask.version>
     </properties>