Flyttet innhenting av appdynamics konfig til en felles vault kilde. (#404)

* Flyttet innhenting av appdynamics konfig til en felles vault kilde.
* Fikser feil at man kan ikke mounte flere vault secrets under samme path
* Fisker appdynamics innhenting

Author: mrsladek

.deploy/dev-fss-q0.yaml

@@ -45,6 +45,8 @@ spec:
         kvPath: serviceuser/data/dev/srvfpabakus
       - mountPath: /var/run/secrets/nais.io/vault
         kvPath: /kv/preprod/fss/fpabakus/q0
+      - mountPath: /var/run/secrets/nais.io/appdynamics
+        kvPath: /apikey/appdynamics/dev
   env:
     - name: LOADBALANCER_FQDN
       value: fpabakus-q0.nais.preprod.local
@@ -69,9 +71,6 @@ spec:
       value: b27apvl00045.preprod.local:8443,b27apvl00046.preprod.local:8443,b27apvl00047.preprod.local:8443
     - name: KAFKA_SCHEMA_REGISTRY_URL
       value: https://kafka-test-schema-registry.nais.preprod.local
-    #Appdynamics (mer i Dockerfile)
-    - name: APPDYNAMICS_AGENT_ACCOUNT_NAME
-      value: NON-PROD
     # Eksterne systemer
     - name: HENTINNTEKTLISTEBOLK_URL
       value: https://app-q0.adeo.no/inntektskomponenten-ws/rs/api/v1/hentinntektlistebolk

.deploy/dev-fss-q1.yaml

@@ -45,6 +45,8 @@ spec:
         kvPath: serviceuser/data/dev/srvfpabakus
       - mountPath: /var/run/secrets/nais.io/vault
         kvPath: /kv/preprod/fss/fpabakus/q1
+      - mountPath: /var/run/secrets/nais.io/appdynamics
+        kvPath: /apikey/appdynamics/dev
   env:
     - name: LOADBALANCER_FQDN
       value: fpabakus-q1.nais.preprod.local
@@ -69,9 +71,6 @@ spec:
       value: b27apvl00045.preprod.local:8443,b27apvl00046.preprod.local:8443,b27apvl00047.preprod.local:8443
     - name: KAFKA_SCHEMA_REGISTRY_URL
       value: https://kafka-test-schema-registry.nais.preprod.local
-    #Appdynamics (mer i Dockerfile)
-    - name: APPDYNAMICS_AGENT_ACCOUNT_NAME
-      value: NON-PROD
     #Eksterne systemer
     - name: HENTINNTEKTLISTEBOLK_URL
       value: https://app-q1.adeo.no/inntektskomponenten-ws/rs/api/v1/hentinntektlistebolk

.deploy/dev-fss-t4.yaml

@@ -45,6 +45,8 @@ spec:
         kvPath: serviceuser/data/test/srvfpabakus
       - mountPath: /var/run/secrets/nais.io/vault
         kvPath: /kv/preprod/fss/fpabakus/t4
+      - mountPath: /var/run/secrets/nais.io/appdynamics
+        kvPath: /apikey/appdynamics/dev
   env:
     - name: LOADBALANCER_FQDN
       value: fpabakus-t4.nais.preprod.local
@@ -69,9 +71,6 @@ spec:
       value: 26apvl00159.test.local:8443,d26apvl00160.test.local:8443,d26apvl00161.test.local:8443
     - name: KAFKA_SCHEMA_REGISTRY_URL
       value: https://kafka-test-schema-registry.nais.preprod.local
-    #Appdynamics (mer i Dockerfile)
-    - name: APPDYNAMICS_AGENT_ACCOUNT_NAME
-      value: NON-PROD
     # Eksterne systemer
     - name: HENTINNTEKTLISTEBOLK_URL
       value: https://app-t4.adeo.no/inntektskomponenten-ws/rs/api/v1/hentinntektlistebolk

.deploy/prod-fss-default.yaml

@@ -45,6 +45,8 @@ spec:
         kvPath: serviceuser/data/prod/srvfpabakus
       - mountPath: /var/run/secrets/nais.io/vault
         kvPath: /kv/prod/fss/fpabakus/default
+      - mountPath: /var/run/secrets/nais.io/appdynamics
+        kvPath: /apikey/appdynamics/prod
   env:
     - name: LOADBALANCER_FQDN
       value: fpabakus.nais.adeo.no
@@ -69,9 +71,6 @@ spec:
       value: a01apvl00145.adeo.no:8443,a01apvl00146.adeo.no:8443,a01apvl00147.adeo.no:8443,a01apvl00148.adeo.no:8443,a01apvl00149.adeo.no:8443,a01apvl00150.adeo.no:8443
     - name: KAFKA_SCHEMA_REGISTRY_URL
       value: http://kafka-schema-registry.tpa:8081
-    #Appdynamics (mer i Dockerfile)
-    - name: APPDYNAMICS_AGENT_ACCOUNT_NAME
-      value: PROD
     # Eksterne systemer
     - name: HENTINNTEKTLISTEBOLK_URL
       value: https://app.adeo.no/inntektskomponenten-ws/rs/api/v1/hentinntektlistebolk

.scripts/03-import-appdynamics.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env sh
+
+if test -d /var/run/secrets/nais.io/appdynamics;
+then
+    for FILE in /var/run/secrets/nais.io/appdynamics/*.env
+    do
+        _oldIFS=$IFS
+        IFS='
+'
+        for line in $(cat "$FILE"); do
+            _key=${line%%=*}
+            _val=${line#*=}
+
+            if test "$_key" != "$line"
+            then
+                echo "- exporting $_key"
+            else
+                echo "- (warn) exporting contents of $FILE which is not formatted as KEY=VALUE"
+            fi
+
+            export "$_key"="$(echo "$_val"|sed -e "s/^['\"]//" -e "s/['\"]$//")"
+        done
+        IFS=$_oldIFS
+    done
+fi

export-vault.sh .scripts/03-import-users.sh

@@ -1,8 +1,5 @@
 FROM navikt/java:11-appdynamics
 ENV APPD_ENABLED=true
-ENV APPDYNAMICS_CONTROLLER_HOST_NAME=appdynamics.adeo.no
-ENV APPDYNAMICS_CONTROLLER_PORT=443
-ENV APPDYNAMICS_CONTROLLER_SSL_ENABLED=true
 
 RUN mkdir lib
 RUN mkdir webapp
@@ -20,4 +17,5 @@ ENV JAVA_OPTS="-Xmx1024m -Xms128m \
     -Dlogback.configurationFile=conf/logback.xml"
 
 # Export vault properties
-COPY export-vault.sh /init-scripts/export-vault.sh
+COPY .scripts/03-import-appdynamics.sh /init-scripts/03-import-appdynamics.sh
+COPY .scripts/05-import-users.sh /init-scripts/05-import-users.sh