X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcli%2Fvalues.yaml;h=58c649c326db33a124e823bf030857cbae192b5f;hb=572123717b689b6a783f96f8ba1b4b6ed55e2d26;hp=85b18388b41e009e5a1fc4bf96ffba1150fd5b40;hpb=bc1f4be02ce5478762261e63a624e946b6f23629;p=oom.git

diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
index 85b18388b4..58c649c326 100644
--- a/kubernetes/cli/values.yaml
+++ b/kubernetes/cli/values.yaml
@@ -35,40 +35,31 @@ certInitializer:
   cadi_latitude: "0.0"
   credsPath: /opt/app/osaaf/local
   aaf_add_config: |
-    echo "*** retrieving password for keystore and trustore"
-    export $(/opt/app/aaf_config/bin/agent.sh local showpass \
-      {{.Values.fqi}} {{ .Values.fqdn }} | grep '^c' | xargs -0)
-    if [ -z "$cadi_keystore_password_p12" ]
-    then
-      echo "  /!\ certificates retrieval failed"
-      exit 1
-    else
-      echo "*** transform AAF certs into pem files"
-      mkdir -p {{ .Values.credsPath }}/certs
-      keytool -exportcert -rfc -file {{ .Values.credsPath }}/certs/cacert.pem \
-        -keystore {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.trust.jks \
-        -alias ca_local_0 \
-        -storepass $cadi_truststore_password
-      openssl pkcs12 -in {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.p12 \
-        -nokeys -out {{ .Values.credsPath }}/certs/cert.pem \
-        -passin pass:$cadi_keystore_password_p12 \
-        -passout pass:$cadi_keystore_password_p12
-      echo "*** generating needed file"
-      cat {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.key \
-          {{ .Values.credsPath }}/certs/cert.pem \
-          {{ .Values.credsPath }}/certs/cacert.pem \
-          > {{ .Values.credsPath }}/certs/fullchain.pem;
-      cat {{ .Values.credsPath }}/certs/fullchain.pem
-      echo "*** change ownership of certificates to targeted user"
-      chown -R 33 {{ .Values.credsPath }}
-    fi
+    echo "*** transform AAF certs into pem files"
+    mkdir -p {{ .Values.credsPath }}/certs
+    keytool -exportcert -rfc -file {{ .Values.credsPath }}/certs/cacert.pem \
+      -keystore {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.trust.jks \
+      -alias ca_local_0 \
+      -storepass $cadi_truststore_password
+    openssl pkcs12 -in {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.p12 \
+      -nokeys -out {{ .Values.credsPath }}/certs/cert.pem \
+      -passin pass:$cadi_keystore_password_p12 \
+      -passout pass:$cadi_keystore_password_p12
+    echo "*** generating needed file"
+    cat {{ .Values.credsPath }}/{{ .Values.fqi_namespace }}.key \
+        {{ .Values.credsPath }}/certs/cert.pem \
+        {{ .Values.credsPath }}/certs/cacert.pem \
+        > {{ .Values.credsPath }}/certs/fullchain.pem;
+    cat {{ .Values.credsPath }}/certs/fullchain.pem
+    echo "*** change ownership of certificates to targeted user"
+    chown -R 33 {{ .Values.credsPath }}
 
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/cli:6.0.0
+image: onap/cli:6.0.1
 pullPolicy: Always
 flavor: small
 
@@ -99,9 +90,9 @@ service:
   type: NodePort
   name: cli
   externalPort: 443
-  externalPort1: 9090
+  externalPort1: 9443
   internalPort: "443"
-  internalPort1: 9090
+  internalPort1: 9443
   nodePort: "60"
   nodePort1: "71"
 
@@ -113,7 +104,7 @@ ingress:
       port: 443
     - baseaddr: "cli2.api"
       name: cli
-      port: 9090
+      port: 9443
   config:
     ssl: "redirect"
 
@@ -135,3 +126,9 @@ resources:
       cpu: 2
       memory: 4Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: cli
+  roles:
+    - read