diff options
| -rw-r--r-- | docs/helm-search.txt | 82 | ||||
| -rw-r--r-- | docs/oom_cloud_setup_guide.rst | 1 | ||||
| -rw-r--r-- | docs/oom_quickstart_guide.rst | 6 | ||||
| -rw-r--r-- | docs/oom_setup_kubernetes_rancher.rst | 38 | ||||
| -rw-r--r-- | kubernetes/common/cassandra/values.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/vid/resources/certs/org.onap.vid.jks | bin | 3576 -> 3612 bytes | |||
| -rw-r--r-- | kubernetes/vid/templates/deployment.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/vid/values.yaml | 1 |
8 files changed, 72 insertions, 62 deletions
diff --git a/docs/helm-search.txt b/docs/helm-search.txt index 036ad036f2..c071b95f4b 100644 --- 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 1ce260efbf..899f0d7e65 100644 --- 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 bd5e3eeee6..2399dc3c7e 100644 --- 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 90a060b592..f703c068b3 100644 --- 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 f078bd17ce..e568996b15 100644 --- 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/vid/resources/certs/org.onap.vid.jks b/kubernetes/vid/resources/certs/org.onap.vid.jks Binary files differindex 3c2ce9157d..2b9338dc74 100644 --- a/kubernetes/vid/resources/certs/org.onap.vid.jks +++ b/kubernetes/vid/resources/certs/org.onap.vid.jks diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml index cd24150c4f..9221af7dcf 100644 --- 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 9c445659cb..61002778fd 100644 --- 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" |