[SDNC] Simplify cert retrieval script

[oom.git] / kubernetes / sdnc / components / sdnc-web / values.yaml

diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index eafb3f2..979698f 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -23,16 +23,21 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: "onap/sdnc-web-image:2.2.1"
+image: "onap/sdnc-web-image:2.4.1"
 pullPolicy: Always
 
 config:
   sdncChartName: sdnc
   webProtocol: HTTPS
+  webPlainProtocol: HTTP
   webPort: 8443
+  webPlainPort: 8080
   sdnrProtocol: https
+  sdnrPlainProtocol: http
   sdnrHost: "sdnc"
+  sdnrPlainHost: "sdnc"
   sdnrPort: "8443"
+  sdnrPlainPort : "8080"
   sslCertDir: "/opt/app/osaaf/local/certs"
   sslCertiticate: "cert.pem"
   sslCertKey: "key.pem"
@@ -64,14 +69,13 @@ certInitializer:
   cadi_latitude: "38.0"
   cadi_longitude: "-72.0"
   credsPath: /opt/app/osaaf/local
-  aaf_add_config: >
-    cd /opt/app/osaaf/local;
-    mkdir -p certs;
-    export $(/opt/app/aaf_config/bin/agent.sh local showpass | grep '^c' | xargs -0);
-    keytool -exportcert -rfc -file certs/cacert.pem -keystore {{ .Values.fqi_namespace }}.trust.jks -alias ca_local_0 -storepass $cadi_truststore_password;
-    openssl pkcs12 -in {{ .Values.fqi_namespace }}.p12 -out certs/cert.pem -passin pass:$cadi_keystore_password_p12 -passout pass:$cadi_keystore_password_p12;
-    cp {{ .Values.fqi_namespace }}.key certs/key.pem;
-    chmod -R 755 certs;
+  aaf_add_config: |
+    cd /opt/app/osaaf/local
+    mkdir -p certs
+    keytool -exportcert -rfc -file certs/cacert.pem -keystore {{ .Values.fqi_namespace }}.trust.jks -alias ca_local_0 -storepass $cadi_truststore_password
+    openssl pkcs12 -in {{ .Values.fqi_namespace }}.p12 -out certs/cert.pem -passin pass:$cadi_keystore_password_p12 -passout pass:$cadi_keystore_password_p12
+    cp {{ .Values.fqi_namespace }}.key certs/key.pem
+    chmod -R 755 certs
 
 # default number of instances
 replicaCount: 1
@@ -100,9 +104,12 @@ service:
   # for liveness and readiness probe only
   # internalPort:
   internalPort: 8443
+  internalPlainPort: 8080
   ports:
-  - name: "sdnc-web"
+  - name: http-sdnc-web
     port: "8443"
+    plain_port: "8080"
+    port_protocol: http
     nodePort: "05"
 
 #ingress: