Merge pull request #23 from navikt/fjern-appd

MMA-7536 Sanert appdynamics

Author: joakibj

Dockerfile

@@ -1,9 +1,7 @@
-FROM ghcr.io/navikt/baseimages/temurin:21-appdynamics
-ENV APPD_ENABLED=true
+FROM ghcr.io/navikt/baseimages/temurin:21
 
 COPY target/app.jar app.jar
-COPY export-vault-secrets.sh /init-scripts/export-vault-secrets.sh
 
-ENV JAVA_OPTS="-Xmx1024m \
+ENV JAVA_OPTS="-XX:MaxRAMPercentage=75 \
                -Djava.security.egd=file:/dev/./urandom \
                -Dspring.profiles.active=nais"

export-vault-secrets.sh

@@ -48,18 +48,12 @@ spec:
           namespace: traktor
           cluster: prod-fss
   webproxy: true
-  vault:
-    enabled: true
-    paths:
-      - kvPath: {{ APPDYNAMICS }}
-        mountPath: /var/run/secrets/nais.io/appdynamics
   replicas:
     min: {{ MIN_REPLICAS }}
     max: {{ MAX_REPLICAS }}
     cpuThresholdPercentage: 50
   resources:
     requests:
-      cpu: 250m
-      memory: 256Mi
+      memory: 128Mi
     limits:
-      memory: 1024Mi
+      memory: 512Mi

nais/naiserator.yaml

@@ -16,6 +16,5 @@
   "BILAG_AZURE_SCOPE": "api://prod-fss.teamdokumenthandtering.bilag/.default",
   "BILAG_BASE_URL": "https://bilag.intern.nav.no",
   "BILAG_ENDPOINTS_BREVSERVER_URL": "https://brevserver-nais.intern.nav.no/brevweb",
-  "BILAG_ENDPOINTS_BREVSERVER_SCOPE": "api://prod-fss.teamdokumenthandtering.brevserver-nais/.default",
-  "APPDYNAMICS": "/apikey/appdynamics/prod"
+  "BILAG_ENDPOINTS_BREVSERVER_SCOPE": "api://prod-fss.teamdokumenthandtering.brevserver-nais/.default"
 }

nais/p-config.json

@@ -16,6 +16,5 @@
   "BILAG_AZURE_SCOPE": "api://dev-fss.teamdokumenthandtering.bilag-q1/.default",
   "BILAG_BASE_URL": "https://bilag-q1.dev.intern.nav.no",
   "BILAG_ENDPOINTS_BREVSERVER_URL": "https://brevserver-nais-q1.dev.intern.nav.no/brevweb",
-  "BILAG_ENDPOINTS_BREVSERVER_SCOPE": "api://dev-fss.teamdokumenthandtering.brevserver-nais-q1/.default",
-  "APPDYNAMICS": "/apikey/appdynamics/dev"
+  "BILAG_ENDPOINTS_BREVSERVER_SCOPE": "api://dev-fss.teamdokumenthandtering.brevserver-nais-q1/.default"
 }