Merge "Fix https config for admin portal"

diff --git a/docs/helm-search.txt b/docs/helm-search.txt
index 036ad03..c071b95 100644 (file)
--- a/docs/helm-search.txt
+++ b/docs/helm-search.txt
@@ -1,42 +1,42 @@
 NAME                   CHART VERSION   APP VERSION     DESCRIPTION                                 
-local/onap                     4.0.0           Dublin  Open Network Automation Platform (ONAP)
-local/aaf                      4.0.0                   ONAP Application Authorization Framework
-local/aai                      4.0.0                   ONAP Active and Available Inventory
-local/appc                     4.0.0                   Application Controller
-local/cassandra                4.0.0                   ONAP cassandra
-local/cds                      4.0.0                   ONAP Controller Design Studio (CDS)
-local/clamp                    4.0.0                   ONAP Clamp
-local/cli                      4.0.0                   ONAP Command Line Interface
-local/common                   4.0.0                   Common templates for inclusion in other charts
-local/consul                   4.0.0                   ONAP Consul Agent
-local/contrib                  4.0.0                   ONAP optional tools
-local/dcaegen2                 4.0.0                   ONAP DCAE Gen2
-local/dgbuilder                4.0.0                   D.G. Builder application
-local/dmaap                    4.0.1                   ONAP DMaaP components
-local/esr                      4.0.0                   ONAP External System Register
-local/log                      4.0.0                   ONAP Logging ElasticStack
-local/mariadb-galera           4.0.0                   Chart for MariaDB Galera cluster
-local/mongo                    4.0.0                   MongoDB Server
-local/msb                      4.0.0                   ONAP MicroServices Bus
-local/multicloud               4.0.0                   ONAP multicloud broker
-local/music                    4.0.0                   MUSIC - Multi-site State Coordination Service
-local/mysql                    4.0.0                   MySQL Server
-local/nbi                      4.0.0                   ONAP Northbound Interface
-local/network-name-gen         4.0.0                   Name Generation Micro Service
-local/nfs-provisioner          4.0.0                   NFS provisioner
-local/oof                      4.0.0                   ONAP Optimization Framework
-local/pnda                     4.0.0                   ONAP DCAE PNDA
-local/policy                   4.0.0                   ONAP Policy Administration Point
-local/pomba                    4.0.0                   ONAP Post Orchestration Model Based Audit
-local/portal                   4.0.0                   ONAP Web Portal
-local/postgres                 4.0.0                   ONAP Postgres Server
-local/robot                    4.0.0                   A helm Chart for kubernetes-ONAP Robot
-local/sdc                      4.0.0                   Service Design and Creation Umbrella Helm charts
-local/sdnc                     4.0.0                   SDN Controller
-local/sdnc-prom                4.0.0                   ONAP SDNC Policy Driven Ownership Management
-local/sniro-emulator           4.0.0                   ONAP Mock Sniro Emulator
-local/so                       4.0.0                   ONAP Service Orchestrator
-local/uui                      4.0.0                   ONAP uui
-local/vfc                      4.0.0                   ONAP Virtual Function Controller (VF-C)
-local/vid                      4.0.0                   ONAP Virtual Infrastructure Deployment
-local/vnfsdk                   4.0.0                   ONAP VNF SDK
\ No newline at end of file
+local/onap                     5.0.0           Dublin  Open Network Automation Platform (ONAP)
+local/aaf                      5.0.0                   ONAP Application Authorization Framework
+local/aai                      5.0.0                   ONAP Active and Available Inventory
+local/appc                     5.0.0                   Application Controller
+local/cassandra                5.0.0                   ONAP cassandra
+local/cds                      5.0.0                   ONAP Controller Design Studio (CDS)
+local/clamp                    5.0.0                   ONAP Clamp
+local/cli                      5.0.0                   ONAP Command Line Interface
+local/common                   5.0.0                   Common templates for inclusion in other charts
+local/consul                   5.0.0                   ONAP Consul Agent
+local/contrib                  5.0.0                   ONAP optional tools
+local/dcaegen2                 5.0.0                   ONAP DCAE Gen2
+local/dgbuilder                5.0.0                   D.G. Builder application
+local/dmaap                    5.0.0                   ONAP DMaaP components
+local/esr                      5.0.0                   ONAP External System Register
+local/log                      5.0.0                   ONAP Logging ElasticStack
+local/mariadb-galera           5.0.0                   Chart for MariaDB Galera cluster
+local/mongo                    5.0.0                   MongoDB Server
+local/msb                      5.0.0                   ONAP MicroServices Bus
+local/multicloud               5.0.0                   ONAP multicloud broker
+local/music                    5.0.0                   MUSIC - Multi-site State Coordination Service
+local/mysql                    5.0.0                   MySQL Server
+local/nbi                      5.0.0                   ONAP Northbound Interface
+local/network-name-gen         5.0.0                   Name Generation Micro Service
+local/nfs-provisioner          5.0.0                   NFS provisioner
+local/oof                      5.0.0                   ONAP Optimization Framework
+local/pnda                     5.0.0                   ONAP DCAE PNDA
+local/policy                   5.0.0                   ONAP Policy Administration Point
+local/pomba                    5.0.0                   ONAP Post Orchestration Model Based Audit
+local/portal                   5.0.0                   ONAP Web Portal
+local/postgres                 5.0.0                   ONAP Postgres Server
+local/robot                    5.0.0                   A helm Chart for kubernetes-ONAP Robot
+local/sdc                      5.0.0                   Service Design and Creation Umbrella Helm charts
+local/sdnc                     5.0.0                   SDN Controller
+local/sdnc-prom                5.0.0                   ONAP SDNC Policy Driven Ownership Management
+local/sniro-emulator           5.0.0                   ONAP Mock Sniro Emulator
+local/so                       5.0.0                   ONAP Service Orchestrator
+local/uui                      5.0.0                   ONAP uui
+local/vfc                      5.0.0                   ONAP Virtual Function Controller (VF-C)
+local/vid                      5.0.0                   ONAP Virtual Infrastructure Deployment
+local/vnfsdk                   5.0.0                   ONAP VNF SDK
\ No newline at end of file

diff --git a/docs/oom_cloud_setup_guide.rst b/docs/oom_cloud_setup_guide.rst
index 1ce260e..899f0d7 100644 (file)
--- a/docs/oom_cloud_setup_guide.rst
+++ b/docs/oom_cloud_setup_guide.rst
@@ -52,6 +52,7 @@ The versions of Kubernetes that are supported by OOM are as follows:
   beijing            1.8.10       2.8.2   1.8.10    17.03.x
   casablanca         1.11.5       2.9.1   1.11.5    17.03.x
   dublin             1.13.5       2.12.3  1.13.5    18.09.5
+  el alto            1.15.2       2.14.2  1.15.2    18.09.x
   ==============     ===========  ======  ========  ========
 
 Minimum Hardware Configuration

diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index bd5e3ee..2399dc3 100644 (file)
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -17,9 +17,13 @@ available), follow the following instructions to deploy ONAP.
 
 **Step 1.** Clone the OOM repository from ONAP gerrit::
 
-  > git clone -b 4.0.0-ONAP http://gerrit.onap.org/r/oom --recurse-submodules
+  > git clone -b <BRANCH> http://gerrit.onap.org/r/oom --recurse-submodules
   > cd oom/kubernetes
 
+where <BRANCH> can be an offical release tag, such as
+4.0.0-ONAP for Dublin
+5.0.1-ONAP for El Alto
+
 **Step 2.** Install Helm Plugins required to deploy ONAP::
 
   > sudo cp -R ~/oom/kubernetes/helm/plugins/ ~/.helm

diff --git a/docs/oom_setup_kubernetes_rancher.rst b/docs/oom_setup_kubernetes_rancher.rst
index 90a060b..f703c06 100644 (file)
--- a/docs/oom_setup_kubernetes_rancher.rst
+++ b/docs/oom_setup_kubernetes_rancher.rst
@@ -301,8 +301,8 @@ Install Kubectl
 
 Download and install kubectl. Binaries can be found here for Linux and Mac:
 
-https://storage.googleapis.com/kubernetes-release/release/v1.13.5/bin/linux/amd64/kubectl
-https://storage.googleapis.com/kubernetes-release/release/v1.13.5/bin/darwin/amd64/kubectl
+https://storage.googleapis.com/kubernetes-release/release/v1.15.2/bin/linux/amd64/kubectl
+https://storage.googleapis.com/kubernetes-release/release/v1.15.2/bin/darwin/amd64/kubectl
 
 Validate deployment
 -------------------
@@ -320,21 +320,21 @@ Validate deployment
 ::
 
   NAME             STATUS   ROLES               AGE     VERSION   INTERNAL-IP   EXTERNAL-IP   OS-IMAGE           KERNEL-VERSION      CONTAINER-RUNTIME
-  onap-control-1   Ready    controlplane,etcd   3h53m   v1.13.5   10.0.0.8      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-control-2   Ready    controlplane,etcd   3h53m   v1.13.5   10.0.0.11     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-control-3   Ready    controlplane,etcd   3h53m   v1.13.5   10.0.0.12     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-1       Ready    worker              3h53m   v1.13.5   10.0.0.14     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-10      Ready    worker              3h53m   v1.13.5   10.0.0.16     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-11      Ready    worker              3h53m   v1.13.5   10.0.0.18     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-12      Ready    worker              3h53m   v1.13.5   10.0.0.7      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-2       Ready    worker              3h53m   v1.13.5   10.0.0.26     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-3       Ready    worker              3h53m   v1.13.5   10.0.0.5      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-4       Ready    worker              3h53m   v1.13.5   10.0.0.6      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-5       Ready    worker              3h53m   v1.13.5   10.0.0.9      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-6       Ready    worker              3h53m   v1.13.5   10.0.0.17     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-7       Ready    worker              3h53m   v1.13.5   10.0.0.20     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-8       Ready    worker              3h53m   v1.13.5   10.0.0.10     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
-  onap-k8s-9       Ready    worker              3h53m   v1.13.5   10.0.0.4      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-control-1   Ready    controlplane,etcd   3h53m   v1.15.2   10.0.0.8      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-control-2   Ready    controlplane,etcd   3h53m   v1.15.2   10.0.0.11     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-control-3   Ready    controlplane,etcd   3h53m   v1.15.2   10.0.0.12     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-1       Ready    worker              3h53m   v1.15.2   10.0.0.14     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-10      Ready    worker              3h53m   v1.15.2   10.0.0.16     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-11      Ready    worker              3h53m   v1.15.2   10.0.0.18     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-12      Ready    worker              3h53m   v1.15.2   10.0.0.7      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-2       Ready    worker              3h53m   v1.15.2   10.0.0.26     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-3       Ready    worker              3h53m   v1.15.2   10.0.0.5      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-4       Ready    worker              3h53m   v1.15.2   10.0.0.6      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-5       Ready    worker              3h53m   v1.15.2   10.0.0.9      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-6       Ready    worker              3h53m   v1.15.2   10.0.0.17     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-7       Ready    worker              3h53m   v1.15.2   10.0.0.20     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-8       Ready    worker              3h53m   v1.15.2   10.0.0.10     <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
+  onap-k8s-9       Ready    worker              3h53m   v1.15.2   10.0.0.4      <none>        Ubuntu 18.04 LTS   4.15.0-22-generic   docker://18.9.5
 
 
 Install Helm
@@ -342,9 +342,9 @@ Install Helm
 
 Example Helm client install on Linux::
 
-  > wget http://storage.googleapis.com/kubernetes-helm/helm-v2.12.3-linux-amd64.tar.gz
+  > wget http://storage.googleapis.com/kubernetes-helm/helm-v2.14.2-linux-amd64.tar.gz
 
-  > tar -zxvf helm-v2.12.3-linux-amd64.tar.gz
+  > tar -zxvf helm-v2.14.2-linux-amd64.tar.gz
 
   > sudo mv linux-amd64/helm /usr/local/bin/helm
 

diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index f078bd1..e568996 100644 (file)
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -37,7 +37,7 @@ debugEnabled: false
 config:
   cluster_domain: cluster.local
   heap:
-    max: 512M
+    max: 2048M
     min: 100M
   jvmOpts: -Dcassandra.consistent.rangemovement=false
   clusterName: cassandra

diff --git a/kubernetes/modeling/charts/modeling-genericparser/.helmignore b/kubernetes/modeling/charts/modeling-etsicatalog/.helmignore
similarity index 100%
rename from kubernetes/modeling/charts/modeling-genericparser/.helmignore
rename to kubernetes/modeling/charts/modeling-etsicatalog/.helmignore

diff --git a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/Chart.yaml
similarity index 87%
rename from kubernetes/modeling/charts/modeling-genericparser/Chart.yaml
rename to kubernetes/modeling/charts/modeling-etsicatalog/Chart.yaml
index d5f20be..58173cf 100644 (file)
--- a/kubernetes/modeling/charts/modeling-genericparser/Chart.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/Chart.yaml
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 apiVersion: v1
-description: ONAP Modeling - Genericparser
-name: modeling-genericparser
+description: ONAP Modeling - Etsicatalog
+name: modeling-etsicatalog
 version: 5.0.0
\ No newline at end of file

diff --git a/kubernetes/modeling/charts/modeling-genericparser/resources/config/logging/log.yml b/kubernetes/modeling/charts/modeling-etsicatalog/resources/config/logging/log.yml
similarity index 77%
rename from kubernetes/modeling/charts/modeling-genericparser/resources/config/logging/log.yml
rename to kubernetes/modeling/charts/modeling-etsicatalog/resources/config/logging/log.yml
index 1c4cf6c..5ac5fef 100644 (file)
--- a/kubernetes/modeling/charts/modeling-genericparser/resources/config/logging/log.yml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/resources/config/logging/log.yml
@@ -2,29 +2,33 @@ version: 1
 disable_existing_loggers: False
 
 loggers:
-    gengricparser:
-        handlers: [gengricparserlocal_handler, gengricparser_handler]
+    catalog:
+        handlers: [cataloglocal_handler, catalog_handler]
         level: "DEBUG"
         propagate: False
     django:
         handlers: [django_handler]
         level: "DEBUG"
         propagate: False
+    tosca:
+        handlers: [cataloglocal_handler, catalog_handler]
+        level: "DEBUG"
+        propagate: False
 handlers:
-    gengricparserlocal_handler:
+    cataloglocal_handler:
         level: "DEBUG"
         class:
             "logging.handlers.RotatingFileHandler"
-        filename: "logs/runtime_gengricparser.log"
+        filename: "logs/runtime_catalog.log"
         formatter:
             "standard"
         maxBytes: 52428800
         backupCount: 10
-    gengricparser_handler:
+    catalog_handler:
         level: "DEBUG"
         class:
             "logging.handlers.RotatingFileHandler"
-        filename: "/var/log/onap/modeling/genericparser/runtime_gengricparser.log"
+        filename: "/var/log/onap/modeling/etsicatalog/runtime_catalog.log"
         formatter:
             "mdcFormat"
         maxBytes: 52428800

diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/configmap.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/configmap.yaml
similarity index 100%
rename from kubernetes/modeling/charts/modeling-genericparser/templates/configmap.yaml
rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/configmap.yaml

diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/deployment.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
similarity index 95%
rename from kubernetes/modeling/charts/modeling-genericparser/templates/deployment.yaml
rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
index b61cd87..08d5e13 100644 (file)
--- a/kubernetes/modeling/charts/modeling-genericparser/templates/deployment.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/deployment.yaml
@@ -77,15 +77,15 @@ spec:
             - name: REDIS_ADDR
               value: "{{ .Values.global.config.redisServiceName }}:{{ .Values.global.config.redisPort }}"
           volumeMounts:
-          - name: {{ include "common.fullname" . }}-genericparser
-            mountPath: /service/modeling/genericparser/static
+          - name: {{ include "common.fullname" . }}-etsicatalog
+            mountPath: /service/modeling/etsicatalog/static
           - name: {{ include "common.fullname" . }}-localtime
             mountPath: /etc/localtime
             readOnly: true
           - name: {{ include "common.fullname" . }}-logs
             mountPath: /var/log/onap
           - name: {{ include "common.fullname" . }}-logconfig
-            mountPath: /opt/modeling/genericparser/config/log.yml
+            mountPath: /opt/modeling/etsicatalog/config/log.yml
             subPath: log.yml
           resources:
 {{ include "common.resources" . | indent 12 }}
@@ -112,7 +112,7 @@ spec:
             mountPath: /usr/share/filebeat/data
 
       volumes:
-        - name: {{ include "common.fullname" . }}-genericparser
+        - name: {{ include "common.fullname" . }}-etsicatalog
         {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ include "common.fullname" . }}

diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/pv.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/pv.yaml
similarity index 100%
rename from kubernetes/modeling/charts/modeling-genericparser/templates/pv.yaml
rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/pv.yaml

diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/pvc.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/pvc.yaml
similarity index 100%
rename from kubernetes/modeling/charts/modeling-genericparser/templates/pvc.yaml
rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/pvc.yaml

diff --git a/kubernetes/modeling/charts/modeling-genericparser/templates/service.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/templates/service.yaml
similarity index 90%
rename from kubernetes/modeling/charts/modeling-genericparser/templates/service.yaml
rename to kubernetes/modeling/charts/modeling-etsicatalog/templates/service.yaml
index c69be57..217e6af 100644 (file)
--- a/kubernetes/modeling/charts/modeling-genericparser/templates/service.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/templates/service.yaml
@@ -31,6 +31,14 @@ metadata:
           "protocol": "REST",
           "port": "{{.Values.service.externalPort}}",
           "visualRange":"1"
+      }
+      {
+          "serviceName": "etsicatalog",
+          "version": "v1",
+          "url": "/api/catalog/v1",
+          "protocol": "REST",
+          "port": "{{.Values.service.externalPort}}",
+          "visualRange":"1"
       }
          {
           "serviceName": "nsd",

diff --git a/kubernetes/modeling/charts/modeling-genericparser/values.yaml b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
similarity index 95%
rename from kubernetes/modeling/charts/modeling-genericparser/values.yaml
rename to kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
index 467d731..3217389 100644 (file)
--- a/kubernetes/modeling/charts/modeling-genericparser/values.yaml
+++ b/kubernetes/modeling/charts/modeling-etsicatalog/values.yaml
@@ -29,7 +29,7 @@ global:
 flavor: small
 
 repository: nexus3.onap.org:10001
-image: onap/modeling/genericparser:1.0.2
+image: onap/modeling/etsicatalog:1.0.4
 pullPolicy: Always
 
 #Istio sidecar injection policy
@@ -79,12 +79,12 @@ persistence:
   accessMode: ReadWriteOnce
   size: 2Gi
   mountPath: /dockerdata-nfs
-  mountSubPath: modeling/genericparser
+  mountSubPath: modeling/etsicatalog
 
 service:
   type: ClusterIP
-  name: modeling-genericparser
-  portName: modeling-genericparser
+  name: modeling-etsicatalog
+  portName: modeling-etsicatalog
   externalPort: 8806
   internalPort: 8806
 #  nodePort: 30806

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 426b3ef..9fd0789 100644 (file)
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -20,7 +20,7 @@ global:
   nodePortPrefix: 302
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
-  artifactImage: onap/multicloud/framework-artifactbroker:1.4.1
+  artifactImage: onap/multicloud/framework-artifactbroker:1.4.2
   prometheus:
     enabled: false
 
@@ -29,7 +29,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/multicloud/framework:1.4.1
+image: onap/multicloud/framework:1.4.2
 pullPolicy: Always
 
 #Istio sidecar injection policy

diff --git a/kubernetes/onap/resources/environments/public-cloud.yaml b/kubernetes/onap/resources/environments/public-cloud.yaml
index 2d4360c..3062e4e 100644 (file)
--- a/kubernetes/onap/resources/environments/public-cloud.yaml
+++ b/kubernetes/onap/resources/environments/public-cloud.yaml
@@ -95,11 +95,24 @@ portal:
     readiness:
       initialDelaySeconds: 60
 sdc:
+  sdc-fe:
+    liveness:
+      initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
+    readiness:
+      initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
   sdc-be:
     liveness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
     readiness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
   sdc-cs:
     liveness:
       initialDelaySeconds: 120
@@ -107,14 +120,18 @@ sdc:
       initialDelaySeconds: 120
   sdc-es:
     liveness:
-      initialDelaySeconds: 60
+      initialDelaySeconds: 120
     readiness:
       initialDelaySeconds: 120
   sdc-onboarding-be:
     liveness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
     readiness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
 sdnc:
   liveness:
     initialDelaySeconds: 60

diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml
index 75ce8e5..2788e24 100644 (file)
--- a/kubernetes/onap/resources/overrides/environment.yaml
+++ b/kubernetes/onap/resources/overrides/environment.yaml
@@ -157,11 +157,24 @@ portal:
     readiness:
       periodSeconds: 60
 sdc:
+  sdc-fe:
+    liveness:
+      initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
+    readiness:
+      initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
   sdc-be:
     liveness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
     readiness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
   sdc-cs:
     liveness:
       initialDelaySeconds: 120
@@ -177,8 +190,12 @@ sdc:
   sdc-onboarding-be:
     liveness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
     readiness:
       initialDelaySeconds: 120
+      periodSeconds: 60
+      timeoutSeconds: 15
 sdnc:
   liveness:
     initialDelaySeconds: 60

diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
index 0786144..7ef1e02 100644 (file)
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx.yaml
@@ -68,6 +68,16 @@ sdnc:
   enabled: true
 so:
   enabled: true
+  so-monitoring:
+      enabled: true
+      ingress:
+          enabled: true
+          service:
+              - path: "/so-monitoring"
+                name: "so-monitoring"
+                port: 9091
+          annotations:
+            nginx.ingress.kubernetes.io/ssl-redirect: "false"
 uui:
   enabled: true
 vfc:
@@ -75,8 +85,15 @@ vfc:
 vid:
   enabled: true
   ingress:
-      enabled: true
+   enabled: true
+   service:
+       - path: "/vid"
+         name: "vid-http"
+         port: 8080
+   annotations:
+         nginx.ingress.kubernetes.io/ssl-redirect: "false"
 vnfsdk:
   enabled: true
 nginx-ingress:
     enabled: true
+

diff --git a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
index 62dffd6..ee4da9b 100644 (file)
--- a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
@@ -73,12 +73,14 @@ spec:
               port: {{ .Values.service.internalPort2 }}
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           {{ end }}
           readinessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort2 }}
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           resources:
 {{ include "common.resources" . | indent 12 }}
           env:

diff --git a/kubernetes/sdc/charts/sdc-fe/values.yaml b/kubernetes/sdc/charts/sdc-fe/values.yaml
index 6831555..8878f1a 100644 (file)
--- a/kubernetes/sdc/charts/sdc-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/values.yaml
@@ -51,14 +51,16 @@ affinity: {}
 # probe configuration parameters
 liveness:
   initialDelaySeconds: 10
-  periodSeconds: 10
+  periodSeconds: 60
+  timeoutSeconds: 15
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
   initialDelaySeconds: 10
-  periodSeconds: 10
+  periodSeconds: 60
+  timeoutSeconds: 15
 
 service:
   #Example service definition with external, internal and node ports.

diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
index 70895d3..dee139b 100644 (file)
--- a/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/templates/deployment.yaml
@@ -60,6 +60,7 @@ spec:
               - "/var/lib/ready-probe.sh"
             initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
             periodSeconds: {{ .Values.liveness.periodSeconds }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           {{ end }}
           readinessProbe:
             exec:
@@ -67,6 +68,7 @@ spec:
               - "/var/lib/ready-probe.sh"
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
+            timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
           resources:
 {{ include "common.resources" . | indent 12 }}
           env:

diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
index ce04d48..a6a3f6b 100644 (file)
--- a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
@@ -48,15 +48,17 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 60
-  periodSeconds: 10
+  initialDelaySeconds: 120
+  periodSeconds: 60
+  timeoutSeconds: 15
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 60
-  periodSeconds: 10
+  initialDelaySeconds: 120
+  periodSeconds: 60
+  timeoutSeconds: 15
 
 service:
   type: ClusterIP

diff --git a/kubernetes/vid/resources/certs/org.onap.vid.jks b/kubernetes/vid/resources/certs/org.onap.vid.jks
index 3c2ce91..2b9338d 100644 (file)
Binary files a/kubernetes/vid/resources/certs/org.onap.vid.jks and b/kubernetes/vid/resources/certs/org.onap.vid.jks differ

diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index cd24150..9221af7 100644 (file)
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -94,6 +94,10 @@ spec:
               value: "{{ .Values.config.roleaccesscentralized }}"
             - name: VID_CONTACT_US_LINK
               value: "{{ .Values.config.vidcontactuslink }}"
+            - name: VID_KEYSTORE_PASSWORD
+              value: {{ .Values.config.vidkeystorepassword | quote }}
+            - name: CATALINA_OPTS
+              value: "-Dvid.keystore.password=$(VID_KEYSTORE_PASSWORD) -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=/opt/app/vid/etc/org.onap.vid.jks -Dcom.att.eelf.logging.file=logback.xml -Dcom.att.eelf.logging.path=/tmp"
             - name: VID_UEB_URL_LIST
               value: message-router.{{ include "common.namespace" . }}
             - name: VID_MYSQL_HOST

diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 9c44565..6100277 100644 (file)
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -36,6 +36,7 @@ mariadb_image: library/mariadb:10
 # application configuration
 config:
   vidmysqlpassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+  vidkeystorepassword: '\^7w\!f+aR\{EJcTRsDuA7x\,+c\!'
   asdcclientrestauth: "Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
   asdcclientrestport: "8443"
   vidaaiport: "8443"