Merge "[DCAE] Remove topic provisioning config for PM-Mapper"
diff --git a/docs/helm/helm-search.txt b/docs/helm/helm-search.txt
index 4e357b6..75c2749 100644
--- a/docs/helm/helm-search.txt
+++ b/docs/helm/helm-search.txt
@@ -1,42 +1,42 @@
NAME CHART VERSION APP VERSION DESCRIPTION
-local/onap 10.0.0 Jakarta Open Network Automation Platform (ONAP)
-local/aaf 10.0.0 ONAP Application Authorization Framework
-local/aai 10.0.0 ONAP Active and Available Inventory
-local/appc 10.0.0 Application Controller
-local/cassandra 10.0.0 ONAP cassandra
-local/cds 10.0.0 ONAP Controller Design Studio (CDS)
-local/clamp 10.0.0 ONAP Clamp
-local/cli 10.0.0 ONAP Command Line Interface
-local/common 10.0.0 Common templates for inclusion in other charts
-local/consul 10.0.0 ONAP Consul Agent
-local/contrib 10.0.0 ONAP optional tools
-local/cps 10.0.0 ONAP Configuration Persistene Service (CPS)
-local/dcaegen2 10.0.0 ONAP DCAE Gen2
-local/dgbuilder 10.0.0 D.G. Builder application
-local/dmaap 10.0.0 ONAP DMaaP components
-local/log 10.0.0 ONAP Logging ElasticStack
-local/mariadb-galera 10.0.0 Chart for MariaDB Galera cluster
-local/mongo 10.0.0 MongoDB Server
-local/msb 10.0.0 ONAP MicroServices Bus
-local/multicloud 10.0.0 ONAP multicloud broker
-local/music 10.0.0 MUSIC - Multi-site State Coordination Service
-local/mysql 10.0.0 MySQL Server
-local/nbi 10.0.0 ONAP Northbound Interface
-local/network-name-gen 10.0.0 Name Generation Micro Service
-local/nfs-provisioner 10.0.0 NFS provisioner
-local/oof 10.0.0 ONAP Optimization Framework
-local/policy 10.0.0 ONAP Policy Administration Point
-local/pomba 10.0.0 ONAP Post Orchestration Model Based Audit
-local/portal 10.0.0 ONAP Web Portal
-local/postgres 10.0.0 ONAP Postgres Server
-local/robot 10.0.0 A helm Chart for kubernetes-ONAP Robot
-local/sdc 10.0.0 Service Design and Creation Umbrella Helm charts
-local/sdnc 10.0.0 SDN Controller
-local/sdnc-prom 10.0.0 ONAP SDNC Policy Driven Ownership Management
-local/sniro-emulator 10.0.0 ONAP Mock Sniro Emulator
-local/so 10.0.0 ONAP Service Orchestrator
-local/strimzi 10.0.0 ONAP Strimzi Apache Kafka
-local/uui 10.0.0 ONAP uui
-local/vfc 10.0.0 ONAP Virtual Function Controller (VF-C)
-local/vid 10.0.0 ONAP Virtual Infrastructure Deployment
-local/vnfsdk 10.0.0 ONAP VNF SDK
+local/onap 11.0.0 Kohn Open Network Automation Platform (ONAP)
+local/aaf 11.0.0 ONAP Application Authorization Framework
+local/aai 11.0.0 ONAP Active and Available Inventory
+local/appc 11.0.0 Application Controller
+local/cassandra 11.0.0 ONAP cassandra
+local/cds 11.0.0 ONAP Controller Design Studio (CDS)
+local/clamp 11.0.0 ONAP Clamp
+local/cli 11.0.0 ONAP Command Line Interface
+local/common 11.0.0 Common templates for inclusion in other charts
+local/consul 11.0.0 ONAP Consul Agent
+local/contrib 11.0.0 ONAP optional tools
+local/cps 11.0.0 ONAP Configuration Persistene Service (CPS)
+local/dcaegen2 11.0.0 ONAP DCAE Gen2
+local/dgbuilder 11.0.0 D.G. Builder application
+local/dmaap 11.0.0 ONAP DMaaP components
+local/log 11.0.0 ONAP Logging ElasticStack
+local/mariadb-galera 11.0.0 Chart for MariaDB Galera cluster
+local/mongo 11.0.0 MongoDB Server
+local/msb 11.0.0 ONAP MicroServices Bus
+local/multicloud 11.0.0 ONAP multicloud broker
+local/music 11.0.0 MUSIC - Multi-site State Coordination Service
+local/mysql 11.0.0 MySQL Server
+local/nbi 11.0.0 ONAP Northbound Interface
+local/network-name-gen 11.0.0 Name Generation Micro Service
+local/nfs-provisioner 11.0.0 NFS provisioner
+local/oof 11.0.0 ONAP Optimization Framework
+local/policy 11.0.0 ONAP Policy Administration Point
+local/pomba 11.0.0 ONAP Post Orchestration Model Based Audit
+local/portal 11.0.0 ONAP Web Portal
+local/postgres 11.0.0 ONAP Postgres Server
+local/robot 11.0.0 A helm Chart for kubernetes-ONAP Robot
+local/sdc 11.0.0 Service Design and Creation Umbrella Helm charts
+local/sdnc 11.0.0 SDN Controller
+local/sdnc-prom 11.0.0 ONAP SDNC Policy Driven Ownership Management
+local/sniro-emulator 11.0.0 ONAP Mock Sniro Emulator
+local/so 11.0.0 ONAP Service Orchestrator
+local/strimzi 11.0.0 ONAP Strimzi Apache Kafka
+local/uui 11.0.0 ONAP uui
+local/vfc 11.0.0 ONAP Virtual Function Controller (VF-C)
+local/vid 11.0.0 ONAP Virtual Infrastructure Deployment
+local/vnfsdk 11.0.0 ONAP VNF SDK
diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 27d7a06..b7749b1 100644
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -29,6 +29,7 @@
* 8.0.0 for Honolulu
* 9.0.0 for Istanbul
* 10.0.0 for Jakarta
+* 11.0.0 for Kohn
**Step 2.** Install Helm Plugins required to deploy ONAP::
diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index 0835a93..2ff74b5 100644
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.rst
@@ -123,7 +123,7 @@
To prepare your system for an installation of ONAP, you'll need to::
- > git clone -b jakarta --recurse-submodules -j2 http://gerrit.onap.org/r/oom
+ > git clone -b kohn --recurse-submodules -j2 http://gerrit.onap.org/r/oom
> cd oom/kubernetes
@@ -161,12 +161,12 @@
> helm search repo local
NAME VERSION DESCRIPTION
- local/appc 10.0.0 Application Controller
- local/clamp 10.0.0 ONAP Clamp
- local/common 10.0.0 Common templates for inclusion in other charts
- local/onap 10.0.0 Open Network Automation Platform (ONAP)
- local/robot 10.0.0 A helm Chart for kubernetes-ONAP Robot
- local/so 10.0.0 ONAP Service Orchestrator
+ local/appc 11.0.0 Application Controller
+ local/clamp 11.0.0 ONAP Clamp
+ local/common 11.0.0 Common templates for inclusion in other charts
+ local/onap 11.0.0 Open Network Automation Platform (ONAP)
+ local/robot 11.0.0 A helm Chart for kubernetes-ONAP Robot
+ local/so 11.0.0 ONAP Service Orchestrator
In any case, setup of the Helm repository is a one time activity.
@@ -209,7 +209,7 @@
To install a specific version of a single ONAP component (`so` in this example)
with the given release name enter::
- > helm deploy so onap/so --version 10.0.0 --set global.masterPassword=password --set global.flavor=unlimited --namespace onap
+ > helm deploy so onap/so --version 11.0.0 --set global.masterPassword=password --set global.flavor=unlimited --namespace onap
.. note::
The dependent components should be installed for component being installed
@@ -333,7 +333,7 @@
dependencies:
<...>
- name: so
- version: ~10.0.0
+ version: ~11.0.0
repository: '@local'
condition: so.enabled
<...>
@@ -404,7 +404,7 @@
portal-app LoadBalancer 10.43.142.201 10.0.0.4 8989:30215/TCP,8006:30213/TCP,8010:30214/TCP 1d app=portal-app,release=dev
-In this example, use the 10.0.0.4 private address as a key find the
+In this example, use the 11.0.0.4 private address as a key find the
corresponding public address which in this example is 10.12.6.155. If you're
using OpenStack you'll do the lookup with the horizon GUI or the OpenStack CLI
for your tenant (openstack server list). That IP is then used in your
@@ -563,10 +563,10 @@
> helm list
NAME REVISION UPDATED STATUS CHART APP VERSION NAMESPACE
- dev 1 Wed Oct 14 13:49:52 2020 DEPLOYED onap-10.0.0 Jakarta onap
- dev-cassandra 5 Thu Oct 15 14:45:34 2020 DEPLOYED cassandra-10.0.0 onap
- dev-contrib 1 Wed Oct 14 13:52:53 2020 DEPLOYED contrib-10.0.0 onap
- dev-mariadb-galera 1 Wed Oct 14 13:55:56 2020 DEPLOYED mariadb-galera-10.0.0 onap
+ dev 1 Wed Oct 14 13:49:52 2020 DEPLOYED onap-11.0.0 Kohn onap
+ dev-cassandra 5 Thu Oct 15 14:45:34 2020 DEPLOYED cassandra-11.0.0 onap
+ dev-contrib 1 Wed Oct 14 13:52:53 2020 DEPLOYED contrib-11.0.0 onap
+ dev-mariadb-galera 1 Wed Oct 14 13:55:56 2020 DEPLOYED mariadb-galera-11.0.0 onap
Here the Name column shows the RELEASE NAME, In our case we want to try the
scale operation on cassandra, thus the RELEASE NAME would be dev-cassandra.
@@ -580,10 +580,10 @@
> helm search cassandra
NAME CHART VERSION APP VERSION DESCRIPTION
- local/cassandra 10.0.0 ONAP cassandra
- local/portal-cassandra 10.0.0 Portal cassandra
- local/aaf-cass 10.0.0 ONAP AAF cassandra
- local/sdc-cs 10.0.0 ONAP Service Design and Creation Cassandra
+ local/cassandra 11.0.0 ONAP cassandra
+ local/portal-cassandra 11.0.0 Portal cassandra
+ local/aaf-cass 11.0.0 ONAP AAF cassandra
+ local/sdc-cs 11.0.0 ONAP Service Design and Creation Cassandra
Here the Name column shows the chart name. As we want to try the scale
operation for cassandra, thus the corresponding chart name is local/cassandra
@@ -645,7 +645,7 @@
> helm list
NAME REVISION UPDATED STATUS CHART NAMESPACE
- so 1 Mon Feb 5 10:05:22 2020 DEPLOYED so-10.0.0 onap
+ so 1 Mon Feb 5 10:05:22 2020 DEPLOYED so-11.0.0 onap
When upgrading a cluster a parameter controls the minimum size of the cluster
during the upgrade while another parameter controls the maximum number of nodes
@@ -668,21 +668,21 @@
For example, to upgrade a container by changing configuration, specifically an
environment value::
- > helm upgrade so onap/so --version 8.0.1 --set enableDebug=true
+ > helm upgrade so onap/so --version 11.0.1 --set enableDebug=true
Issuing this command will result in the appropriate container being stopped by
Kubernetes and replaced with a new container with the new environment value.
To upgrade a component to a new version with a new configuration file enter::
- > helm upgrade so onap/so --version 8.0.1 -f environments/demo.yaml
+ > helm upgrade so onap/so --version 11.0.1 -f environments/demo.yaml
To fetch release history enter::
> helm history so
REVISION UPDATED STATUS CHART DESCRIPTION
- 1 Mon Feb 5 10:05:22 2020 SUPERSEDED so-9.0.0 Install complete
- 2 Mon Feb 5 10:10:55 2020 DEPLOYED so-10.0.0 Upgrade complete
+ 1 Mon Jul 5 10:05:22 2022 SUPERSEDED so-11.0.0 Install complete
+ 2 Mon Jul 5 10:10:55 2022 DEPLOYED so-11.0.1 Upgrade complete
Unfortunately, not all upgrades are successful. In recognition of this the
lineup of pods within an ONAP deployment is tagged such that an administrator
@@ -704,9 +704,9 @@
> helm history so
REVISION UPDATED STATUS CHART DESCRIPTION
- 1 Mon Feb 5 10:05:22 2020 SUPERSEDED so-9.0.0 Install complete
- 2 Mon Feb 5 10:10:55 2020 SUPERSEDED so-10.0.0 Upgrade complete
- 3 Mon Feb 5 10:14:32 2020 DEPLOYED so-9.0.0 Rollback to 1
+ 1 Mon Jul 5 10:05:22 2022 SUPERSEDED so-11.0.0 Install complete
+ 2 Mon Jul 5 10:10:55 2022 SUPERSEDED so-11.0.1 Upgrade complete
+ 3 Mon Jul 5 10:14:32 2022 DEPLOYED so-11.0.0 Rollback to 1
.. note::
diff --git a/kubernetes/a1policymanagement/Chart.yaml b/kubernetes/a1policymanagement/Chart.yaml
index 4c9f519..563ee20 100644
--- a/kubernetes/a1policymanagement/Chart.yaml
+++ b/kubernetes/a1policymanagement/Chart.yaml
@@ -20,18 +20,18 @@
appVersion: "1.0.0"
description: A Helm chart for A1 Policy Management Service
name: a1policymanagement
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/a1policymanagement/values.yaml b/kubernetes/a1policymanagement/values.yaml
index f70deef..17fa320 100644
--- a/kubernetes/a1policymanagement/values.yaml
+++ b/kubernetes/a1policymanagement/values.yaml
@@ -63,7 +63,7 @@
echo "*** change ownership of certificates to targeted user"
chown -R 1000 .
-image: onap/ccsdk-oran-a1policymanagementservice:1.3.0
+image: onap/ccsdk-oran-a1policymanagementservice:1.3.2
userID: 1000 #Should match with image-defined user ID
groupID: 999 #Should match with image-defined group ID
pullPolicy: IfNotPresent
diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml
index 2c51172..bcbe9fa 100644
--- a/kubernetes/aaf/Chart.yaml
+++ b/kubernetes/aaf/Chart.yaml
@@ -18,46 +18,46 @@
apiVersion: v2
description: ONAP Application Authorization Framework
name: aaf
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: aaf-cass
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-cass'
condition: aaf-authz.enabled
- name: aaf-cm
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-cm'
condition: aaf-authz.enabled
- name: aaf-fs
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-fs'
condition: aaf-authz.enabled
- name: aaf-gui
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-gui'
condition: aaf-authz.enabled
- name: aaf-hello
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-hello'
condition: aaf-hello.enabled
- name: aaf-locate
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-locate'
condition: aaf-authz.enabled
- name: aaf-oauth
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-oauth'
condition: aaf-authz.enabled
- name: aaf-service
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-service'
condition: aaf-authz.enabled
- name: aaf-sms
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-sms'
condition: aaf-sms.enabled
- name: aaf-sshsm
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-sshsm'
condition: aaf-sshsm.enabled
diff --git a/kubernetes/aaf/components/aaf-cass/Chart.yaml b/kubernetes/aaf/components/aaf-cass/Chart.yaml
index 3f1394c..0006c9b 100644
--- a/kubernetes/aaf/components/aaf-cass/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cass/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP AAF cassandra
name: aaf-cass
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml
index ab91b72..d2d0b5e 100644
--- a/kubernetes/aaf/components/aaf-cm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-cm/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: ONAP AAF Certificate Manager
name: aaf-cm
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aaf-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-fs/Chart.yaml b/kubernetes/aaf/components/aaf-fs/Chart.yaml
index 72b7133..660b8d6 100644
--- a/kubernetes/aaf/components/aaf-fs/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-fs/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP AAF File Server
name: aaf-fs
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aaf-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-gui/Chart.yaml b/kubernetes/aaf/components/aaf-gui/Chart.yaml
index be01174..1527051 100644
--- a/kubernetes/aaf/components/aaf-gui/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-gui/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP AAF GUI
name: aaf-gui
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aaf-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-hello/Chart.yaml b/kubernetes/aaf/components/aaf-hello/Chart.yaml
index 5a368d5..bc4c38d 100644
--- a/kubernetes/aaf/components/aaf-hello/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-hello/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP AAF Hello
name: aaf-hello
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aaf-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-locate/Chart.yaml b/kubernetes/aaf/components/aaf-locate/Chart.yaml
index 15ac5ee..629b2e0 100644
--- a/kubernetes/aaf/components/aaf-locate/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-locate/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP AAF Locate
name: aaf-locate
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aaf-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-oauth/Chart.yaml b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
index 31239e9..b22deca 100644
--- a/kubernetes/aaf/components/aaf-oauth/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP AAF OAuth
name: aaf-oauth
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aaf-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../aaf-templates'
diff --git a/kubernetes/aaf/components/aaf-service/Chart.yaml b/kubernetes/aaf/components/aaf-service/Chart.yaml
index 5cd6cc5..18813fc 100644
--- a/kubernetes/aaf/components/aaf-service/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-service/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP AAF Service
name: aaf-service
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aaf-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../aaf-templates'
\ No newline at end of file
diff --git a/kubernetes/aaf/components/aaf-sms/Chart.yaml b/kubernetes/aaf/components/aaf-sms/Chart.yaml
index c3e1692..769a4df 100644
--- a/kubernetes/aaf/components/aaf-sms/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/Chart.yaml
@@ -17,21 +17,21 @@
apiVersion: v2
description: ONAP Secret Management Service
name: aaf-sms
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aaf-sms-quorumclient
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-sms-quorumclient'
- name: aaf-sms-vault
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-sms-vault'
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
index b777223..96cf7a1 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP Secret Management Service Quorum Client
name: aaf-sms-quorumclient
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
index b3935d4..9f06ec1 100644
--- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml
@@ -18,12 +18,12 @@
description: Chart to launch Vault as SMS backend
name: aaf-sms-vault
appVersion: 0.9.5
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
index a7fd8f5..2cd0cf4 100644
--- a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml
@@ -17,24 +17,24 @@
apiVersion: v2
description: ONAP Hardware Security Components
name: aaf-sshsm
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aaf-sshsm-abrmd
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-sshsm-abrmd'
condition: aaf-sshsm-abrmd.enabled
- name: aaf-sshsm-distcenter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-sshsm-distcenter'
condition: aaf-sshsm-distcenter.enabled
- name: aaf-sshsm-testca
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aaf-sshsm-testca'
condition: aaf-sshsm-testca.testca.enabled
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
index f9dd2b9..2149739 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP Trusted Platform Module Resource Manager
name: aaf-sshsm-abrmd
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
index 1f6b6f9..b0a9b9a 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP Trusted Platform Module Distribution Center
name: aaf-sshsm-distcenter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
index 73ff507..617c742 100644
--- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP Trusted Platform Module Test CA Service
name: aaf-sshsm-testca
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-templates/Chart.yaml b/kubernetes/aaf/components/aaf-templates/Chart.yaml
index 9d0ecad..b4b01b0 100644
--- a/kubernetes/aaf/components/aaf-templates/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-templates/Chart.yaml
@@ -16,9 +16,9 @@
apiVersion: v2
description: ONAP Application Authorization Framework Templates
name: aaf-templates
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index 278e1cd..9bab1ee 100644
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -18,56 +18,56 @@
apiVersion: v2
description: ONAP Active and Available Inventory
name: aai
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: cassandra
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
condition: global.cassandra.localCluster
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: aai-babel
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aai-babel'
condition: aai-babel.enabled
- name: aai-graphadmin
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aai-graphadmin'
condition: aai-graphadmin.enabled
- name: aai-modelloader
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aai-modelloader'
condition: aai-modelloader.enabled
- name: aai-resources
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aai-resources'
condition: aai-resources.enabled
- name: aai-schema-service
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aai-schema-service'
condition: aai-schema-service.enabled
- name: aai-sparky-be
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aai-sparky-be'
condition: aai-sparky-be.enabled
- name: aai-traversal
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/aai-traversal'
condition: aai-traversal.enabled
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-babel/Chart.yaml b/kubernetes/aai/components/aai-babel/Chart.yaml
index 3014013..5f36a0e 100644
--- a/kubernetes/aai/components/aai-babel/Chart.yaml
+++ b/kubernetes/aai/components/aai-babel/Chart.yaml
@@ -18,21 +18,21 @@
apiVersion: v2
description: Babel microservice
name: aai-babel
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-graphadmin/Chart.yaml b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
index 0d5978a..d5d0851 100644
--- a/kubernetes/aai/components/aai-graphadmin/Chart.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
@@ -22,21 +22,21 @@
apiVersion: v2
description: ONAP AAI GraphAdmin
name: aai-graphadmin
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index b8adba8..a93c610 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -126,7 +126,9 @@
args:
- -c
- |
- bash docker-entrypoint.sh dataSnapshot.sh
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
+ bash docker-entrypoint.sh dataSnapshot.sh;
{{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
index 76a11fa..a934902 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -126,7 +126,9 @@
args:
- -c
- |
- bash docker-entrypoint.sh createDBSchema.sh
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
+ bash docker-entrypoint.sh createDBSchema.sh;
{{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
- name: LOCAL_USER_ID
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index d2d0809..10b8255 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -171,6 +171,8 @@
args:
- -c
- |
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
bash docker-entrypoint.sh run_Migrations.sh -e UpdateAaiUriIndexMigration --commit --skipPreMigrationSnapShot --runDisabled RebuildAllEdges ;
{{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
@@ -325,6 +327,8 @@
args:
- -c
- |
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
bash docker-entrypoint.sh dataSnapshot.sh
{{ include "common.serviceMesh.killSidecar" . | indent 11 | trim }}
env:
diff --git a/kubernetes/aai/components/aai-modelloader/Chart.yaml b/kubernetes/aai/components/aai-modelloader/Chart.yaml
index a56dfdc..468b41b 100644
--- a/kubernetes/aai/components/aai-modelloader/Chart.yaml
+++ b/kubernetes/aai/components/aai-modelloader/Chart.yaml
@@ -17,21 +17,21 @@
apiVersion: v2
description: ONAP AAI modelloader
name: aai-modelloader
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
index 09eb397..2d7cf7f 100644
--- a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
+++ b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
@@ -26,6 +26,9 @@
{{ else }}
ml.distribution.ASDC_ADDRESS=sdc-be.{{.Release.Namespace}}:8080
ml.distribution.ASDC_USE_HTTPS=false
+ml.distribution.KEYSTORE_PASSWORD=
+ml.distribution.KEYSTORE_FILE=
+ml.distribution.PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
{{ end }}
ml.distribution.CONSUMER_GROUP=aai-ml-group
ml.distribution.CONSUMER_ID=aai-ml
diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index c5ccf82..729d808 100644
--- a/kubernetes/aai/components/aai-resources/Chart.yaml
+++ b/kubernetes/aai/components/aai-resources/Chart.yaml
@@ -18,21 +18,21 @@
apiVersion: v2
description: ONAP AAI resources
name: aai-resources
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-schema-service/Chart.yaml b/kubernetes/aai/components/aai-schema-service/Chart.yaml
index 2553c94..f608b75 100644
--- a/kubernetes/aai/components/aai-schema-service/Chart.yaml
+++ b/kubernetes/aai/components/aai-schema-service/Chart.yaml
@@ -18,21 +18,21 @@
apiVersion: v2
description: ONAP AAI Schema Service
name: aai-schema-service
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-sparky-be/Chart.yaml b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
index ec1812e..0a2c028 100644
--- a/kubernetes/aai/components/aai-sparky-be/Chart.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/Chart.yaml
@@ -17,21 +17,21 @@
apiVersion: v2
description: ONAP AAI sparky-be
name: aai-sparky-be
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index 6e5ab8b..d23d9cf 100644
--- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@ -33,6 +33,8 @@
app: {{ include "common.name" . }}
template:
metadata:
+ annotations:
+ sidecar.istio.io/rewriteAppHTTPProbers: "false"
labels:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
diff --git a/kubernetes/aai/components/aai-traversal/Chart.yaml b/kubernetes/aai/components/aai-traversal/Chart.yaml
index 41dbe23..13cda28 100644
--- a/kubernetes/aai/components/aai-traversal/Chart.yaml
+++ b/kubernetes/aai/components/aai-traversal/Chart.yaml
@@ -17,21 +17,21 @@
apiVersion: v2
description: ONAP AAI traversal
name: aai-traversal
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/aai/templates/service.yaml b/kubernetes/aai/templates/service.yaml
index d93bfc9..750e1ba 100644
--- a/kubernetes/aai/templates/service.yaml
+++ b/kubernetes/aai/templates/service.yaml
@@ -35,4 +35,3 @@
type: {{ .Values.service.type }}
selector:
app: {{ include "common.name" . }}
- clusterIP: {{ .Values.service.aaiServiceClusterIp }}
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 62d1d2e..ebbf8b6 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -389,9 +389,6 @@
externalPort: 8443
internalPort: 8443
nodePort: 33
- # POLICY hotfix - Note this must be temporary
- # See https://jira.onap.org/browse/POLICY-510
- aaiServiceClusterIp:
externalPlainPort: 80
internalPlainPort: 8080
nodeport: 33
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml
index d08a83e..d65bbfb 100644
--- a/kubernetes/appc/Chart.yaml
+++ b/kubernetes/appc/Chart.yaml
@@ -18,26 +18,26 @@
apiVersion: v2
description: Application Controller
name: appc
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dgbuilder
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: appc-ansible-server
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/appc-ansible-server'
condition: appc-ansible-server.enabled
- name: appc-cdt
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/appc-cdt'
condition: appc-cdt.enabled
diff --git a/kubernetes/appc/components/appc-ansible-server/Chart.yaml b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
index 6bdd1ec..6daa29c 100644
--- a/kubernetes/appc/components/appc-ansible-server/Chart.yaml
+++ b/kubernetes/appc/components/appc-ansible-server/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP APPC Ansible Server
name: appc-ansible-server
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/appc/components/appc-cdt/Chart.yaml b/kubernetes/appc/components/appc-cdt/Chart.yaml
index 3cb22a4..faabb71 100644
--- a/kubernetes/appc/components/appc-cdt/Chart.yaml
+++ b/kubernetes/appc/components/appc-cdt/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP APPC Self Service Controller Design Tool
name: appc-cdt
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml
index 2659767..7115e9e 100644
--- a/kubernetes/cds/Chart.yaml
+++ b/kubernetes/cds/Chart.yaml
@@ -17,32 +17,32 @@
apiVersion: v2
description: ONAP Controller Design Studio (CDS)
name: cds
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: cds-blueprints-processor
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/cds-blueprints-processor'
condition: cds-blueprints-processor.enabled
- name: cds-command-executor
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/cds-command-executor'
condition: cds-command-executor.enabled
- name: cds-py-executor
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/cds-py-executor'
condition: cds-py-executor.enabled
- name: cds-sdc-listener
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/cds-sdc-listener'
condition: cds-sdc-listener.enabled
- name: cds-ui
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/cds-ui'
condition: cds-ui.enabled
diff --git a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
index 4374926..2002e56 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: ONAP CDS Blueprints Processor
name: cds-blueprints-processor
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
index 0beaf4a..2818fd9 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
@@ -18,7 +18,7 @@
### START -Controller Blueprints Properties
# Load Resource Source Mappings
*/}}
-resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability,rest=source-rest,vault-data=source-rest,script=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability,rest=source-rest,vault-data=source-rest,script=source-capability,cps-data=source-rest
# Blueprint Processor File Execution and Handling Properties
blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy
@@ -101,17 +101,29 @@
# AAI Data REST Client settings
blueprintsprocessor.restclient.aai-data.type=basic-auth
-blueprintsprocessor.restclient.aai-data.url=https://aai:8443
+{{ if ( include "common.needTLS" .) }}
+blueprintsprocessor.restclient.aai-data.url=https://{{ .Values.global.aaiData.ServiceName }}:8443
+{{- else -}}
+blueprintsprocessor.restclient.aai-data.url=http://{{ .Values.global.aaiData.ServiceName }}:{{ .Values.global.aaiData.ExternalPlainPort }}
+{{- end }}
blueprintsprocessor.restclient.aai-data.username=aai@aai.onap.org
blueprintsprocessor.restclient.aai-data.password=demo123456!
blueprintsprocessor.restclient.aai-data.additionalHeaders.X-TransactionId=cds-transaction-id
blueprintsprocessor.restclient.aai-data.additionalHeaders.X-FromAppId=cds-app-id
blueprintsprocessor.restclient.aai-data.additionalHeaders.Accept=application/json
+# CPS Data
+blueprintsprocessor.restclient.cps-data.type=basic-auth
+blueprintsprocessor.restclient.cps-data.url=http://cps-core:8080
+blueprintsprocessor.restclient.cps-data.username=${CPS_USER}
+blueprintsprocessor.restclient.cps-data.password=${CPS_PASS_PLAIN}
+blueprintsprocessor.restclient.cps-data.additionalHeaders.Accept=application/json
+blueprintsprocessor.restclient.cps-data.additionalHeaders.Content-Type=application/json
+
# Self Service Request Kafka Message Consumer
blueprintsprocessor.messageconsumer.self-service-api.kafkaEnable={{ .Values.kafkaRequestConsumer.enabled }}
blueprintsprocessor.messageconsumer.self-service-api.type={{ .Values.kafkaRequestConsumer.type }}
-{{- if eq .Values.useStrimziKafka true }}
+{{ if eq .Values.useStrimziKafka true }}
blueprintsprocessor.messageconsumer.self-service-api.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
{{- else -}}
blueprintsprocessor.messageconsumer.self-service-api.bootstrapServers={{ .Values.kafkaRequestConsumer.bootstrapServers }}
@@ -120,7 +132,7 @@
blueprintsprocessor.messageconsumer.self-service-api.topic={{ .Values.kafkaRequestConsumer.topic }}
blueprintsprocessor.messageconsumer.self-service-api.clientId={{ .Values.kafkaRequestConsumer.clientId }}
blueprintsprocessor.messageconsumer.self-service-api.pollMillSec={{ .Values.kafkaRequestConsumer.pollMillSec }}
-{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
+{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
# SCRAM
blueprintsprocessor.messageconsumer.self-service-api.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
blueprintsprocessor.messageconsumer.self-service-api.scramPassword=${JAAS_PASS}
@@ -128,14 +140,14 @@
# Self Service Response Kafka Message Producer
blueprintsprocessor.messageproducer.self-service-api.type={{ .Values.kafkaRequestProducer.type }}
-{{- if eq .Values.useStrimziKafka true }}
+{{ if eq .Values.useStrimziKafka true }}
blueprintsprocessor.messageproducer.self-service-api.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
{{- else -}}
blueprintsprocessor.messageproducer.self-service-api.bootstrapServers={{ .Values.kafkaRequestProducer.bootstrapServers }}
{{- end }}
blueprintsprocessor.messageproducer.self-service-api.clientId={{ .Values.kafkaRequestProducer.clientId }}
blueprintsprocessor.messageproducer.self-service-api.topic={{ .Values.kafkaRequestProducer.topic }}
-{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
+{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
# SCRAM
blueprintsprocessor.messageproducer.self-service-api.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
blueprintsprocessor.messageproducer.self-service-api.scramPassword=${JAAS_PASS}
@@ -146,14 +158,14 @@
## Audit request
blueprintsprocessor.messageproducer.self-service-api.audit.kafkaEnable={{ .Values.kafkaAuditRequest.enabled }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.type={{ .Values.kafkaAuditRequest.type }}
-{{- if eq .Values.useStrimziKafka true }}
+{{ if eq .Values.useStrimziKafka true }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
{{- else -}}
blueprintsprocessor.messageproducer.self-service-api.audit.request.bootstrapServers={{ .Values.kafkaAuditRequest.bootstrapServers }}
{{- end }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.clientId={{ .Values.kafkaAuditRequest.clientId }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.topic={{ .Values.kafkaAuditRequest.topic }}
-{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
+{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
# SCRAM
blueprintsprocessor.messageproducer.self-service-api.audit.request.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
blueprintsprocessor.messageproducer.self-service-api.audit.request.scramPassword=${JAAS_PASS}
@@ -161,14 +173,14 @@
## Audit response
blueprintsprocessor.messageproducer.self-service-api.audit.response.type={{ .Values.kafkaAuditResponse.type }}
-{{- if eq .Values.useStrimziKafka true }}
+{{ if eq .Values.useStrimziKafka true }}
blueprintsprocessor.messageproducer.self-service-api.audit.response.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
{{- else -}}
blueprintsprocessor.messageproducer.self-service-api.audit.response.bootstrapServers={{ .Values.kafkaAuditRequest.bootstrapServers }}
{{- end }}
blueprintsprocessor.messageproducer.self-service-api.audit.response.clientId={{ .Values.kafkaAuditResponse.clientId }}
blueprintsprocessor.messageproducer.self-service-api.audit.response.topic={{ .Values.kafkaAuditResponse.topic }}
-{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
+{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
# SCRAM
blueprintsprocessor.messageproducer.self-service-api.audit.response.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
blueprintsprocessor.messageproducer.self-service-api.audit.response.scramPassword=${JAAS_PASS}
@@ -194,7 +206,7 @@
endpoints.user.password=eHbVUbJAj4AG2522cSbrOQ==
#BaseUrls for health check blueprint processor services
-blueprintprocessor.healthcheck.baseUrl=http://localhost:8080/
+blueprintprocessor.healthcheck.baseUrl=http://cds-blueprints-processor-http:8080/
blueprintprocessor.healthcheck.mapping-service-name-with-service-link=[Execution service,/api/v1/execution-service/health-check],[Resources service,/api/v1/resources/health-check],[Template service,/api/v1/template/health-check]
#BaseUrls for health check Cds Listener services
diff --git a/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
index d68e900..1e4f5e1 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
@@ -118,6 +118,10 @@
fieldPath: metadata.name
- name: CLUSTER_CONFIG_FILE
value: {{ .Values.config.appConfigDir }}/hazelcast.yaml
+ - name: CPS_USER
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "login") | indent 12 }}
+ - name: CPS_PASS_PLAIN
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "password") | indent 12 }}
{{ if .Values.useStrimziKafka }}
- name: JAAS_PASS
value: {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cds-kafka-secret" "key" "password") | indent 12 }}
diff --git a/kubernetes/cds/components/cds-blueprints-processor/templates/service.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/service.yaml
index 5d2e438..153740c 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/templates/service.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/service.yaml
@@ -33,7 +33,7 @@
{{- if eq .Values.service.http.type "NodePort"}}
nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.http.nodePort }}
{{- end}}
- name: {{ .Values.service.http.portName | default "http" }}
+ name: {{ .Values.service.http.portName | default "http" }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
selector:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index af9482b..023bf49 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -28,10 +28,17 @@
persistence:
mountPath: /dockerdata-nfs
- #This configuration specifies Service and port for SDNC OAM interface
+ # This configuration specifies Service and port for SDNC OAM interface
sdncOamService: sdnc-oam
sdncOamPort: 8282
+ # This concerns CDS/AAI communication through HTTP when TLS is not being needed
+ # Port value should match the one in aai/values.yml : service.externalPlainPort
+ aaiData:
+ ExternalPlainPort: 80 # when TLS is not needed
+ ServiceName: aai # domain
+ # http://aai:80 or https://aai:443
+
#AAF is enabled by default
#aafEnabled: true
@@ -65,6 +72,12 @@
- name: password
value: '{{ .Values.config.someConfig }}'
policy: generate
+ - uid: cps-creds
+ type: basicAuth
+ externalSecret: '{{ tpl (default "" .Values.config.cps.cpsUserExternalSecret) . }}'
+ login: '{{ .Values.config.cps.cpsUsername }}'
+ password: '{{ .Values.config.cps.cpsPassword }}'
+ passwordPolicy: required
#################################################################
# AAF part
@@ -108,7 +121,7 @@
dbService: mariadb-galera
dbPort: 3306
dbName: sdnctl
- #dbRootPass: Custom root password
+ # dbRootPass: Custom root password
dbRootPassExternalSecret: '{{ include "common.mariadb.secret.rootPassSecretName" ( dict "dot" . "chartName" .Values.config.sdncDB.dbService ) }}'
cdsDB:
dbServer: cds-db
@@ -120,6 +133,10 @@
# dbRootPassword: password
# dbRootPassExternalSecret
someConfig: blah
+ cps:
+ cpsUsername: ''
+ cpsPassword: ''
+ cpsUserExternalSecret: '{{ include "common.release" . }}-cps-core-app-user-creds'
# default number of instances
replicaCount: 1
@@ -170,12 +187,12 @@
periodSeconds: 10
liveness:
- initialDelaySeconds: 0
+ initialDelaySeconds: 1
periodSeconds: 20
- timeoutSeconds: 20
+ timeoutSeconds: 30
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
- enabled: true
+ enabled: false
readiness:
initialDelaySeconds: 120
@@ -185,17 +202,17 @@
service:
http:
type: ClusterIP
- portName: blueprints-processor-http
+ portName: http
internalPort: 8080
externalPort: 8080
grpc:
type: ClusterIP
- portName: blueprints-processor-grpc
+ portName: grpc
internalPort: 9111
externalPort: 9111
cluster:
type: ClusterIP
- portName: blueprints-processor-cluster
+ portName: tcp-cluster
internalPort: 5701
externalPort: 5701
@@ -223,8 +240,8 @@
- baseaddr: "blueprintsprocessorhttp"
name: "cds-blueprints-processor-http"
port: 8080
- config:
- ssl: "none"
+ config:
+ ssl: "none"
logback:
rootLogLevel: INFO
diff --git a/kubernetes/cds/components/cds-command-executor/Chart.yaml b/kubernetes/cds/components/cds-command-executor/Chart.yaml
index e6b8793..6749d8d 100755
--- a/kubernetes/cds/components/cds-command-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-command-executor/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP CDS Command Executor
name: cds-command-executor
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml
index b0c1e35..e251140 100755
--- a/kubernetes/cds/components/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -63,11 +63,11 @@
service:
type: ClusterIP
grpc:
- portName: command-executor-grpc
+ portName: grpc
internalPort: 50051
externalPort: 50051
metrics:
- portName: command-executor-metrics
+ portName: tcp-metrics
internalPort: 10005
externalPort: 10005
@@ -105,7 +105,7 @@
metrics:
serviceMonitor:
enabled: false
- port: command-executor-metrics
+ port: tcp-metrics
path: /actuator/prometheus
basicAuth:
enabled: false
diff --git a/kubernetes/cds/components/cds-py-executor/Chart.yaml b/kubernetes/cds/components/cds-py-executor/Chart.yaml
index 702d183..cf09b56 100755
--- a/kubernetes/cds/components/cds-py-executor/Chart.yaml
+++ b/kubernetes/cds/components/cds-py-executor/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP CDS Py Executor
name: cds-py-executor
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/cds/components/cds-py-executor/values.yaml b/kubernetes/cds/components/cds-py-executor/values.yaml
index 9dc4a31..a1eb0a0 100755
--- a/kubernetes/cds/components/cds-py-executor/values.yaml
+++ b/kubernetes/cds/components/cds-py-executor/values.yaml
@@ -60,9 +60,9 @@
type: ClusterIP
ports:
- port: 50052
- name: executor-grpc
+ name: grpc-executor
- port: 50053
- name: manager-grpc
+ name: grpc-manager
secrets:
- uid: api-credentials
diff --git a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
index 3c547b9..14cd147 100755
--- a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP CDS SDC listener microservice
name: cds-sdc-listener
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml b/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml
index 7ef5959..3710f5f 100644
--- a/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/resources/config/application.yaml
@@ -1,6 +1,6 @@
listenerservice:
config:
- asdcAddress: sdc-be.{{include "common.namespace" .}}:8443 #SDC-BE
+ asdcAddress: sdc-be.{{include "common.namespace" .}}:{{ (eq "true" (include "common.needTLS" .)) | ternary 8443 8080 }} #SDC-BE
messageBusAddress: message-router.{{include "common.namespace" .}} #Message-Router
user: cds #SDC-username
password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U #SDC-password
@@ -14,7 +14,7 @@
keyStorePath:
activateServerTLSAuth : false
isUseHttpsWithDmaap: false
- isUseHttpsWithSDC: true
+ isUseHttpsWithSDC: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
archivePath: /opt/app/onap/sdc-listener/
grpcAddress: cds-blueprints-processor-grpc
grpcPort: 9111
@@ -24,14 +24,11 @@
httpsProxyPort: 0
httpProxyPort: 0
-
-
cdslistener:
healthcheck:
baseUrl: http://localhost:9000/
mapping-service-name-with-service-link: "[SDC Listener service,/api/v1/sdclistener/healthcheck]"
-
management:
endpoint:
health:
diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
index 4ac8470..3a6d761 100644
--- a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
@@ -63,18 +63,19 @@
value: {{ .Values.config.appConfigDir }}
ports:
- containerPort: {{ .Values.service.http.internalPort }}
+ name: {{ .Values.service.http.portName }}
{{ if .Values.liveness.enabled }}
livenessProbe:
httpGet:
path: /api/v1/sdclistener/healthcheck
- port: {{ .Values.service.http.internalPort }}
+ port: {{ .Values.service.http.portName }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{end}}
readinessProbe:
httpGet:
path: /api/v1/sdclistener/healthcheck
- port: {{ .Values.service.http.internalPort }}
+ port: {{ .Values.service.http.portName }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
volumeMounts:
diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml
index af837f2..42bd2b3 100644
--- a/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/service.yaml
@@ -31,7 +31,7 @@
{{- if eq .Values.service.type "NodePort"}}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
{{- end}}
- name: {{ .Values.service.http.portName | default "http" }}
+ name: {{ .Values.service.http.portName | default "http" }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}
selector:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
diff --git a/kubernetes/cds/components/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index ac1e3b4..1499ad5 100644
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -62,7 +62,7 @@
service:
type: ClusterIP
http:
- portName: cds-sdc-listener-http
+ portName: http
internalPort: 8080
externalPort: 8080
diff --git a/kubernetes/cds/components/cds-ui/Chart.yaml b/kubernetes/cds/components/cds-ui/Chart.yaml
index e220b0c..c356a0f 100644
--- a/kubernetes/cds/components/cds-ui/Chart.yaml
+++ b/kubernetes/cds/components/cds-ui/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: ONAP CDS UI
name: cds-ui
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index 05f766e..14fc014 100644
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -105,8 +105,8 @@
- baseaddr: "cdsui"
name: "cds-ui"
port: 3000
- config:
- ssl: "redirect"
+ config:
+ ssl: "redirect"
# Resource Limit flavor -By Default using small
flavor: small
diff --git a/kubernetes/cli/Chart.yaml b/kubernetes/cli/Chart.yaml
index 3f91203..1432f75 100644
--- a/kubernetes/cli/Chart.yaml
+++ b/kubernetes/cli/Chart.yaml
@@ -17,21 +17,21 @@
apiVersion: v2
description: ONAP Command Line Interface
name: cli
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
index 28d2276..58c649c 100644
--- a/kubernetes/cli/values.yaml
+++ b/kubernetes/cli/values.yaml
@@ -90,9 +90,9 @@
type: NodePort
name: cli
externalPort: 443
- externalPort1: 9090
+ externalPort1: 9443
internalPort: "443"
- internalPort1: 9090
+ internalPort1: 9443
nodePort: "60"
nodePort1: "71"
@@ -104,7 +104,7 @@
port: 443
- baseaddr: "cli2.api"
name: cli
- port: 9090
+ port: 9443
config:
ssl: "redirect"
diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml
index f2f7ffa..8095acb 100644
--- a/kubernetes/common/cassandra/Chart.yaml
+++ b/kubernetes/common/cassandra/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: ONAP cassandra
name: cassandra
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index 597174e..7d017f2 100644
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -99,7 +99,11 @@
- name: tcp-agent
port: 61621
-podAnnotations: {}
+podAnnotations:
+ # sidecar.istio.io/inject: "false"
+ traffic.sidecar.istio.io/excludeInboundPorts: "7000,7001"
+ traffic.sidecar.istio.io/includeInboundPorts: '*'
+ traffic.sidecar.istio.io/excludeOutboundPorts: "7000,7001"
podManagementPolicy: OrderedReady
updateStrategy:
type: RollingUpdate
diff --git a/kubernetes/common/cert-wrapper/Chart.yaml b/kubernetes/common/cert-wrapper/Chart.yaml
index 550de8d..fbafd9a 100644
--- a/kubernetes/common/cert-wrapper/Chart.yaml
+++ b/kubernetes/common/cert-wrapper/Chart.yaml
@@ -17,9 +17,9 @@
apiVersion: v2
description: Wrapper chart to allow truststore to be shared among cert-initializer instances
name: cert-wrapper
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../certInitializer'
diff --git a/kubernetes/common/certInitializer/Chart.yaml b/kubernetes/common/certInitializer/Chart.yaml
index 0f62dc7..f083bf8 100644
--- a/kubernetes/common/certInitializer/Chart.yaml
+++ b/kubernetes/common/certInitializer/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: Template used to obtain certificates in onap
name: certInitializer
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../readinessCheck'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/certManagerCertificate/Chart.yaml b/kubernetes/common/certManagerCertificate/Chart.yaml
index 807b90d..b65f9f3 100644
--- a/kubernetes/common/certManagerCertificate/Chart.yaml
+++ b/kubernetes/common/certManagerCertificate/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
name: certManagerCertificate
description: A Helm chart for Cert-Manager Certificate CRD template
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: cmpv2Config
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../cmpv2Config'
diff --git a/kubernetes/common/cmpv2Config/Chart.yaml b/kubernetes/common/cmpv2Config/Chart.yaml
index 5210061..7689e08 100644
--- a/kubernetes/common/cmpv2Config/Chart.yaml
+++ b/kubernetes/common/cmpv2Config/Chart.yaml
@@ -17,9 +17,9 @@
apiVersion: v2
description: Template used to store cmpv2 configuration in onap
name: cmpv2Config
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml
index 15a3f72..aeb07ee 100644
--- a/kubernetes/common/common/Chart.yaml
+++ b/kubernetes/common/common/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v2
description: Common templates for inclusion in other charts
name: common
-version: 10.0.0
+version: 11.0.0
diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml
index 5410695..1a1b8e2 100644
--- a/kubernetes/common/dgbuilder/Chart.yaml
+++ b/kubernetes/common/dgbuilder/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: D.G. Builder application
name: dgbuilder
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../serviceAccount'
diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
index 9257dc8..ddad8d7 100644
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@ -69,7 +69,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/ccsdk-dgbuilder-image:1.3.1
+image: onap/ccsdk-dgbuilder-image:1.3.4
pullPolicy: Always
# flag to enable debugging - application support required
@@ -130,7 +130,7 @@
service:
type: NodePort
name: dgbuilder
- portName: dgbuilder
+ portName: http
externalPort: 3000
internalPort: 3100
nodePort: 28
diff --git a/kubernetes/common/elasticsearch/Chart.yaml b/kubernetes/common/elasticsearch/Chart.yaml
index 6f6df22..cd187ff 100644
--- a/kubernetes/common/elasticsearch/Chart.yaml
+++ b/kubernetes/common/elasticsearch/Chart.yaml
@@ -18,26 +18,26 @@
apiVersion: v2
description: ONAP elasticsearch
name: elasticsearch
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: master
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/master'
- name: data
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/data'
condition: elasticsearch.data.enabled,data.enabled
- name: curator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/curator'
condition: elasticsearch.curator.enabled,curator.enabled
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../certInitializer'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/curator/Chart.yaml b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
index b1e80f0..21017c4 100644
--- a/kubernetes/common/elasticsearch/components/curator/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/curator/Chart.yaml
@@ -18,12 +18,12 @@
apiVersion: v2
description: ONAP elasticsearch curator
name: curator
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/common/elasticsearch/components/data/Chart.yaml b/kubernetes/common/elasticsearch/components/data/Chart.yaml
index fc5d402..fc89071 100644
--- a/kubernetes/common/elasticsearch/components/data/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/data/Chart.yaml
@@ -18,12 +18,12 @@
apiVersion: v2
description: ONAP elasticsearch data
name: data
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/data/templates/statefulset.yaml b/kubernetes/common/elasticsearch/components/data/templates/statefulset.yaml
index ea805c1..a7278ba 100644
--- a/kubernetes/common/elasticsearch/components/data/templates/statefulset.yaml
+++ b/kubernetes/common/elasticsearch/components/data/templates/statefulset.yaml
@@ -111,6 +111,12 @@
value: "yes"
- name: ELASTICSEARCH_NODE_TYPE
value: "data"
+ - name: network.bind_host
+ value: 127.0.0.1
+ - name: network.publish_host
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
ports: {{- include "common.containerPorts" . |indent 12 }}
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
diff --git a/kubernetes/common/elasticsearch/components/data/values.yaml b/kubernetes/common/elasticsearch/components/data/values.yaml
index 1328a20..1dc9ab8 100644
--- a/kubernetes/common/elasticsearch/components/data/values.yaml
+++ b/kubernetes/common/elasticsearch/components/data/values.yaml
@@ -47,7 +47,7 @@
service:
## list of ports for "common.containerPorts"
ports:
- - name: http-transport
+ - name: tcp-transport
port: 9300
image: bitnami/elasticsearch:7.9.3
diff --git a/kubernetes/common/elasticsearch/components/master/Chart.yaml b/kubernetes/common/elasticsearch/components/master/Chart.yaml
index 01ee8f3..43fe42f 100644
--- a/kubernetes/common/elasticsearch/components/master/Chart.yaml
+++ b/kubernetes/common/elasticsearch/components/master/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP elasticsearch master
name: master
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../repositoryGenerator'
diff --git a/kubernetes/common/elasticsearch/components/master/templates/statefulset.yaml b/kubernetes/common/elasticsearch/components/master/templates/statefulset.yaml
index a35b4bf..85ea2bb 100644
--- a/kubernetes/common/elasticsearch/components/master/templates/statefulset.yaml
+++ b/kubernetes/common/elasticsearch/components/master/templates/statefulset.yaml
@@ -115,6 +115,12 @@
value: {{ .Values.dedicatednode | quote }}
- name: ELASTICSEARCH_NODE_TYPE
value: "master"
+ - name: network.bind_host
+ value: 127.0.0.1
+ - name: network.publish_host
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
ports: {{- include "common.containerPorts" . |indent 12 }}
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
diff --git a/kubernetes/common/elasticsearch/components/master/values.yaml b/kubernetes/common/elasticsearch/components/master/values.yaml
index 3380449..2eae0de 100644
--- a/kubernetes/common/elasticsearch/components/master/values.yaml
+++ b/kubernetes/common/elasticsearch/components/master/values.yaml
@@ -170,7 +170,7 @@
## list of ports for "common.containerPorts"
## Elasticsearch transport port
ports:
- - name: http-transport
+ - name: tcp-transport
port: 9300
## master-eligible service type
##
diff --git a/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml b/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml
index 22de4db..05e09cb 100644
--- a/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml
+++ b/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml
@@ -113,6 +113,12 @@
value: "coordinating"
- name: ELASTICSEARCH_PORT_NUMBER
value: "9000"
+ - name: network.bind_host
+ value: 127.0.0.1
+ - name: network.publish_host
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
{{/*ports: {{- include "common.containerPorts" . | indent 12 -}} */}}
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
diff --git a/kubernetes/common/elasticsearch/values.yaml b/kubernetes/common/elasticsearch/values.yaml
index a3f1564..6c46f32 100644
--- a/kubernetes/common/elasticsearch/values.yaml
+++ b/kubernetes/common/elasticsearch/values.yaml
@@ -148,7 +148,7 @@
service:
name: nginx
ports:
- - name: elasticsearch
+ - name: http-es
port: 8080
## Custom server block to be added to NGINX configuration
## PHP-FPM example server block:
@@ -230,7 +230,7 @@
##
type: ClusterIP
headlessPorts:
- - name: http-transport
+ - name: tcp-transport
port: 9300
headless:
suffix: discovery
@@ -240,7 +240,7 @@
## Elasticsearch tREST API port
##
ports:
- - name: elasticsearch
+ - name: http-es
port: 9200
diff --git a/kubernetes/common/etcd-init/Chart.yaml b/kubernetes/common/etcd-init/Chart.yaml
index 7f1e89e..b4c36c3 100644
--- a/kubernetes/common/etcd-init/Chart.yaml
+++ b/kubernetes/common/etcd-init/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: Chart for etcd init job
name: etcd-init
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/common/etcd-init/templates/job.yaml b/kubernetes/common/etcd-init/templates/job.yaml
index 69bcfaa..9d7dcc2 100644
--- a/kubernetes/common/etcd-init/templates/job.yaml
+++ b/kubernetes/common/etcd-init/templates/job.yaml
@@ -55,6 +55,8 @@
- /bin/sh
- -ec
- |
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
# Create users
export ETCDCTL_ENDPOINTS=http://${ETCD_HOST}:${ETCD_PORT}
export ETCDCTL_API=3
@@ -89,6 +91,7 @@
name: localtime
readOnly: true
resources: {{ include "common.resources" . | nindent 12 }}
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
{{- end -}}
diff --git a/kubernetes/common/etcd-init/values.yaml b/kubernetes/common/etcd-init/values.yaml
index c99c9f1..6ccfb3e 100644
--- a/kubernetes/common/etcd-init/values.yaml
+++ b/kubernetes/common/etcd-init/values.yaml
@@ -72,3 +72,7 @@
cpu: 20m
memory: 20Mi
unlimited: {}
+
+wait_for_job_container:
+ containers:
+ - '{{ include "common.name" . }}'
diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml
index 9bc3702..4464919 100644
--- a/kubernetes/common/etcd/Chart.yaml
+++ b/kubernetes/common/etcd/Chart.yaml
@@ -17,7 +17,7 @@
apiVersion: v2
name: etcd
home: https://github.com/coreos/etcd
-version: 10.0.0
+version: 11.0.0
appVersion: 2.2.5
description: Distributed reliable key-value store for the most critical data of a
distributed system.
@@ -27,8 +27,8 @@
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
diff --git a/kubernetes/common/logConfiguration/Chart.yaml b/kubernetes/common/logConfiguration/Chart.yaml
index 3bdad3d..5b9286d 100644
--- a/kubernetes/common/logConfiguration/Chart.yaml
+++ b/kubernetes/common/logConfiguration/Chart.yaml
@@ -17,9 +17,9 @@
apiVersion: v2
description: Template used to create same STDOUT log configuration
name: logConfiguration
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml
index c255227..ddbaacc 100644
--- a/kubernetes/common/mariadb-galera/Chart.yaml
+++ b/kubernetes/common/mariadb-galera/Chart.yaml
@@ -18,7 +18,7 @@
apiVersion: v2
description: Chart for MariaDB Galera cluster
name: mariadb-galera
-version: 10.0.0
+version: 11.0.0
keywords:
- mariadb
- mysql
@@ -29,14 +29,14 @@
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../readinessCheck'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../serviceAccount'
\ No newline at end of file
diff --git a/kubernetes/common/mariadb-galera/templates/service.yaml b/kubernetes/common/mariadb-galera/templates/service.yaml
index 880bc55..9b4c05e 100644
--- a/kubernetes/common/mariadb-galera/templates/service.yaml
+++ b/kubernetes/common/mariadb-galera/templates/service.yaml
@@ -29,7 +29,7 @@
spec:
selector:
matchLabels:
- app: {{ include "common.servicename" . }}
+ app.kubernetes.io/name: {{ include "common.servicename" . }}
portLevelMtls:
{{ .Values.service.internalPort }}:
mode: DISABLE
diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index d719fb3..e9fe577 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -384,8 +384,9 @@
##
podAnnotations:
# sidecar.istio.io/inject: "false"
- traffic.sidecar.istio.io/excludeInboundPorts: "4568"
+ traffic.sidecar.istio.io/excludeInboundPorts: "4444,4567,4568"
traffic.sidecar.istio.io/includeInboundPorts: '*'
+ traffic.sidecar.istio.io/excludeOutboundPorts: "4444,4567,4568"
## Pod affinity preset
## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
diff --git a/kubernetes/common/mariadb-init/Chart.yaml b/kubernetes/common/mariadb-init/Chart.yaml
index ab8110f..b9fa78f 100644
--- a/kubernetes/common/mariadb-init/Chart.yaml
+++ b/kubernetes/common/mariadb-init/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: Chart for MariaDB Galera init job
name: mariadb-init
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml
index 5a97afe..229da35 100644
--- a/kubernetes/common/mongo/Chart.yaml
+++ b/kubernetes/common/mongo/Chart.yaml
@@ -16,12 +16,12 @@
apiVersion: v2
description: MongoDB Server
name: mongo
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml
index 723a125..f275168 100644
--- a/kubernetes/common/music/Chart.yaml
+++ b/kubernetes/common/music/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: MUSIC - Multi-site State Coordination Service
name: music
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: music-cassandra
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/music-cassandra'
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../certInitializer'
\ No newline at end of file
diff --git a/kubernetes/common/music/components/music-cassandra/Chart.yaml b/kubernetes/common/music/components/music-cassandra/Chart.yaml
index b902dd7..8a575c7 100644
--- a/kubernetes/common/music/components/music-cassandra/Chart.yaml
+++ b/kubernetes/common/music/components/music-cassandra/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP - Cassandra Database
name: music-cassandra
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml
index 2712596..2c4ed9e 100644
--- a/kubernetes/common/network-name-gen/Chart.yaml
+++ b/kubernetes/common/network-name-gen/Chart.yaml
@@ -17,20 +17,20 @@
apiVersion: v2
description: Name Generation Micro Service
name: network-name-gen
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../mariadb-galera'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../mariadb-init'
condition: not global.mariadbGalera.localCluster
\ No newline at end of file
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml
index 9bdf19c..97fece8 100644
--- a/kubernetes/common/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/common/network-name-gen/templates/deployment.yaml
@@ -80,7 +80,11 @@
- name: POL_BASIC_AUTH_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pol-basic-auth-secret" "key" "password") | indent 10}}
- name: POL_URL
- value: "{{ .Values.config.polUrl }}"
+ {{- if (include "common.needTLS" .) }}
+ value: "{{ .Values.config.polUrl.https }}"
+ {{- else }}
+ value: "{{ .Values.config.polUrl.http }}"
+ {{- end }}
- name: POL_ENV
value: "{{ .Values.config.polEnv }}"
- name: POL_REQ_ID
@@ -90,7 +94,11 @@
- name: AAI_CERT_PATH
value: "{{ .Values.config.aaiCertPath }}"
- name: AAI_URI
- value: "{{ .Values.config.aaiUri }}"
+ {{- if (include "common.needTLS" .) }}
+ value: "{{ .Values.config.aaiUri.https }}"
+ {{- else }}
+ value: "{{ .Values.config.aaiUri.http }}"
+ {{- end }}
- name: AAI_AUTH
value: "{{ .Values.config.aaiAuth }}"
- name: DISABLE_HOST_VERIFICATION
diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml
index 5f864a6..e5e2a7a 100644
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -87,14 +87,18 @@
polClientAuth: cHl0aG9uOnRlc3Q=
polBasicAuthUser: healthcheck
polBasicAuthPassword: zb!XztG34
- polUrl: https://policy-xacml-pdp:6969/policy/pdpx/v1/decision
+ polUrl:
+ https: https://policy-xacml-pdp:6969/policy/pdpx/v1/decision
+ http: http://policy-xacml-pdp:8080/policy/pdpx/v1/decision
polEnv: TEST
polReqId: xx
disableHostVerification: true
aaiCertPass: changeit
aaiCertPath: /opt/etc/config/aai_keystore
aaiAuth: QUFJOkFBSQ==
- aaiUri: https://aai:8443/aai/v14/
+ aaiUri:
+ https: https://aai:8443/aai/v14/
+ http: http://aai:8080/aai/v14/
# default number of instances
replicaCount: 1
@@ -118,7 +122,7 @@
service:
type: ClusterIP
name: neng-serv
- portName: neng-serv-port
+ portName: http
internalPort: 8080
externalPort: 8080
diff --git a/kubernetes/common/postgres-init/Chart.yaml b/kubernetes/common/postgres-init/Chart.yaml
index eacba40..ff8c98c 100644
--- a/kubernetes/common/postgres-init/Chart.yaml
+++ b/kubernetes/common/postgres-init/Chart.yaml
@@ -16,13 +16,13 @@
apiVersion: v2
description: Chart for Postgres init job
name: postgres-init
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/common/postgres-init/templates/job.yaml b/kubernetes/common/postgres-init/templates/job.yaml
index 01151bb..d9a7386 100644
--- a/kubernetes/common/postgres-init/templates/job.yaml
+++ b/kubernetes/common/postgres-init/templates/job.yaml
@@ -59,6 +59,8 @@
}
export PG_PASSWORD=`prepare_password $PG_PASSWORD_INPUT`;
export PG_ROOT_PASSWORD=`prepare_password $PG_ROOT_PASSWORD_INPUT`;
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
cd /config-input && for PFILE in `ls -1 .`; do envsubst <${PFILE} >/config/${PFILE}; done;
psql "postgresql://postgres:$PG_ROOT_PASSWORD@$PG_HOST" < /config/setup.sql
env:
@@ -98,6 +100,7 @@
name: pgconf
resources:
{{ include "common.resources" . | indent 12 }}
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/common/postgres-init/values.yaml b/kubernetes/common/postgres-init/values.yaml
index 7bcd8e2..d6d51f0 100644
--- a/kubernetes/common/postgres-init/values.yaml
+++ b/kubernetes/common/postgres-init/values.yaml
@@ -89,3 +89,7 @@
cpu: 1
memory: 2Gi
unlimited: {}
+
+wait_for_job_container:
+ containers:
+ - '{{ include "common.name" . }}-update-config'
\ No newline at end of file
diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml
index 7cf590a..8644bcf 100644
--- a/kubernetes/common/postgres/Chart.yaml
+++ b/kubernetes/common/postgres/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP Postgres Server
name: postgres
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/common/readinessCheck/Chart.yaml b/kubernetes/common/readinessCheck/Chart.yaml
index 7591363..3997aeb 100644
--- a/kubernetes/common/readinessCheck/Chart.yaml
+++ b/kubernetes/common/readinessCheck/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: Template used to wait for other deployment/sts/jobs in onap
name: readinessCheck
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/common/repository-wrapper/Chart.yaml b/kubernetes/common/repository-wrapper/Chart.yaml
index 49f7474..c385a3b 100644
--- a/kubernetes/common/repository-wrapper/Chart.yaml
+++ b/kubernetes/common/repository-wrapper/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: Wrapper chart to allow docker secret to be shared all instances
name: repository-wrapper
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/common/repositoryGenerator/Chart.yaml b/kubernetes/common/repositoryGenerator/Chart.yaml
index 230525f..fe710e1 100644
--- a/kubernetes/common/repositoryGenerator/Chart.yaml
+++ b/kubernetes/common/repositoryGenerator/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v2
description: Template used to generate the right repository link
name: repositoryGenerator
-version: 10.0.0
+version: 11.0.0
diff --git a/kubernetes/common/roles-wrapper/Chart.yaml b/kubernetes/common/roles-wrapper/Chart.yaml
index 855dd52..8024aba 100644
--- a/kubernetes/common/roles-wrapper/Chart.yaml
+++ b/kubernetes/common/roles-wrapper/Chart.yaml
@@ -16,9 +16,9 @@
apiVersion: v2
description: Wrapper chart to allow default roles to be shared among onap instances
name: roles-wrapper
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
\ No newline at end of file
diff --git a/kubernetes/common/serviceAccount/Chart.yaml b/kubernetes/common/serviceAccount/Chart.yaml
index 6ddb835..3309753 100644
--- a/kubernetes/common/serviceAccount/Chart.yaml
+++ b/kubernetes/common/serviceAccount/Chart.yaml
@@ -17,9 +17,9 @@
apiVersion: v2
description: Template used to create the right Service Accounts / Role / RoleBinding
name: serviceAccount
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../common'
\ No newline at end of file
diff --git a/kubernetes/common/timescaledb/Chart.yaml b/kubernetes/common/timescaledb/Chart.yaml
index 6099351..5e84be1 100644
--- a/kubernetes/common/timescaledb/Chart.yaml
+++ b/kubernetes/common/timescaledb/Chart.yaml
@@ -22,15 +22,15 @@
appVersion: "1.0"
description: ONAP timescaledb
name: timescaledb
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../repositoryGenerator'
\ No newline at end of file
diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml
index c80c318..c180bc1 100644
--- a/kubernetes/consul/Chart.yaml
+++ b/kubernetes/consul/Chart.yaml
@@ -18,22 +18,22 @@
apiVersion: v2
description: ONAP Consul Agent
name: consul
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: consul-server
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/consul-server'
condition: consul-server.enabled
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/consul/components/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
index 7460980..e1f8381 100644
--- a/kubernetes/consul/components/consul-server/Chart.yaml
+++ b/kubernetes/consul/components/consul-server/Chart.yaml
@@ -18,18 +18,18 @@
apiVersion: v2
description: ONAP Consul Server
name: consul-server
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/clamp-mariadb-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/clamp-mariadb-script.sh
index 1d99c51..1b721b3 100644
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/clamp-mariadb-script.sh
+++ b/kubernetes/consul/resources/config/consul-agent-config/scripts/clamp-mariadb-script.sh
@@ -19,7 +19,7 @@
NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-clampdb[^[:space:]]*")
if [ -n "$NAME" ]; then
- if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
+ if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- sh -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
echo Success. CLAMP DBHost is running. 2>&1
exit 0
else
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/policy-mariadb-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/policy-mariadb-script.sh
index 30f324b..865d477 100644
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/policy-mariadb-script.sh
+++ b/kubernetes/consul/resources/config/consul-agent-config/scripts/policy-mariadb-script.sh
@@ -19,7 +19,7 @@
NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-policydb[^[:space:]]*")
if [ -n "$NAME" ]; then
- if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
+ if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- sh -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
echo Success. mariadb process is running. 2>&1
exit 0
else
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-mariadb-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/so-mariadb-script.sh
index db5dcad..a0974c0 100755
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-mariadb-script.sh
+++ b/kubernetes/consul/resources/config/consul-agent-config/scripts/so-mariadb-script.sh
@@ -19,7 +19,7 @@
NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-so-db[^[:space:]]*")
if [ -n "$NAME" ]; then
- if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
+ if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- sh -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
echo Success. mariadb process is running. 2>&1
exit 0
else
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh
index f5d9941..7b0bc24 100755
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh
+++ b/kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh
@@ -19,7 +19,7 @@
NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-vid-mariadb[^[:space:]]*")
if [ -n "$NAME" ]; then
- if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
+ if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- sh -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
echo Success. mariadb process is running. 2>&1
exit 0
else
diff --git a/kubernetes/contrib/Chart.yaml b/kubernetes/contrib/Chart.yaml
index 1b5552a..0d366ff 100755
--- a/kubernetes/contrib/Chart.yaml
+++ b/kubernetes/contrib/Chart.yaml
@@ -17,24 +17,24 @@
apiVersion: v2
description: ONAP optional tools
name: contrib
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: awx
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/awx'
condition: awx.enabled
- name: ejbca
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/ejbca'
condition: global.cmpv2Enabled
- name: netbox
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/netbox'
condition: netbox.enabled
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/contrib/components/awx/Chart.yaml b/kubernetes/contrib/components/awx/Chart.yaml
index b29a3d7..3eea511 100755
--- a/kubernetes/contrib/components/awx/Chart.yaml
+++ b/kubernetes/contrib/components/awx/Chart.yaml
@@ -19,18 +19,18 @@
name: awx
sources:
- https://github.com/ansible/awx
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: awx-postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/awx-postgres'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
index 2999873..be7254a 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: Ansible AWX database
name: awx-postgres
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml
index 4cf03b2..a6dc5ff 100755
--- a/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml
@@ -75,7 +75,7 @@
service:
type: ClusterIP
name: awx-postgresql
- portName: awx-postgresql
+ portName: tcp-postgresql
internalPort: 5432
externalPort: 5432
diff --git a/kubernetes/contrib/components/awx/templates/job.yaml b/kubernetes/contrib/components/awx/templates/job.yaml
index f974f44..1ebe340 100644
--- a/kubernetes/contrib/components/awx/templates/job.yaml
+++ b/kubernetes/contrib/components/awx/templates/job.yaml
@@ -51,11 +51,16 @@
apiVersion: v1
fieldPath: metadata.namespace
containers:
- - command: ["/bin/sh","-c"]
- args: ["/etc/tower/job-entrypoint.sh"]
+ - name: {{ include "common.name" . }}-mgnt
+ command:
+ - /bin/sh
+ - -cx
+ - |
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
+ /etc/tower/job-entrypoint.sh
image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.task }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}-mgnt
resources:
requests:
cpu: 1500m
@@ -78,7 +83,7 @@
name: awx-secret-key
readOnly: true
subPath: SECRET_KEY
-
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
volumes:
- configMap:
defaultMode: 0777
diff --git a/kubernetes/contrib/components/awx/values.yaml b/kubernetes/contrib/components/awx/values.yaml
index 44c5741..c30999f 100755
--- a/kubernetes/contrib/components/awx/values.yaml
+++ b/kubernetes/contrib/components/awx/values.yaml
@@ -88,22 +88,22 @@
service:
rmqmgmt:
type: ClusterIP
- portName: rmqmgmt
+ portName: http-rmqmgmt
internalPort: 15672
externalPort: 15672
web:
type: ClusterIP
- portName: web
+ portName: http-web
internalPort: 8052
externalPort: 8052
rabbitmq:
type: ClusterIP
http:
- portName: http
+ portName: http-rmq
internalPort: 15672
externalPort: 15672
amqp:
- portName: amqp
+ portName: tcp-amqp
internalPort: 5672
externalPort: 5672
@@ -114,3 +114,7 @@
nameOverride: awx
roles:
- read
+
+wait_for_job_container:
+ containers:
+ - '{{ include "common.name" . }}-mgnt'
diff --git a/kubernetes/contrib/components/ejbca/Chart.yaml b/kubernetes/contrib/components/ejbca/Chart.yaml
index 2d68326..9b675c8 100644
--- a/kubernetes/contrib/components/ejbca/Chart.yaml
+++ b/kubernetes/contrib/components/ejbca/Chart.yaml
@@ -17,26 +17,26 @@
apiVersion: v2
description: ONAP EJBCA test server
name: ejbca
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: cmpv2Config
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/contrib/components/ejbca/templates/deployment.yaml b/kubernetes/contrib/components/ejbca/templates/deployment.yaml
index 6bd5b25..a36dcac 100644
--- a/kubernetes/contrib/components/ejbca/templates/deployment.yaml
+++ b/kubernetes/contrib/components/ejbca/templates/deployment.yaml
@@ -22,6 +22,16 @@
selector: {{- include "common.selectors" . | nindent 4 }}
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
+ {{- if (include "common.onServiceMesh" . ) }}
+ annotations:
+ {{- if eq ( .Values.global.serviceMesh.engine ) "linkerd" }}
+ linkerd.io/inject: disabled
+ {{- end }}
+ {{- if eq ( .Values.global.serviceMesh.engine ) "istio" }}
+ sidecar.istio.io/rewriteAppHTTPProbers: "false"
+ proxy.istio.io/config: '{ "holdApplicationUntilProxyStarts": true }'
+ {{- end }}
+ {{- end }}
spec:
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
@@ -51,7 +61,11 @@
lifecycle:
postStart:
exec:
- command: ["/bin/sh", "-c", "/opt/primekey/scripts/ejbca-config.sh"]
+ command:
+ - sh
+ - -c
+ - |
+ sleep 60; /opt/primekey/scripts/ejbca-config.sh
volumeMounts:
- name: "{{ include "common.fullname" . }}-volume"
mountPath: /opt/primekey/scripts/
diff --git a/kubernetes/contrib/components/ejbca/values.yaml b/kubernetes/contrib/components/ejbca/values.yaml
index 52e0e75..b777a7d 100644
--- a/kubernetes/contrib/components/ejbca/values.yaml
+++ b/kubernetes/contrib/components/ejbca/values.yaml
@@ -86,14 +86,14 @@
# probe configuration parameters
liveness:
path: /ejbca/publicweb/healthcheck/ejbcahealth
- port: api
- initialDelaySeconds: 30
+ port: 8443
+ initialDelaySeconds: 180
periodSeconds: 30
readiness:
path: /ejbca/publicweb/healthcheck/ejbcahealth
- port: api
- initialDelaySeconds: 30
+ port: 8443
+ initialDelaySeconds: 180
periodSeconds: 30
service:
@@ -106,7 +106,7 @@
port_protocol: http
# Resource Limit flavor -By Default using small
-flavor: small
+flavor: unlimited
# Segregation for Different environment (Small and Large)
resources:
small:
diff --git a/kubernetes/contrib/components/netbox/Chart.yaml b/kubernetes/contrib/components/netbox/Chart.yaml
index 24c9801..a0a8cdc 100755
--- a/kubernetes/contrib/components/netbox/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/Chart.yaml
@@ -17,21 +17,21 @@
apiVersion: v2
description: Netbox IPAM
name: netbox
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: netbox-app
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/netbox-app'
- name: netbox-nginx
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/netbox-nginx'
- name: netbox-postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/netbox-postgres'
\ No newline at end of file
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
index 19087d3..d820ee4 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: Netbox - Application (WSGI + Gunicorn)
name: netbox-app
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
index 4e4fdc0..bad4be1 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: Netbox - Nginx web server
name: netbox-nginx
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
index 85654d9..8aca215 100755
--- a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: Netbox Posgres database
name: netbox-postgres
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/cps/Chart.yaml b/kubernetes/cps/Chart.yaml
index 9052e00..7b60d63 100644
--- a/kubernetes/cps/Chart.yaml
+++ b/kubernetes/cps/Chart.yaml
@@ -17,25 +17,25 @@
apiVersion: v2
description: ONAP Configuration Persistance Service (CPS)
name: cps
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: roles-wrapper
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: standaloneDeployment
- name: cps-core
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: cps-core.enabled
- name: cps-temporal
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: cps-temporal.enabled
- name: ncmp-dmi-plugin
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: ncmp-dmi-plugin.enabled
diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml
index 95201a0..fcaee60 100644
--- a/kubernetes/cps/components/cps-core/Chart.yaml
+++ b/kubernetes/cps/components/cps-core/Chart.yaml
@@ -18,26 +18,26 @@
apiVersion: v2
description: ONAP Configuration Persistance Service (CPS) - Core
name: cps-core
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.postgres.localCluster
- name: postgres-init
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: postgres.postgresInit
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cps/components/cps-temporal/Chart.yaml b/kubernetes/cps/components/cps-temporal/Chart.yaml
index 502131b..cbda117 100644
--- a/kubernetes/cps/components/cps-temporal/Chart.yaml
+++ b/kubernetes/cps/components/cps-temporal/Chart.yaml
@@ -21,21 +21,21 @@
apiVersion: v2
description: ONAP Configuration Persistance Service (CPS) - Temporal
name: cps-temporal
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: timescaledb
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
index 10c2aab..669be9e 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
@@ -21,18 +21,18 @@
apiVersion: v2
description: ONAP Configuration Persistance Service (CPS) - NCMP-DMI-Plugin
name: ncmp-dmi-plugin
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index 7c8a0e7..23d0bbd 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -18,88 +18,88 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE Microservices
name: dcaegen2-services
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcae-datafile-collector
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-datafile-collector.enabled
- name: dcae-datalake-admin-ui
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-datalake-admin-ui.enabled
- name: dcae-datalake-des
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-datalake-des.enabled
- name: dcae-datalake-feeder
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-datalake-feeder.enabled
- name: dcae-heartbeat
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-heartbeat.enabled
- name: dcae-hv-ves-collector
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-hv-ves-collector.enabled
- name: dcae-kpi-ms
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-kpi-ms.enabled
- name: dcae-ms-healthcheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-ms-healthcheck.enabled
- name: dcae-pm-mapper
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-pm-mapper.enabled
- name: dcae-pmsh
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-pmsh.enabled
- name: dcae-prh
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-prh.enabled
- name: dcae-restconf-collector
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-restconf-collector.enabled
- name: dcae-slice-analysis-ms
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-slice-analysis-ms.enabled
- name: dcae-snmptrap-collector
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-snmptrap-collector.enabled
- name: dcae-son-handler
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-son-handler.enabled
- name: dcae-tcagen2
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-tcagen2.enabled
- name: dcae-ves-collector
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-ves-collector.enabled
- name: dcae-ves-mapper
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcae-ves-mapper.enabled
- name: dcae-ves-openapi-manager
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-ves-openapi-manager'
condition: dcae-ves-openapi-manager.enabled
diff --git a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
index b3c0146..25fa92b 100644
--- a/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
+++ b/kubernetes/dcaegen2-services/common/dcaegen2-services-common/Chart.yaml
@@ -18,12 +18,12 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE Microservices Common templates
name: dcaegen2-services-common
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
index 36edd4b..c51c222 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/Chart.yaml
@@ -18,27 +18,27 @@
# ================================= LICENSE_END ==============================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE DataFile Collector Helm charts
name: dcae-datafile-collector
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
index d61a50c..c4843d6 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/Chart.yaml
@@ -18,24 +18,24 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE datalake-admin-ui helm chart
name: dcae-datalake-admin-ui
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
index 7d2f36c..20b65f0 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/Chart.yaml
@@ -18,24 +18,24 @@
# ================================= LICENSE_END ==============================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE Datalake DES MS charts
name: dcae-datalake-des
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
index c62cbd1..3d1ea6e 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/Chart.yaml
@@ -18,27 +18,27 @@
# ================================= LICENSE_END ==============================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE Datalake feeder MS charts
name: dcae-datalake-feeder
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
index 207052f..056696a 100644
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/Chart.yaml
@@ -18,27 +18,27 @@
# ================================= LICENSE_END ==============================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE Heartbeat Microservice
name: dcae-heartbeat
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
index 30d73f3..0c9732a 100644
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/Chart.yaml
@@ -18,27 +18,27 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE HV VES collector
name: dcae-hv-ves-collector
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
index 53b070e..ff18e15 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/Chart.yaml
@@ -18,24 +18,24 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE KPI MS chart
name: dcae-kpi-ms
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
index ad8ca9f..6ce0a1f 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
@@ -70,10 +70,12 @@
tlsServer: true
enable_tls: true
-dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
-policies:
- policyID: |
- '["com.Config_KPIMS_CONFIG_POLICY"]'
+# Optional Policy configuration properties
+# if present, policy-sync side car will be deployed
+#dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
+#policies:
+# policyID: |
+# '["com.Config_KPIMS_CONFIG_POLICY"]'
# Dependencies
readinessCheck:
diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
index 73331aa..2e13863 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/Chart.yaml
@@ -20,18 +20,18 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: ONAP DCAE Microservice Health Check
name: dcae-ms-healthcheck
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
index d3a128f..5aa8fea 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/Chart.yaml
@@ -18,24 +18,24 @@
# ================================= LICENSE_END ==============================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE PM-Mapper Helm charts
name: dcae-pm-mapper
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../common/dcaegen2-services-common'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
index 25f25e6..f68e715 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/Chart.yaml
@@ -19,27 +19,27 @@
# ================================= LICENSE_END ==============================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE PMSH Service
name: dcae-pmsh
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
index 14e5e87..54d1fce 100644
--- a/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/Chart.yaml
@@ -18,24 +18,24 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE PRH
name: dcae-prh
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
index cec9575..e78d480 100644
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/Chart.yaml
@@ -18,24 +18,24 @@
# ================================= LICENSE_END ==============================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE RESTConf Collector
name: dcae-restconf-collector
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
index bee29cd..8dbed7c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/Chart.yaml
@@ -18,27 +18,27 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE SliceAnalysis MS charts
name: dcae-slice-analysis-ms
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
index 3cd71a3..b05f35f 100644
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/Chart.yaml
@@ -18,24 +18,24 @@
# ================================= LICENSE_END ==============================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE SNMPTrap Collector
name: dcae-snmptrap-collector
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
index 895f642..edc2efc 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/Chart.yaml
@@ -18,27 +18,27 @@
# ============= LICENSE_END ==================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE Son-handler helm chart
name: dcae-son-handler
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
index 6673157..e8a9403 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
@@ -81,12 +81,12 @@
# and key from AAF and mount them in certDirectory.
tlsServer: false
-# Policy configuraiton properties
+# Optional Policy configuration properties
# if present, policy-sync side car will be deployed
-dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
-policies:
- policyID: |
- '["com.Config_PCIMS_CONFIG_POLICY"]'
+#dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
+#policies:
+# policyID: |
+# '["com.Config_PCIMS_CONFIG_POLICY"]'
# Dependencies
readinessCheck:
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
index c5f4efe..6eb8528 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/Chart.yaml
@@ -18,30 +18,30 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE TCA (Gen 2)
name: dcae-tcagen2
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mongo
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
index 8022b79..ac1b812 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
@@ -18,27 +18,27 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE VES Collector
name: dcae-ves-collector
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
index 2097a97..82f4881 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/Chart.yaml
@@ -18,24 +18,24 @@
# ================================= LICENSE_END ==============================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: DCAE VES-Mapper Microservice
name: dcae-ves-mapper
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
index 3065b57..74fd557 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
@@ -20,18 +20,18 @@
apiVersion: v2
description: ONAP DCAE VES OpenApi Manager
name: dcae-ves-openapi-manager
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index eb69410..ba1e47a 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -17,46 +17,46 @@
apiVersion: v2
description: ONAP DCAE Gen2
name: dcaegen2
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcae-bootstrap
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-bootstrap'
condition: dcae-bootstrap.enabled
- name: dcae-cloudify-manager
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-cloudify-manager'
condition: dcae-cloudify-manager.enabled
- name: dcae-config-binding-service
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-config-binding-service'
condition: dcae-config-binding-service.enabled
- name: dcae-healthcheck
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-healthcheck'
condition: dcae-healthcheck.enabled
- name: dcae-servicechange-handler
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-servicechange-handler'
condition: dcae-servicechange-handler.enabled
- name: dcae-inventory-api
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-inventory-api'
condition: dcae-inventory-api.enabled
- name: dcae-deployment-handler
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-deployment-handler'
condition: dcae-deployment-handler.enabled
- name: dcae-policy-handler
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-policy-handler'
condition: dcae-policy-handler.enabled
- name: dcae-dashboard
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcae-dashboard'
condition: dcae-dashboard.enabled
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
index d4f797b..21e6850 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml
@@ -21,19 +21,19 @@
apiVersion: v2
description: ONAP DCAE Bootstrap
name: dcae-bootstrap
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
alias: postgres
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
index 09b3684..b268ca8 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml
@@ -21,18 +21,18 @@
apiVersion: v2
description: ONAP DCAE Cloudify Manager
name: dcae-cloudify-manager
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: cmpv2Config
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
index d5fb997..9ffacf4 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml
@@ -20,15 +20,15 @@
apiVersion: v2
description: ONAP DCAE Config Binding Service
name: dcae-config-binding-service
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
index e0b2976..3b1bcdd 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml
@@ -20,18 +20,18 @@
appVersion: "1.0"
description: DCAE Dashboard
name: dcae-dashboard
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
index a11cdf9..e8193ab 100644
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml
@@ -20,15 +20,15 @@
apiVersion: v2
description: ONAP DCAE Deployment Handler
name: dcae-deployment-handler
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
index 8954e72..29693c4 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml
@@ -21,15 +21,15 @@
apiVersion: v2
description: ONAP DCAE Health Check
name: dcae-healthcheck
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
index 32ba74e..7d69c01 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml
@@ -20,18 +20,18 @@
apiVersion: v2
description: ONAP DCAE Inventory API Service
name: dcae-inventory-api
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
index 4c3abab..b15740b 100644
--- a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml
@@ -20,15 +20,15 @@
apiVersion: v2
description: ONAP DCAE Policy Handler
name: dcae-policy-handler
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
index af78d79..7f3a04a 100644
--- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
+++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml
@@ -20,15 +20,15 @@
apiVersion: v2
description: ONAP DCAE Service Change Handler
name: dcae-servicechange-handler
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/Chart.yaml b/kubernetes/dcaemod/Chart.yaml
index 8bf2ddf..60a5765 100644
--- a/kubernetes/dcaemod/Chart.yaml
+++ b/kubernetes/dcaemod/Chart.yaml
@@ -20,37 +20,37 @@
apiVersion: v2
description: ONAP DCAE MOD
name: dcaemod
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaemod-genprocessor
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcaemod-genprocessor'
condition: dcaemod-genprocessor.enabled
- name: dcaemod-distributor-api
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcaemod-distributor-api'
condition: dcaemod-distributor-api.enabled
- name: dcaemod-designtool
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcaemod-designtool'
condition: dcaemod-designtool.enabled
- name: dcaemod-onboarding-api
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcaemod-onboarding-api'
condition: dcaemod-onboarding-api.enabled
- name: dcaemod-runtime-api
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcaemod-runtime-api'
condition: dcaemod-runtime-api.enabled
- name: dcaemod-nifi-registry
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcaemod-nifi-registry'
condition: dcaemod-nifi-registry.enabled
- name: dcaemod-healthcheck
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dcaemod-healthcheck'
condition: dcaemod-healthcheck.enabled
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
index cf27ca4..d5f61a3 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml
@@ -19,15 +19,15 @@
apiVersion: v2
description: ONAP DCAE MOD Design Tool
name: dcaemod-designtool
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
index 2cdab6b..0643257 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml
@@ -20,15 +20,15 @@
apiVersion: v2
description: ONAP DCAE MOD Distributor API
name: dcaemod-distributor-api
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
index 7bb4a64..864ac0d 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml
@@ -20,15 +20,15 @@
apiVersion: v2
description: ONAP DCAE MOD Genprocessor
name: dcaemod-genprocessor
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
index 5363412..55dbc33 100644
--- a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml
@@ -21,15 +21,15 @@
apiVersion: v2
description: ONAP DCAE MOD Health Check
name: dcaemod-healthcheck
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
index bb717a5..ce3d043 100644
--- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml
@@ -20,15 +20,15 @@
apiVersion: v2
description: ONAP DCAE MOD Nifi Registry
name: dcaemod-nifi-registry
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
index ae68dbe..73bade4 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml
@@ -20,18 +20,18 @@
apiVersion: v2
description: ONAP DCAE MOD Onboarding API
name: dcaemod-onboarding-api
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
index 1714d77..4e1c940 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml
@@ -20,18 +20,18 @@
apiVersion: v2
description: ONAP DCAE MOD Runtime API
name: dcaemod-runtime-api
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml
index 555e637..db16451 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/Chart.yaml
@@ -16,32 +16,32 @@
# ============LICENSE_END=========================================================
apiVersion: v2
-appVersion: "Jakarta"
+appVersion: "Kohn"
description: TBD
name: TBD
version: TBD
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dcaegen2-services-common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: postgres.enabled
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mongo
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: mongo.enabled
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml
index 7609ba6..9916021 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/resources/config/base/values.yaml
@@ -22,13 +22,6 @@
nodePortPrefixExt: 304
#################################################################
-# Filebeat configuration defaults.
-#################################################################
-filebeatConfig:
- logstashServiceName: log-ls
- logstashPort: 5044
-
-#################################################################
# initContainer images.
#################################################################
tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
@@ -66,12 +59,8 @@
# log directory where logging sidecar should look for log files
# if absent, no sidecar will be deployed
-#logDirectory: TBD #/opt/app/VESCollector/logs #DONE
-
-# Following requires manual override until fix for DCAEGEN2-3087
-# is available to switch logDirectory setting to log.path
-log:
- path: /opt/app/
+#log:
+# path: TBD #/opt/app/VESCollector/logs #DONE
logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
# directory where TLS certs should be stored
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
index 5c50381..64d196d 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
@@ -93,7 +93,7 @@
# application image
-image: onap/org.onap.dcaegen2.platform.mod.runtime-web:1.3.2
+image: onap/org.onap.dcaegen2.platform.mod.runtime-web:1.3.3
# Resource Limit flavor -By Default using small
flavor: small
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index 481b48f..d8cb1d5 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -18,32 +18,32 @@
apiVersion: v2
description: ONAP DMaaP components
name: dmaap
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: dmaap-strimzi
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dmaap-strimzi'
condition: dmaap-strimzi.enabled
- name: message-router
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/message-router'
condition: message-router.enabled
- name: dmaap-bc
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dmaap-bc'
condition: dmaap-bc.enabled
- name: dmaap-dr-node
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dmaap-dr-node'
condition: dmaap-dr-node.enabled
- name: dmaap-dr-prov
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dmaap-dr-prov'
condition: dmaap-dr-prov.enabled
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index 3903c5d..5ed50ca 100644
--- a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
@@ -18,22 +18,22 @@
apiVersion: v2
description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
name: dmaap-bc
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: PG.enabled
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
index 4c65198..59ea16b 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: ONAP DMaaP Data Router Node Server
name: dmaap-dr-node
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
index 74c984b..72e75c4 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
@@ -16,25 +16,25 @@
apiVersion: v2
description: ONAP DMaaP Data Router Provisioning Server
name: dmaap-dr-prov
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-strimzi/Chart.yaml b/kubernetes/dmaap/components/dmaap-strimzi/Chart.yaml
index d8f607e..d62aebe 100644
--- a/kubernetes/dmaap/components/dmaap-strimzi/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-strimzi/Chart.yaml
@@ -15,18 +15,18 @@
apiVersion: v2
description: ONAP Dmaap Strimzi Kafka Bridge
name: dmaap-strimzi
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml
index 549fb72..74700ff 100644
--- a/kubernetes/dmaap/components/message-router/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/Chart.yaml
@@ -18,21 +18,21 @@
apiVersion: v2
description: ONAP Message Router
name: message-router
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index e9d890e..174eb2c 100644
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@ -68,7 +68,7 @@
mountPath: /etc/jmx-kafka
{{- end }}
- name: srimzi-zk-entrance
- image: 'docker.io/scholzj/zoo-entrance:latest'
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.zookeeper.entrance.image }}
command:
- /opt/stunnel/stunnel_run.sh
ports:
@@ -227,4 +227,4 @@
- port: {{ .Values.global.zkTunnelService.internalPort }}
protocol: TCP
policyTypes:
- - Ingress
\ No newline at end of file
+ - Ingress
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 3726652..11daae0 100644
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -71,6 +71,10 @@
image: onap/dmaap/dmaap-mr:1.3.2
pullPolicy: Always
+zookeeper:
+ entrance:
+ image: scholzj/zoo-entrance:latest
+
secrets:
- uid: mr-kafka-admin-secret
externalSecret: '{{ tpl (default "" .Values.config.jaasConfExternalSecret) . }}'
diff --git a/kubernetes/helm/starters/onap-app/Chart.yaml b/kubernetes/helm/starters/onap-app/Chart.yaml
index 6782264..2f8c678 100644
--- a/kubernetes/helm/starters/onap-app/Chart.yaml
+++ b/kubernetes/helm/starters/onap-app/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: <Short application description - this is visible via 'helm search'>
name: <onap-app>
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/holmes/Chart.yaml b/kubernetes/holmes/Chart.yaml
index 5b80bf8..10268d4 100644
--- a/kubernetes/holmes/Chart.yaml
+++ b/kubernetes/holmes/Chart.yaml
@@ -18,26 +18,26 @@
apiVersion: v2
description: ONAP DCAE HOLMES
name: holmes
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.postgres.localCluster
- name: postgres-init
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: not global.postgres.localCluster
- name: holmes-rule-mgmt
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/holmes-rule-mgmt'
- name: holmes-engine-mgmt
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/holmes-engine-mgmt'
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
index 455996b..5169d65 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/Chart.yaml
@@ -18,18 +18,18 @@
appVersion: "2.0"
description: Holmes Engine Management
name: holmes-engine-mgmt
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
index 97d7fe3..08eb19d 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/Chart.yaml
@@ -18,18 +18,18 @@
appVersion: "2.0"
description: Holmes Rule Management
name: holmes-rule-mgmt
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/log/Chart.yaml b/kubernetes/log/Chart.yaml
index 7046188..891566c 100644
--- a/kubernetes/log/Chart.yaml
+++ b/kubernetes/log/Chart.yaml
@@ -18,21 +18,21 @@
apiVersion: v2
description: ONAP Logging ElasticStack
name: log
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: log-elasticsearch
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/log-elasticsearch'
- name: log-kibana
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/log-kibana'
- name: log-logstash
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/log-logstash'
diff --git a/kubernetes/log/components/log-elasticsearch/Chart.yaml b/kubernetes/log/components/log-elasticsearch/Chart.yaml
index 39cd8eb..7783eb1 100644
--- a/kubernetes/log/components/log-elasticsearch/Chart.yaml
+++ b/kubernetes/log/components/log-elasticsearch/Chart.yaml
@@ -18,12 +18,12 @@
apiVersion: v2
description: ONAP Logging Elasticsearch
name: log-elasticsearch
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/log/components/log-kibana/Chart.yaml b/kubernetes/log/components/log-kibana/Chart.yaml
index 53233a0..0df19a6 100644
--- a/kubernetes/log/components/log-kibana/Chart.yaml
+++ b/kubernetes/log/components/log-kibana/Chart.yaml
@@ -18,12 +18,12 @@
apiVersion: v2
description: ONAP Logging Kibana
name: log-kibana
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/log/components/log-logstash/Chart.yaml b/kubernetes/log/components/log-logstash/Chart.yaml
index 143ee1a..b8a0d8e 100644
--- a/kubernetes/log/components/log-logstash/Chart.yaml
+++ b/kubernetes/log/components/log-logstash/Chart.yaml
@@ -18,12 +18,12 @@
apiVersion: v2
description: ONAP Logging Logstash
name: log-logstash
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/modeling/Chart.yaml b/kubernetes/modeling/Chart.yaml
index 13b398b..fdb4031 100644
--- a/kubernetes/modeling/Chart.yaml
+++ b/kubernetes/modeling/Chart.yaml
@@ -17,9 +17,9 @@
apiVersion: v2
description: ONAP Modeling (Modeling)
name: modeling
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: modeling-etsicatalog
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/modeling-etsicatalog'
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
index 8825c6f..0c6dc78 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml
@@ -17,26 +17,26 @@
apiVersion: v2
description: ONAP Modeling - Etsicatalog
name: modeling-etsicatalog
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/msb/Chart.yaml b/kubernetes/msb/Chart.yaml
index d21fdf8..0ca7657 100644
--- a/kubernetes/msb/Chart.yaml
+++ b/kubernetes/msb/Chart.yaml
@@ -18,28 +18,28 @@
apiVersion: v2
description: ONAP MicroServices Bus
name: msb
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: kube2msb
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/kube2msb'
- name: msb-consul
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/msb-consul'
- name: msb-discovery
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/msb-discovery'
- name: msb-eag
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/msb-eag'
- name: msb-iag
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/msb-iag'
diff --git a/kubernetes/msb/components/kube2msb/Chart.yaml b/kubernetes/msb/components/kube2msb/Chart.yaml
index c196848..ec63e05 100644
--- a/kubernetes/msb/components/kube2msb/Chart.yaml
+++ b/kubernetes/msb/components/kube2msb/Chart.yaml
@@ -16,12 +16,12 @@
apiVersion: v2
description: ONAP MicroServices Bus Kube2MSB Registrator
name: kube2msb
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/msb/components/msb-consul/Chart.yaml b/kubernetes/msb/components/msb-consul/Chart.yaml
index 487b5d9..830023b 100644
--- a/kubernetes/msb/components/msb-consul/Chart.yaml
+++ b/kubernetes/msb/components/msb-consul/Chart.yaml
@@ -16,15 +16,15 @@
apiVersion: v2
description: ONAP MicroServices Bus Consul
name: msb-consul
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/msb/components/msb-discovery/Chart.yaml b/kubernetes/msb/components/msb-discovery/Chart.yaml
index cece182..8d0c9a1 100644
--- a/kubernetes/msb/components/msb-discovery/Chart.yaml
+++ b/kubernetes/msb/components/msb-discovery/Chart.yaml
@@ -16,15 +16,15 @@
apiVersion: v2
description: ONAP MicroServices Bus Discovery
name: msb-discovery
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/msb/components/msb-eag/Chart.yaml b/kubernetes/msb/components/msb-eag/Chart.yaml
index 7a8d65e..1348eaa 100644
--- a/kubernetes/msb/components/msb-eag/Chart.yaml
+++ b/kubernetes/msb/components/msb-eag/Chart.yaml
@@ -16,18 +16,18 @@
apiVersion: v2
description: ONAP MicroServices Bus Internal API Gateway
name: msb-eag
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/msb/components/msb-iag/Chart.yaml b/kubernetes/msb/components/msb-iag/Chart.yaml
index 80f5794..3808415 100644
--- a/kubernetes/msb/components/msb-iag/Chart.yaml
+++ b/kubernetes/msb/components/msb-iag/Chart.yaml
@@ -16,18 +16,18 @@
apiVersion: v2
description: ONAP MicroServices Bus Internal API Gateway
name: msb-iag
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml
index 07fac60..7bc5f17 100644
--- a/kubernetes/multicloud/Chart.yaml
+++ b/kubernetes/multicloud/Chart.yaml
@@ -18,43 +18,43 @@
apiVersion: v2
description: ONAP multicloud broker
name: multicloud
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: multicloud-fcaps
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/multicloud-fcaps'
condition: multicloud-fcaps.enabled
- name: multicloud-k8s
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/multicloud-k8s'
condition: multicloud-k8s.enabled
- name: multicloud-pike
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/multicloud-pike'
condition: multicloud-pike.enabled
- name: multicloud-prometheus
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/multicloud-prometheus'
condition: multicloud-prometheus.enabled
- name: multicloud-starlingx
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/multicloud-starlingx'
condition: multicloud-starlingx.enabled
- name: multicloud-vio
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/multicloud-vio'
condition: multicloud-vio.enabled
- name: multicloud-windriver
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/multicloud-windriver'
condition: multicloud-windriver.enabled
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
index 7a49ed3..c8fdd60 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml
@@ -16,15 +16,15 @@
apiVersion: v2
description: ONAP multicloud OpenStack fcaps Plugin
name: multicloud-fcaps
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
index 278f9d0..c6645db 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml
@@ -17,24 +17,24 @@
apiVersion: v2
description: ONAP Multicloud Kubernetes Plugin
name: multicloud-k8s
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: mongo
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: etcd
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
index 3bf3a95..45dd8e5 100644
--- a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP multicloud OpenStack Pike Plugin
name: multicloud-pike
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
index 7af1a67..1fbfcd4 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml
@@ -17,21 +17,21 @@
apiVersion: v2
description: ONAP Multicloud Prometheus
name: multicloud-prometheus
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: prometheus-alertmanager
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/prometheus-alertmanager'
- name: prometheus-grafana
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/prometheus-grafana'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
index e2b3a26..7734428 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v2
description: ONAP Multicloud Prometheus Alert Manager
name: prometheus-alertmanager
-version: 10.0.0
+version: 11.0.0
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
index cf8cfc5..b72890c 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v2
description: ONAP Multicloud Grafana for Prometheus
name: prometheus-grafana
-version: 10.0.0
+version: 11.0.0
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
index 9b49b71..79e0831 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP multicloud OpenStack Starlingx Plugin
name: multicloud-starlingx
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
index 90a5c94..0c444fb 100644
--- a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: ONAP multicloud VIO plugin
name: multicloud-vio
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
index 79df200..d161db5 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: ONAP multicloud OpenStack WindRiver Plugin
name: multicloud-windriver
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml
index fee022a..93a05d3 100644
--- a/kubernetes/nbi/Chart.yaml
+++ b/kubernetes/nbi/Chart.yaml
@@ -17,32 +17,32 @@
apiVersion: v2
description: ONAP Northbound Interface
name: nbi
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mongo
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 371bc71..3113fda 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -15,8 +15,8 @@
apiVersion: v2
name: onap
-version: 10.0.0
-appVersion: Jakarta
+version: 11.0.0
+appVersion: Kohn
description: Open Network Automation Platform (ONAP)
home: https://www.onap.org/
sources:
@@ -26,160 +26,160 @@
dependencies:
- name: aaf
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: aaf.enabled
- name: aai
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: aai.enabled
- name: appc
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: appc.enabled
- name: cassandra
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: cassandra.enabled
- name: cds
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: cds.enabled
- name: cli
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: cli.enabled
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: consul
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: consul.enabled
- name: contrib
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.addTestingComponents
- name: cps
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: cps.enabled
- name: dcaegen2
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcaegen2.enabled
- name: dcaegen2-services
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcaegen2-services.enabled
- name: dcaemod
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dcaemod.enabled
- name: holmes
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: holmes.enabled
- name: dmaap
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dmaap.enabled
- name: log
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: log.enabled
- name: sniro-emulator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: sniro-emulator.enabled
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: mariadb-galera.enabled
- name: msb
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: msb.enabled
- name: multicloud
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: multicloud.enabled
- name: nbi
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: nbi.enabled
- name: policy
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: policy.enabled
- name: portal
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: portal.enabled
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: postgres.enabled
- name: oof
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: oof.enabled
- name: repository-wrapper
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: robot
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: robot.enabled
- name: sdc
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: sdc.enabled
- name: sdnc
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: sdnc.enabled
- name: so
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: so.enabled
- name: strimzi
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: strimzi.enabled
- name: uui
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: uui.enabled
- name: vfc
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: vfc.enabled
- name: vid
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: vid.enabled
- name: vnfsdk
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: vnfsdk.enabled
- name: modeling
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: modeling.enabled
- name: platform
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: platform.enabled
- name: a1policymanagement
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: a1policymanagement.enabled
- name: cert-wrapper
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: cert-wrapper.enabled
- name: roles-wrapper
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: roles-wrapper.enabled
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index f16813f..f8f1b4c 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -2,6 +2,7 @@
# Copyright (c) 2020 Nordix Foundation, Modifications
# Modifications Copyright © 2020 Nokia
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2022 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -56,6 +57,44 @@
enabled: true
dcaegen2-services:
enabled: true
+ dcae-datafile-collector:
+ enabled: true
+ dcae-datalake-admin-ui:
+ enabled: true
+ dcae-datalake-des:
+ enabled: true
+ dcae-datalake-feeder:
+ enabled: true
+ dcae-heartbeat:
+ enabled: true
+ dcae-hv-ves-collector:
+ enabled: true
+ dcae-kpi-ms:
+ enabled: true
+ dcae-ms-healthcheck:
+ enabled: true
+ dcae-pm-mapper:
+ enabled: true
+ dcae-pmsh:
+ enabled: true
+ dcae-prh:
+ enabled: true
+ dcae-restconf-collector:
+ enabled: true
+ dcae-slice-analysis-ms:
+ enabled: true
+ dcae-snmptrap-collector:
+ enabled: true
+ dcae-son-handler:
+ enabled: true
+ dcae-tcagen2:
+ enabled: true
+ dcae-ves-collector:
+ enabled: true
+ dcae-ves-mapper:
+ enabled: true
+ dcae-ves-openapi-manager:
+ enabled: true
dcaemod:
enabled: true
holmes:
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index 37080b8..2af6e21 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -135,7 +135,7 @@
openStackServiceTenantName: "$OPENSTACK_TENANT_NAME"
openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD"
strimzi:
- enabled: false
+ enabled: true
uui:
enabled: false
vid:
diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml
index 0bc7dd9..7602afd 100755
--- a/kubernetes/oof/Chart.yaml
+++ b/kubernetes/oof/Chart.yaml
@@ -18,25 +18,25 @@
apiVersion: v2
description: ONAP Optimization Framework
name: oof
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: oof-has
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/oof-has'
condition: oof-has.enabled
- name: oof-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/oof-templates'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/Chart.yaml b/kubernetes/oof/components/oof-has/Chart.yaml
index ad129e0..8561389 100755
--- a/kubernetes/oof/components/oof-has/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/Chart.yaml
@@ -18,45 +18,45 @@
apiVersion: v2
description: ONAP Homing and Allocation Service
name: oof-has
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: music
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: music.enabled
- name: etcd
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: etcd.enabled
- name: etcd-init
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: etcd-init.enabled
- name: oof-has-api
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/oof-has-api'
condition: oof-has-api.enabled
- name: oof-has-controller
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/oof-has-controller'
condition: oof-has-controller.enabled
- name: oof-has-data
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/oof-has-data'
condition: oof-has-data.enabled
- name: oof-has-reservation
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/oof-has-reservation'
condition: oof-has-reservation.enabled
- name: oof-has-solver
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/oof-has-solver'
condition: oof-has-solver.enabled
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
index 3026110..a155811 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml
@@ -18,21 +18,21 @@
apiVersion: v2
description: ONAP Homing and Allocation Servicei - API
name: oof-has-api
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: oof-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
index b59f49a..e8f510b 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml
@@ -18,18 +18,18 @@
apiVersion: v2
description: ONAP Homing and Allocation Sservice - Controller
name: oof-has-controller
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: oof-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
index f1757ec..3bcfd08 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml
@@ -18,18 +18,18 @@
apiVersion: v2
description: ONAP Homing and Allocation Service - Data Component
name: oof-has-data
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: oof-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
index 87a2417..ba2733e 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml
@@ -18,18 +18,18 @@
apiVersion: v2
description: ONAP Homing and Allocation Sevice - Reservation Component
name: oof-has-reservation
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: oof-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
index 663d863..3ec7d88 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml
@@ -18,18 +18,18 @@
apiVersion: v2
description: ONAP Homing and Allocation Service - Solver Component
name: oof-has-solver
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: oof-templates
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../../../oof-templates'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/oof/components/oof-templates/Chart.yaml b/kubernetes/oof/components/oof-templates/Chart.yaml
index 18f233b..a59f751 100755
--- a/kubernetes/oof/components/oof-templates/Chart.yaml
+++ b/kubernetes/oof/components/oof-templates/Chart.yaml
@@ -18,10 +18,10 @@
apiVersion: v2
description: ONAP OOF helm templates
name: oof-templates
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/platform/Chart.yaml b/kubernetes/platform/Chart.yaml
index 5869d74..559e5fe 100644
--- a/kubernetes/platform/Chart.yaml
+++ b/kubernetes/platform/Chart.yaml
@@ -19,15 +19,15 @@
apiVersion: v2
description: ONAP platform components
name: platform
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: oom-cert-service
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/oom-cert-service'
- name: cmpv2-cert-provider
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/cmpv2-cert-provider'
- name: chartmuseum
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/chartmuseum'
diff --git a/kubernetes/platform/components/chartmuseum/Chart.yaml b/kubernetes/platform/components/chartmuseum/Chart.yaml
index 16b504b..e8a5b83 100644
--- a/kubernetes/platform/components/chartmuseum/Chart.yaml
+++ b/kubernetes/platform/components/chartmuseum/Chart.yaml
@@ -20,18 +20,18 @@
apiVersion: v2
description: ONAP Chart Museum
name: chartmuseum
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
index b468412..1c6cb71 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP CMPv2 certificate external provider for cert-manager
name: cmpv2-cert-provider
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml b/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml
index c497622..ce5e410 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/templates/deployment.yaml
@@ -32,6 +32,16 @@
metadata:
labels:
control-plane: controller-manager
+ {{- if (include "common.onServiceMesh" . | nindent 6 ) }}
+ annotations:
+ {{- if eq ( .Values.global.serviceMesh.engine ) "linkerd" }}
+ linkerd.io/inject: disabled
+ {{- end }}
+ {{- if eq ( .Values.global.serviceMesh.engine ) "istio" }}
+ traffic.sidecar.istio.io/excludeInboundPorts: "8080,8443"
+ traffic.sidecar.istio.io/includeInboundPorts: '*'
+ {{- end }}
+ {{- end }}
spec:
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/platform/components/oom-cert-service/Chart.yaml b/kubernetes/platform/components/oom-cert-service/Chart.yaml
index de3b9eb..30da403 100644
--- a/kubernetes/platform/components/oom-cert-service/Chart.yaml
+++ b/kubernetes/platform/components/oom-cert-service/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: ONAP Cert Service
name: oom-cert-service
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: cmpv2Config
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
index 8215ed9..5f80a7d 100644
--- a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
+++ b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
@@ -22,6 +22,16 @@
selector: {{- include "common.selectors" . | nindent 4 }}
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
+ {{- if (include "common.onServiceMesh" . ) }}
+ annotations:
+ {{- if eq ( .Values.global.serviceMesh.engine ) "linkerd" }}
+ linkerd.io/inject: disabled
+ {{- end }}
+ {{- if eq ( .Values.global.serviceMesh.engine ) "istio" }}
+ traffic.sidecar.istio.io/excludeInboundPorts: "8080,8443"
+ traffic.sidecar.istio.io/includeInboundPorts: '*'
+ {{- end }}
+ {{- end }}
spec:
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml
index d3b3c7b..803298a 100755
--- a/kubernetes/policy/Chart.yaml
+++ b/kubernetes/policy/Chart.yaml
@@ -18,77 +18,77 @@
apiVersion: v2
description: ONAP Policy
name: policy
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: policy-nexus
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-nexus'
condition: policy-nexus.enabled
- name: policy-api
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-api'
condition: policy-api.enabled
- name: policy-pap
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-pap'
condition: policy-pap.enabled
- name: policy-xacml-pdp
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-xacml-pdp'
condition: policy-xacml-pdp.enabled
- name: policy-apex-pdp
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-apex-pdp'
condition: policy-apex-pdp.enabled
- name: policy-drools-pdp
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-drools-pdp'
condition: policy-drools-pdp.enabled
- name: policy-distribution
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-distribution'
condition: policy-distribution.enabled
- name: policy-clamp-be
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-clamp-be'
condition: policy-clamp-be.enabled
- name: policy-clamp-ac-k8s-ppnt
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-clamp-ac-k8s-ppnt'
condition: policy-clamp-ac-k8s-ppnt.enabled
- name: policy-clamp-ac-http-ppnt
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-clamp-ac-http-ppnt'
condition: policy-clamp-ac-http-ppnt.enabled
- name: policy-clamp-ac-pf-ppnt
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-clamp-ac-pf-ppnt'
condition: policy-clamp-ac-pf-ppnt.enabled
- name: policy-clamp-runtime-acm
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-clamp-runtime-acm'
condition: policy-clamp-runtime-acm.enabled
- name: policy-gui
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/policy-gui'
condition: policy-gui.enabled
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.postgres.localCluster
diff --git a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
index 7f22e9f..92af552 100755
--- a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
@@ -21,18 +21,18 @@
apiVersion: v2
description: ONAP Policy APEX PDP
name: policy-apex-pdp
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-api/Chart.yaml b/kubernetes/policy/components/policy-api/Chart.yaml
index 82a0f48..d317b9e 100755
--- a/kubernetes/policy/components/policy-api/Chart.yaml
+++ b/kubernetes/policy/components/policy-api/Chart.yaml
@@ -21,18 +21,18 @@
apiVersion: v2
description: ONAP Policy Design API
name: policy-api
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
index 00cbd28..2fa60d5 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
@@ -19,18 +19,18 @@
apiVersion: v2
description: ONAP Policy Clamp Controlloop Http Participant
name: policy-clamp-ac-http-ppnt
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
index b55cb35..2ca3762 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
@@ -21,18 +21,18 @@
apiVersion: v2
description: ONAP Policy Clamp Controlloop K8s Participant
name: policy-clamp-ac-k8s-ppnt
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
index 0b7e2ab..823faf0 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
@@ -82,10 +82,6 @@
api:
enabled: false
-# Sample Permitted list of helm repositories. Before deployment update the repositories where the helm charts are located.
-# The Kubernetes participant accept only HTTPS Address
-helm:
- repos:
- -
- repoName: bitnami
- address: https://charts.bitnami.com/bitnami
+# Permitted list of helm repositories. Values are updated from values.yaml
+
+
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
index 09cc8cd..54c595c 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
@@ -30,3 +30,8 @@
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/*.{xml,yaml}").AsConfig . | indent 2 }}
+{{- if .Values.repoList }}
+{{ tpl (.Files.Glob "resources/config/KubernetesParticipantParameters.yaml").AsConfig . | indent 2 }}
+{{ toYaml .Values.repoList | indent 4 }}
+{{ tpl (.Files.Glob "resources/config/*.{json,xml,sh}").AsConfig . | indent 2 }}
+{{- end }}
\ No newline at end of file
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
index 5920bda..5858b36 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
@@ -138,3 +138,17 @@
nameOverride: policy-clamp-ac-k8s-ppnt
roles:
- create
+# Update the config here for permitting repositories and protocols
+repoList:
+ helm:
+ repos:
+ -
+ repoName: kong
+ address: https://charts.konghq.com
+ -
+ repoName: bitnami
+ address: https://charts.bitnami.com/bitnami
+
+ protocols:
+ - http
+ - https
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
index ae8d03b..fc9d432 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
@@ -19,18 +19,18 @@
apiVersion: v2
description: ONAP Policy Clamp Controlloop Policy Participant
name: policy-clamp-ac-pf-ppnt
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/policy/components/policy-clamp-be/Chart.yaml b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
index e52eb76..9b0cdf6 100644
--- a/kubernetes/policy/components/policy-clamp-be/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-be/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: ONAP Policy Clamp Backend
name: policy-clamp-be
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
index 90e9293..42e02ef 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
@@ -21,18 +21,18 @@
apiVersion: v2
description: ONAP Policy Clamp Controlloop Runtime
name: policy-clamp-runtime-acm
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-distribution/Chart.yaml b/kubernetes/policy/components/policy-distribution/Chart.yaml
index b1758e5..6a5222f 100755
--- a/kubernetes/policy/components/policy-distribution/Chart.yaml
+++ b/kubernetes/policy/components/policy-distribution/Chart.yaml
@@ -21,18 +21,18 @@
apiVersion: v2
description: ONAP Policy Distribution
name: policy-distribution
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
index c8cc552..1c9c73d 100755
--- a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml
@@ -18,18 +18,18 @@
apiVersion: v2
description: ONAP Drools Policy Engine (PDP-D)
name: policy-drools-pdp
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-gui/Chart.yaml b/kubernetes/policy/components/policy-gui/Chart.yaml
index af1adbe..fed1af9 100644
--- a/kubernetes/policy/components/policy-gui/Chart.yaml
+++ b/kubernetes/policy/components/policy-gui/Chart.yaml
@@ -21,15 +21,15 @@
apiVersion: v2
description: ONAP Policy GUI
name: policy-gui
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-nexus/Chart.yaml b/kubernetes/policy/components/policy-nexus/Chart.yaml
index 48497f2..e8ba92a 100755
--- a/kubernetes/policy/components/policy-nexus/Chart.yaml
+++ b/kubernetes/policy/components/policy-nexus/Chart.yaml
@@ -18,18 +18,18 @@
apiVersion: v2
description: ONAP Policy Nexus
name: policy-nexus
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml
index c10d636..2735890 100755
--- a/kubernetes/policy/components/policy-pap/Chart.yaml
+++ b/kubernetes/policy/components/policy-pap/Chart.yaml
@@ -22,18 +22,18 @@
apiVersion: v2
description: ONAP Policy Administration (PAP)
name: policy-pap
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
index 01bb146..faa9d79 100755
--- a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml
@@ -21,18 +21,18 @@
apiVersion: v2
description: ONAP Policy XACML PDP (PDP-X)
name: policy-xacml-pdp
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/portal/Chart.yaml b/kubernetes/portal/Chart.yaml
index 6988473..0f7b846 100644
--- a/kubernetes/portal/Chart.yaml
+++ b/kubernetes/portal/Chart.yaml
@@ -18,24 +18,24 @@
apiVersion: v2
description: ONAP Web Portal
name: portal
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: portal-app
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/portal-app'
- name: portal-cassandra
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/portal-cassandra'
- name: portal-mariadb
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/portal-mariadb'
- name: portal-sdk
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/portal-sdk'
- name: portal-widget
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/portal-widget'
diff --git a/kubernetes/portal/components/portal-app/Chart.yaml b/kubernetes/portal/components/portal-app/Chart.yaml
index c9c8b1b..375b11b 100644
--- a/kubernetes/portal/components/portal-app/Chart.yaml
+++ b/kubernetes/portal/components/portal-app/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: ONAP Portal application
name: portal-app
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/portal/components/portal-cassandra/Chart.yaml b/kubernetes/portal/components/portal-cassandra/Chart.yaml
index b85fc84..6da2158 100644
--- a/kubernetes/portal/components/portal-cassandra/Chart.yaml
+++ b/kubernetes/portal/components/portal-cassandra/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: Portal cassandra
name: portal-cassandra
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/portal/components/portal-mariadb/Chart.yaml b/kubernetes/portal/components/portal-mariadb/Chart.yaml
index a152d71..ca58d58 100644
--- a/kubernetes/portal/components/portal-mariadb/Chart.yaml
+++ b/kubernetes/portal/components/portal-mariadb/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: MariaDB Service
name: portal-mariadb
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/portal/components/portal-sdk/Chart.yaml b/kubernetes/portal/components/portal-sdk/Chart.yaml
index 02c1733..bfc41f0 100644
--- a/kubernetes/portal/components/portal-sdk/Chart.yaml
+++ b/kubernetes/portal/components/portal-sdk/Chart.yaml
@@ -18,18 +18,18 @@
apiVersion: v2
description: Portal software development kit
name: portal-sdk
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/portal/components/portal-widget/Chart.yaml b/kubernetes/portal/components/portal-widget/Chart.yaml
index 03b9344..2059226 100644
--- a/kubernetes/portal/components/portal-widget/Chart.yaml
+++ b/kubernetes/portal/components/portal-widget/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: Portal widgets micro service application
name: portal-widget
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/robot/Chart.yaml b/kubernetes/robot/Chart.yaml
index 23610dd..fcc3de3 100644
--- a/kubernetes/robot/Chart.yaml
+++ b/kubernetes/robot/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: A helm Chart for kubernetes-ONAP Robot
name: robot
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 3beef06..3f8ac9d 100755
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -273,7 +273,7 @@
done
fi
-export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- bash -c "ls -1q /share/logs/ | wc -l")
+export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- sh -c "ls -1q /share/logs/ | wc -l")
OUTPUT_FOLDER=$(printf %04d $GLOBAL_BUILD_NUMBER)_demo_$key
DISPLAY_NUM=$(($GLOBAL_BUILD_NUMBER + 90))
@@ -304,4 +304,4 @@
if [ -n "$TAG" ]; then
VARIABLEFILES="-V /share/config/robot_properties.py"
kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} -i ${TAG} --display $DISPLAY_NUM 2> ${TAG}.out
-fi
\ No newline at end of file
+fi
diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh
index 4ef8f46..82bf836 100755
--- a/kubernetes/robot/ete-k8s.sh
+++ b/kubernetes/robot/ete-k8s.sh
@@ -82,7 +82,7 @@
done
fi
-export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- bash -c "ls -1q /share/logs/ | wc -l")
+export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- sh -c "ls -1q /share/logs/ | wc -l")
OUTPUT_FOLDER=$(printf %04d $GLOBAL_BUILD_NUMBER)_ete_$2
DISPLAY_NUM=$(($GLOBAL_BUILD_NUMBER + 90))
diff --git a/kubernetes/robot/eteHelm-k8s.sh b/kubernetes/robot/eteHelm-k8s.sh
index 1b31c16..90bfa11 100755
--- a/kubernetes/robot/eteHelm-k8s.sh
+++ b/kubernetes/robot/eteHelm-k8s.sh
@@ -50,7 +50,7 @@
done
fi
-export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- bash -c "ls -1q /share/logs/ | wc -l")
+export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- sh -c "ls -1q /share/logs/ | wc -l")
OUTPUT_FOLDER=$(printf %04d $GLOBAL_BUILD_NUMBER)_ete_helmlist
DISPLAY_NUM=$(($GLOBAL_BUILD_NUMBER + 90))
diff --git a/kubernetes/robot/instantiate-k8s.sh b/kubernetes/robot/instantiate-k8s.sh
index aef812b..9488356 100755
--- a/kubernetes/robot/instantiate-k8s.sh
+++ b/kubernetes/robot/instantiate-k8s.sh
@@ -97,7 +97,7 @@
set -x
POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot)
-export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- bash -c "ls -1q /share/logs/ | wc -l")
+export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec ${POD} -- sh -c "ls -1q /share/logs/ | wc -l")
TAGS="-i $TAG"
ETEHOME=/var/opt/ONAP
OUTPUT_FOLDER=$(printf %04d $GLOBAL_BUILD_NUMBER)_ete_instantiate_vnf
@@ -112,19 +112,19 @@
echo "Executing instantiation..."
if [ $POLL = 1 ]; then
- kubectl --namespace $NAMESPACE exec ${POD} -- bash -c "${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --listener ${ETEHOME}/testsuite/eteutils/robotframework-onap/listeners/OVPListener.py --display $DISPLAY_NUM > /tmp/vnf_instantiation.$BUILDNUM.log 2>&1 &"
+ kubectl --namespace $NAMESPACE exec ${POD} -- sh -c "${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --listener ${ETEHOME}/testsuite/eteutils/robotframework-onap/listeners/OVPListener.py --display $DISPLAY_NUM > /tmp/vnf_instantiation.$BUILDNUM.log 2>&1 &"
- pid=`kubectl --namespace $NAMESPACE exec ${POD} -- bash -c "pgrep runTags.sh -n"`
+ pid=`kubectl --namespace $NAMESPACE exec ${POD} -- sh -c "pgrep runTags.sh -n"`
if [ -z "$pid" ]; then
echo "robot testsuite unable to start"
exit 1
fi
- kubectl --namespace $NAMESPACE exec ${POD} -- bash -c "while ps -p \"$pid\" --no-headers | grep -v defunct; do echo \$'\n\n'; echo \"Testsuite still running \"\`date\`; echo \"LOG FILE: \"; tail -10 /tmp/vnf_instantiation.$BUILDNUM.log; sleep 30; done"
+ kubectl --namespace $NAMESPACE exec ${POD} -- sh -c "while ps -p \"$pid\" --no-headers | grep -v defunct; do echo \$'\n\n'; echo \"Testsuite still running \"\`date\`; echo \"LOG FILE: \"; tail -10 /tmp/vnf_instantiation.$BUILDNUM.log; sleep 30; done"
else
- kubectl --namespace $NAMESPACE exec ${POD} -- bash -c "${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --listener ${ETEHOME}/testsuite/eteutils/robotframework-onap/listeners/OVPListener.py --display $DISPLAY_NUM"
+ kubectl --namespace $NAMESPACE exec ${POD} -- sh -c "${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --listener ${ETEHOME}/testsuite/eteutils/robotframework-onap/listeners/OVPListener.py --display $DISPLAY_NUM"
fi
set +x
diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml
index 7647906..d2acf1b 100644
--- a/kubernetes/sdc/Chart.yaml
+++ b/kubernetes/sdc/Chart.yaml
@@ -18,30 +18,30 @@
apiVersion: v2
description: Service Design and Creation Umbrella Helm charts
name: sdc
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: sdc-be
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/sdc-be'
- name: sdc-cs
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/sdc-cs'
- name: sdc-fe
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/sdc-fe'
- name: sdc-onboarding-be
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/sdc-onboarding-be'
- name: sdc-wfd-be
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/sdc-wfd-be'
condition: sdc-wfd.enabled
- name: sdc-wfd-fe
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/sdc-wfd-fe'
condition: sdc-wfd.enabled
- name: sdc-helm-validator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/sdc-helm-validator'
condition: sdcHelmValidator.enabled
diff --git a/kubernetes/sdc/components/sdc-be/Chart.yaml b/kubernetes/sdc/components/sdc-be/Chart.yaml
index 6c22548..4620c67 100644
--- a/kubernetes/sdc/components/sdc-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-be/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: ONAP Service Design and Creation Backend API
name: sdc-be
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index dac6f6c..fb6682b 100644
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -35,8 +35,8 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdc-backend-all-plugins:1.10.4
-backendInitImage: onap/sdc-backend-init:1.10.4
+image: onap/sdc-backend-all-plugins:1.11.4
+backendInitImage: onap/sdc-backend-init:1.11.4
pullPolicy: Always
diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml
index 0789ee3..1ef26a6 100644
--- a/kubernetes/sdc/components/sdc-cs/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml
@@ -18,20 +18,20 @@
apiVersion: v2
description: ONAP Service Design and Creation Cassandra
name: sdc-cs
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: cassandra
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml
index 2b6817b..1e182ed 100644
--- a/kubernetes/sdc/components/sdc-cs/values.yaml
+++ b/kubernetes/sdc/components/sdc-cs/values.yaml
@@ -51,8 +51,8 @@
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-cassandra:1.10.4
-cassandraInitImage: onap/sdc-cassandra-init:1.10.4
+image: onap/sdc-cassandra:1.11.4
+cassandraInitImage: onap/sdc-cassandra-init:1.11.4
pullPolicy: Always
config:
diff --git a/kubernetes/sdc/components/sdc-fe/Chart.yaml b/kubernetes/sdc/components/sdc-fe/Chart.yaml
index 3db6fc7..2250947 100644
--- a/kubernetes/sdc/components/sdc-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-fe/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: ONAP Service Design and Creation Front End
name: sdc-fe
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index e86ae4c..05ac50d 100644
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -47,7 +47,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdc-frontend:1.10.4
+image: onap/sdc-frontend:1.11.4
pullPolicy: Always
config:
diff --git a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
index 5609083..771bfbf 100644
--- a/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/Chart.yaml
@@ -19,12 +19,12 @@
apiVersion: v2
description: ONAP Service Design and Creation Helm Validator
name: sdc-helm-validator
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
index 5ed3131..e2ff602 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml
@@ -18,15 +18,15 @@
apiVersion: v2
description: ONAP Service Design and Creation Onboarding API
name: sdc-onboarding-be
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index 30a5f03..5a1c664 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -59,8 +59,8 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdc-onboard-backend:1.10.4
-onboardingInitImage: onap/sdc-onboard-cassandra-init:1.10.4
+image: onap/sdc-onboard-backend:1.11.4
+onboardingInitImage: onap/sdc-onboard-cassandra-init:1.11.4
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
index 132c5d2..6992f6b 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP Service Design and Creation Workflow Designer backend
name: sdc-wfd-be
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
index 1b7aa77..45f13a0 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP Service Design and Creation Workflow Designer frontend
name: sdc-wfd-fe
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml
index b30efc1..cc21484 100644
--- a/kubernetes/sdnc/Chart.yaml
+++ b/kubernetes/sdnc/Chart.yaml
@@ -17,61 +17,61 @@
apiVersion: v2
description: SDN Controller
name: sdnc
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certManagerCertificate
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: logConfiguration
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: network-name-gen
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: network-name-gen.enabled
- name: dgbuilder
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: dgbuilder.enabled
- name: sdnc-prom
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: config.geoEnabled
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: elasticsearch
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: config.sdnr.enabled
# conditions for sdnc-subcharts
- name: dmaap-listener
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/dmaap-listener/'
condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled
- name: ueb-listener
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/ueb-listener/'
condition: sdnc.ueb-listener.enabled,ueb-listener.enabled
- name: sdnc-ansible-server
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/sdnc-ansible-server/'
condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled
- name: sdnc-web
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/sdnc-web/'
condition: sdnc.sdnc-web.enabled,sdnc-web.enabled
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
index 1d027ee..3737cb7 100644
--- a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml
@@ -16,15 +16,15 @@
apiVersion: v2
description: SDNC DMaaP Listener
name: dmaap-listener
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml
index 3d9fc6a..5094b6e 100644
--- a/kubernetes/sdnc/components/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml
@@ -49,7 +49,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdnc-dmaap-listener-image:2.3.1
+image: onap/sdnc-dmaap-listener-image:2.3.2
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
index c61b4e0..c2c1198 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: SDN-C Ansible Server
name: sdnc-ansible-server
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
index 1db0ed7..7689dcc 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -49,7 +49,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdnc-ansible-server-image:2.3.1
+image: onap/sdnc-ansible-server-image:2.3.2
pullPolicy: Always
# flag to enable debugging - application support required
@@ -101,7 +101,7 @@
service:
type: ClusterIP
name: sdnc-ansible-server
- portName: sdnc-ansible-server
+ portName: http
internalPort: 8000
externalPort: 8000
diff --git a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
index 956c607..b7da488 100644
--- a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP SDNC Policy Driven Ownership Management
name: sdnc-prom
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-web/Chart.yaml b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
index fbb7ca0..6dc7723 100644
--- a/kubernetes/sdnc/components/sdnc-web/Chart.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/Chart.yaml
@@ -16,18 +16,18 @@
apiVersion: v2
description: SDN-C Web Server
name: sdnc-web
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
index 21416c9..03432d3 100644
--- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
@@ -49,32 +49,34 @@
{{ if .Values.liveness.enabled }}
livenessProbe:
tcpSocket:
- port: {{ .Values.service.internalPort }}
+ port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }}
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end }}
readinessProbe:
tcpSocket:
- port: {{ .Values.service.internalPort }}
+ port: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.service.internalPort .Values.service.internalPlainPort }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: WEBPROTOCOL
- value: {{ .Values.config.webProtocol }}
+ value: {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.webProtocol .Values.config.webPlainProtocol }}
- name: WEBPORT
- value: {{ .Values.config.webPort | quote }}
+ value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.webPort .Values.config.webPlainPort | quote }}
- name: SDNRPROTOCOL
- value: {{ .Values.config.sdnrProtocol }}
+ value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.sdnrProtocol .Values.config.sdnrPlainProtocol }}
- name: SDNRHOST
- value: {{ .Values.config.sdnrHost }}.{{ include "common.namespace" . }}
+ value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.sdnrHost .Values.config.sdnrPlainHost }}.{{ include "common.namespace" . }}
- name: SDNRPORT
- value: {{ .Values.config.sdnrPort | quote }}
+ value : {{ (eq "true" (include "common.needTLS" .)) | ternary .Values.config.sdnrPort .Values.config.sdnrPlainPort | quote }}
+ {{ if (include "common.needTLS" .) }}
- name: SSL_CERT_DIR
value: {{ .Values.config.sslCertDir }}
- name: SSL_CERTIFICATE
value: {{ .Values.config.sslCertiticate }}
- name: SSL_CERTIFICATE_KEY
value: {{ .Values.config.sslCertKey }}
+ {{ end }}
{{ if .Values.config.transportpce.enabled }}
- name: TRPCEURL
value: {{ .Values.config.transportpce.transportpceUrl }}
diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index 997d0a2..ecc5573 100644
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -23,16 +23,21 @@
# Application configuration defaults.
#################################################################
# application image
-image: "onap/sdnc-web-image:2.3.1"
+image: "onap/sdnc-web-image:2.3.2"
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"
@@ -100,9 +105,12 @@
# 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:
diff --git a/kubernetes/sdnc/components/ueb-listener/Chart.yaml b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
index ffaa1b7..d9df7af 100644
--- a/kubernetes/sdnc/components/ueb-listener/Chart.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: SDNC UEB Listener
name: ueb-listener
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties b/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties
index 946773b..45a80af 100644
--- a/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties
+++ b/kubernetes/sdnc/components/ueb-listener/resources/config/ueb-listener.properties
@@ -1,4 +1,9 @@
+{{- if (include "common.needTLS" .) }}
org.onap.ccsdk.sli.northbound.uebclient.asdc-address=sdc-be.{{.Release.Namespace}}:8443
+{{- else }}
+org.onap.ccsdk.sli.northbound.uebclient.asdc-address=sdc-be.{{.Release.Namespace}}:8080
+org.onap.ccsdk.sli.northbound.uebclient.use-https=false
+{{- end }}
org.onap.ccsdk.sli.northbound.uebclient.consumer-group=sdc-OpenSource-Env1-sdnc-dockero
org.onap.ccsdk.sli.northbound.uebclient.consumer-id=sdc-COpenSource-Env11-sdnc-dockero
org.onap.ccsdk.sli.northbound.uebclient.environment-name=AUTO
diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml
index c74f652..4d3cce7 100644
--- a/kubernetes/sdnc/components/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/values.yaml
@@ -55,7 +55,7 @@
# Application configuration defaults.
#################################################################
# application image
-image: onap/sdnc-ueb-listener-image:2.3.1
+image: onap/sdnc-ueb-listener-image:2.3.2
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/resources/config/conf/aaiclient.properties b/kubernetes/sdnc/resources/config/conf/aaiclient.properties
index 7021990..5108a9d 100755
--- a/kubernetes/sdnc/resources/config/conf/aaiclient.properties
+++ b/kubernetes/sdnc/resources/config/conf/aaiclient.properties
@@ -38,7 +38,11 @@
#
# Configuration file for A&AI Client
#
+{{- if (include "common.needTLS" .) }}
org.onap.ccsdk.sli.adaptors.aai.uri=https://aai.{{.Release.Namespace}}:8443
+{{- else }}
+org.onap.ccsdk.sli.adaptors.aai.uri=http://aai.{{.Release.Namespace}}:80
+{{- end }}
connection.timeout=60000
read.timeout=60000
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
index 11b1a87..b6dc32b 100755
--- a/kubernetes/sdnc/templates/job.yaml
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -131,8 +131,28 @@
command:
- /bin/bash
args:
- - {{.Values.config.binDir }}/installSdncDb.sh
+ - -c
+ - |
+ sleep 60; {{.Values.config.binDir }}/installSdncDb.sh
resources: {{ include "common.resources" . | nindent 10 }}
+ {{- if include "common.onServiceMesh" . }}
+ - name: sdnc-service-mesh-wait-for-job-container
+ image: {{ include "repositoryGenerator.image.quitQuit" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ command:
+ - /bin/sh
+ - "-c"
+ args:
+ - |
+ echo "waiting 20s for istio side cars to be up"; sleep 20s;
+ /app/ready.py --service-mesh-check sdnc -t 45;
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ {{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
{{- end }}
diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
index cb8d757..665e16c 100755
--- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
+++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
@@ -53,7 +53,10 @@
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["/bin/bash"]
- args: ["-c", "{{ .Values.config.binDir }}/startODL.sh"]
+ args:
+ - -c
+ - |
+ sleep 90; "{{ .Values.config.binDir }}/startODL.sh"
env:
- name: SDNC_AAF_ENABLED
value: "{{ .Values.global.aafEnabled}}"
@@ -76,6 +79,24 @@
value: "-k"
volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
resources: {{ include "common.resources" . | nindent 12 }}
+ {{- if include "common.onServiceMesh" . }}
+ - name: sdnrdb-service-mesh-wait-for-job-container
+ image: {{ include "repositoryGenerator.image.quitQuit" . }}
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ command:
+ - /bin/sh
+ - "-c"
+ args:
+ - |
+ echo "waiting 30s for istio side cars to be up"; sleep 30s;
+ /app/ready.py --service-mesh-check sdnc-sdnrdb-init-job -t 45;
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ {{- end }}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
{{- end -}}
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index b4c0dd5..83a30ca 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -210,7 +210,7 @@
# application images
pullPolicy: Always
-image: onap/sdnc-image:2.3.1
+image: onap/sdnc-image:2.3.2
# flag to enable debugging - application support required
debugEnabled: false
@@ -543,7 +543,7 @@
service:
type: NodePort
name: sdnc
- portName: sdnc
+ portName: http
internalPort: 8181
internalPort2: 8101
internalPort3: 8080
diff --git a/kubernetes/sniro-emulator/Chart.yaml b/kubernetes/sniro-emulator/Chart.yaml
index 5366ed9..d155d5e 100644
--- a/kubernetes/sniro-emulator/Chart.yaml
+++ b/kubernetes/sniro-emulator/Chart.yaml
@@ -17,15 +17,15 @@
apiVersion: v2
description: ONAP Mock Sniro Emulator
name: sniro-emulator
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/sniro-emulator/values.yaml b/kubernetes/sniro-emulator/values.yaml
index 81ce818..8f43a4f 100644
--- a/kubernetes/sniro-emulator/values.yaml
+++ b/kubernetes/sniro-emulator/values.yaml
@@ -50,7 +50,7 @@
internalPort: 9999
externalPort: 80
nodePort: 88
- portName: httpd
+ portName: http
ingress:
enabled: false
diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml
index d746647..acb5368 100755
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -16,91 +16,92 @@
apiVersion: v2
description: ONAP Service Orchestrator
name: so
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
+ condition: global.aafEnabled
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/soHelpers'
- name: so-admin-cockpit
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-admin-cockpit'
condition: so-admin-cockpit.enabled
- name: so-appc-orchestrator
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-appc-orchestrator'
condition: so-appc-orchestrator.enabled
- name: so-bpmn-infra
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-bpmn-infra'
- name: so-catalog-db-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-catalog-db-adapter'
condition: so-catalog-db-adapter.enabled
- name: so-cnf-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: "file://components/so-cnf-adapter"
condition: so-cnf-adapter.enabled
- name: so-etsi-nfvo-ns-lcm
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-etsi-nfvo-ns-lcm'
condition: so-etsi-nfvo-ns-lcm.enabled
- name: so-etsi-sol003-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-etsi-sol003-adapter'
condition: so-etsi-sol003-adapter.enabled
- name: so-mariadb
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-mariadb'
- name: so-nssmf-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-nssmf-adapter'
condition: so-nssmf-adapter.enabled
- name: so-oof-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-oof-adapter'
condition: so-oof-adapter.enabled
- name: so-openstack-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-openstack-adapter'
condition: so-openstack-adapter.enabled
- name: so-request-db-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-request-db-adapter'
- name: so-sdc-controller
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-sdc-controller'
- name: so-sdnc-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-sdnc-adapter'
condition: so-sdnc-adapter.enabled
- name: so-ve-vnfm-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-ve-vnfm-adapter'
condition: so-ve-vnfm-adapter.enabled
- name: so-etsi-sol005-adapter
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/so-etsi-sol005-adapter'
condition: so-etsi-sol005-adapter.enabled
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-admin-cockpit/Chart.yaml b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
index f916b5c..4218126 100644
--- a/kubernetes/so/components/so-admin-cockpit/Chart.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/Chart.yaml
@@ -21,21 +21,21 @@
apiVersion: v2
description: A Helm chart for ONAP Service Orchestration Monitoring
name: so-admin-cockpit
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml b/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml
index 4b46721..808c439 100644
--- a/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/templates/deployment.yaml
@@ -116,7 +116,7 @@
ports:
- containerPort: {{ index .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-admin-cockpit/templates/service.yaml b/kubernetes/so/components/so-admin-cockpit/templates/service.yaml
index c443978..b23e5ab 100644
--- a/kubernetes/so/components/so-admin-cockpit/templates/service.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/templates/service.yaml
@@ -39,14 +39,12 @@
{{if and (eq .Values.service.type "NodePort") (.Values.global.aafEnabled) -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
-
-
diff --git a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
index eae024b..a82663f 100644
--- a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
+++ b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml
@@ -17,21 +17,21 @@
apiVersion: v2
description: A Helm chart for so appc orchestrator
name: so-appc-orchestrator
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-bpmn-infra/Chart.yaml b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
index 867f429..3a573b4 100755
--- a/kubernetes/so/components/so-bpmn-infra/Chart.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
@@ -17,24 +17,24 @@
appVersion: "1.0"
description: A Helm chart for SO Bpmn Infra
name: so-bpmn-infra
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
index 360936d..9feab4d 100755
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -17,7 +17,11 @@
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}}
dme2:
timeout: '30000'
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
workflowAaiDistributionDelay: PT30S
pnfEntryNotificationTimeout: P14D
cds:
@@ -158,7 +162,11 @@
oof:
auth: {{ .Values.mso.oof.auth }}
callbackEndpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
+ {{ if (include "common.needTLS" .) }}
endpoint: https://oof-osdf.{{ include "common.namespace" . }}:8698
+ {{ else }}
+ endpoint: http://oof-osdf.{{ include "common.namespace" . }}:8698
+ {{ end }}
timeout: PT30M
workflow:
CreateGenericVNFV1:
diff --git a/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml
index 57a2b2c..2b8b827 100755
--- a/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml
@@ -87,7 +87,7 @@
{{ include "so.helpers.livenessProbe" .| indent 8 }}
ports:
- containerPort: {{ index .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
# Filebeat sidecar container
{{ include "common.log.sidecar" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-bpmn-infra/templates/service.yaml b/kubernetes/so/components/so-bpmn-infra/templates/service.yaml
index 6eb6f27..5b8dee0 100755
--- a/kubernetes/so/components/so-bpmn-infra/templates/service.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/templates/service.yaml
@@ -29,11 +29,11 @@
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index d5ff829..af185ae 100755
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -123,7 +123,7 @@
type: ClusterIP
internalPort: *containerPort
externalPort: 8081
- portName: so-bpmn-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1
diff --git a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
index 64b3393..e279432 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
@@ -16,24 +16,24 @@
apiVersion: v2
description: A Helm chart for so-catalog-db-adapter
name: so-catalog-db-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml
index 30e5551..fa9d3a6 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/templates/deployment.yaml
@@ -85,7 +85,7 @@
{{ include "so.helpers.livenessProbe" .| indent 8 }}
ports:
- containerPort: {{ index .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-catalog-db-adapter/templates/service.yaml b/kubernetes/so/components/so-catalog-db-adapter/templates/service.yaml
index 6eb6f27..5b8dee0 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/templates/service.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/templates/service.yaml
@@ -29,11 +29,11 @@
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index a5961ee..b436094 100755
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -87,7 +87,7 @@
type: ClusterIP
internalPort: *containerPort
externalPort: *containerPort
- portName: so-catdb-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1
diff --git a/kubernetes/so/components/so-cnf-adapter/Chart.yaml b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
index 6155a93..abc14e8 100755
--- a/kubernetes/so/components/so-cnf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
@@ -18,24 +18,24 @@
appVersion: "1.7.1"
description: A Helm chart for Kubernetes
name: so-cnf-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
index c99465b..0c2f679 100755
--- a/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/resources/config/overrides/override.yaml
@@ -16,7 +16,11 @@
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.server.aai.auth ) }}
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
enabled: {{ .Values.global.aai.enabled }}
logging:
path: logs
@@ -50,4 +54,3 @@
prometheus:
enabled: true # Whether exporting of metrics to Prometheus is enabled.
step: 1m # Step size (i.e. reporting frequency) to use.
-
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
index 0d1f03b..4b2fd67 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml
@@ -17,21 +17,21 @@
apiVersion: v2
description: ONAP SO ETSI NFVO NS LCM
name: so-etsi-nfvo-ns-lcm
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
index 5fc28e2..7c1cb1b 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
@@ -17,7 +17,11 @@
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
version: v19
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
spring:
datasource:
hikari:
@@ -54,7 +58,11 @@
etsi-catalog-manager:
base:
{{- if .Values.global.msbEnabled }}
+ {{ if (include "common.needTLS" .) }}
endpoint: https://msb-iag:443/api
+ {{ else }}
+ endpoint: http://msb-iag:443/api
+ {{ end }}
http:
client:
ssl:
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
index 8d67e41..742251a 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/Chart.yaml
@@ -16,21 +16,21 @@
apiVersion: v2
description: ONAP SO ETSI SOL003 Adapter
name: so-etsi-sol003-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
index e6a1d7c..33b38ad 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/resources/config/overrides/override.yaml
@@ -16,7 +16,11 @@
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
version: v15
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
spring:
security:
usercredentials:
@@ -42,7 +46,11 @@
username: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.username "value2" .Values.sdc.username )}}
password: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.password "value2" .Values.sdc.password )}}
key: {{ .Values.sdc.key }}
+ {{ if (include "common.needTLS" .) }}
endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://sdc-be.{{ include "common.namespace" . }}:8080
+ {{ end }}
vnfmadapter:
endpoint: http://so-etsi-sol003-adapter.{{ include "common.namespace" . }}:9092
etsi-catalog-manager:
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/templates/deployment.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/templates/deployment.yaml
index 3272bfd..7751bf4 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/templates/deployment.yaml
@@ -76,7 +76,7 @@
failureThreshold: {{ .Values.livenessProbe.failureThreshold}}
ports:
- containerPort: {{ .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/templates/service.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/templates/service.yaml
index 5772a89..96a2acd 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/templates/service.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/templates/service.yaml
@@ -40,11 +40,11 @@
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
index 2a511c0..7c2645e 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/Chart.yaml
@@ -17,24 +17,24 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-etsi-sol005-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
index dd46da0..e1e2fc2 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/resources/config/overrides/override.yaml
@@ -45,7 +45,11 @@
msb-port: 80
adapters:
requestDb:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+ {{ else }}
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+ {{ end }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )}}
#Actuator
management:
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/templates/deployment.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/templates/deployment.yaml
index 4f8f4d9..1abf218 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/templates/deployment.yaml
@@ -94,7 +94,7 @@
failureThreshold: {{ .Values.livenessProbe.failureThreshold}}
ports:
- containerPort: {{ .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/templates/service.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/templates/service.yaml
index 2ecc66f..5b8dee0 100755
--- a/kubernetes/so/components/so-etsi-sol005-adapter/templates/service.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/templates/service.yaml
@@ -29,12 +29,12 @@
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ include "common.release" . }}
\ No newline at end of file
+ release: {{ include "common.release" . }}
diff --git a/kubernetes/so/components/so-mariadb/Chart.yaml b/kubernetes/so/components/so-mariadb/Chart.yaml
index 1b8ce4a..8b6d10f 100755
--- a/kubernetes/so/components/so-mariadb/Chart.yaml
+++ b/kubernetes/so/components/so-mariadb/Chart.yaml
@@ -16,21 +16,21 @@
apiVersion: v2
description: MariaDB Service
name: so-mariadb
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-mariadb/templates/job.yaml b/kubernetes/so/components/so-mariadb/templates/job.yaml
index 2a84fac..d9c6009 100644
--- a/kubernetes/so/components/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/components/so-mariadb/templates/job.yaml
@@ -53,13 +53,17 @@
command:
- /bin/bash
- -c
- - mysqldump -vv --user=${DB_USER} --password=${DB_PASS} --host=${DB_HOST} --port=${DB_PORT} --databases --single-transaction --quick --lock-tables=false catalogdb requestdb nfvo > /var/data/mariadb/backup-`date +%s`.sql
+ - |
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
+ mysqldump -vv --user=${DB_USER} --password=${DB_PASS} --host=${DB_HOST} --port=${DB_PORT} --databases --single-transaction --quick --lock-tables=false catalogdb requestdb nfvo > /var/data/mariadb/backup-`date +%s`.sql
volumeMounts:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- name: backup-storage
mountPath: /var/data/mariadb
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: localtime
@@ -105,6 +109,8 @@
- /bin/bash
- -c
- >
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
mysql() { /usr/bin/mysql -h ${DB_HOST} -P ${DB_PORT} "$@"; };
export -f mysql;
mysql --user=root --password=${MYSQL_ROOT_PASSWORD} requestdb -e exit > /dev/null 2>&1 {{ if not .Values.global.migration.enabled }} && echo "Database already initialized!!!" && exit 0 {{ end }};
@@ -157,6 +163,7 @@
{{- end }}
resources:
{{ include "common.resources" . | indent 12 }}
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/so/components/so-mariadb/values.yaml b/kubernetes/so/components/so-mariadb/values.yaml
index 58e34b7..13dd086 100755
--- a/kubernetes/so/components/so-mariadb/values.yaml
+++ b/kubernetes/so/components/so-mariadb/values.yaml
@@ -21,7 +21,7 @@
nodePortPrefix: 302
nodePortPrefixExt: 304
repository: nexus3.onap.org:10001
- readinessImage: onap/oom/readiness:3.0.1
+ readinessImage: onap/oom/readiness:4.1.0
ubuntuInitRepository: docker.io
mariadbGalera:
nameOverride: &mariadbName mariadb-galera
@@ -187,3 +187,7 @@
nameOverride: so-mariadb
roles:
- read
+
+wait_for_job_container:
+ containers:
+ - '{{ include "common.name" . }}-config'
diff --git a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
index 525f54d..ab97237 100755
--- a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
@@ -17,24 +17,24 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-nssmf-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
index 75db547..1d8a97c 100755
--- a/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/resources/config/overrides/override.yaml
@@ -15,7 +15,11 @@
*/}}
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.aai.auth )}}
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
logging:
path: logs
spring:
@@ -51,7 +55,11 @@
msb-port: 80
adapters:
requestDb:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+ {{ else }}
+ endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+ {{ end }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )}}
#Actuator
management:
diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index 2489ddd..29f9f4e 100755
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -107,7 +107,7 @@
service:
type: ClusterIP
ports:
- - name: api
+ - name: http
port: *containerPort
updateStrategy:
type: RollingUpdate
diff --git a/kubernetes/so/components/so-oof-adapter/Chart.yaml b/kubernetes/so/components/so-oof-adapter/Chart.yaml
index c411ef9..d5b8bbf 100755
--- a/kubernetes/so/components/so-oof-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-oof-adapter/Chart.yaml
@@ -18,21 +18,21 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-oof-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
index 5013c34..8db5d26 100755
--- a/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-oof-adapter/resources/config/overrides/override.yaml
@@ -42,7 +42,11 @@
endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/mso/WorkflowMessage
oof:
auth: ${OOF_LOGIN}:${OOF_PASSWORD}
+ {{ if (include "common.needTLS" .) }}
endpoint: https://oof-osdf.{{ include "common.namespace" . }}:8698
+ {{ else }}
+ endpoint: http://oof-osdf.{{ include "common.namespace" . }}:8698
+ {{ end }}
#Actuator
management:
endpoints:
diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 863e0e9..530c35a 100755
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -89,7 +89,7 @@
service:
type: ClusterIP
ports:
- - name: api
+ - name: http
port: *containerPort
updateStrategy:
type: RollingUpdate
diff --git a/kubernetes/so/components/so-openstack-adapter/Chart.yaml b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
index cd128fa..22c473f 100755
--- a/kubernetes/so/components/so-openstack-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
@@ -17,24 +17,24 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-openstack-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
index e332f98..487e931 100755
--- a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -15,7 +15,11 @@
*/}}
aai:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}}
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
server:
port: {{ index .Values.containerPort }}
spring:
diff --git a/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
index f370fbd..55493f7 100755
--- a/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/templates/deployment.yaml
@@ -87,7 +87,7 @@
{{ include "so.helpers.livenessProbe" .| indent 8 }}
ports:
- containerPort: {{ index .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
# Filebeat sidecar container
{{ include "common.log.sidecar" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-openstack-adapter/templates/service.yaml b/kubernetes/so/components/so-openstack-adapter/templates/service.yaml
index 6eb6f27..5b8dee0 100755
--- a/kubernetes/so/components/so-openstack-adapter/templates/service.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/templates/service.yaml
@@ -29,11 +29,11 @@
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 057f8a0..28338cf 100755
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -95,7 +95,7 @@
type: ClusterIP
internalPort: *containerPort
externalPort: *containerPort
- portName: so-optack-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1
diff --git a/kubernetes/so/components/so-request-db-adapter/Chart.yaml b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
index 6e65cd7..db6855a 100755
--- a/kubernetes/so/components/so-request-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
@@ -16,24 +16,24 @@
apiVersion: v2
description: A Helm chart for request-db-adapter
name: so-request-db-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml b/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml
index 30e5551..fa9d3a6 100755
--- a/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/templates/deployment.yaml
@@ -85,7 +85,7 @@
{{ include "so.helpers.livenessProbe" .| indent 8 }}
ports:
- containerPort: {{ index .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes: {{ include "so.certificate.volumes" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-request-db-adapter/templates/service.yaml b/kubernetes/so/components/so-request-db-adapter/templates/service.yaml
index 6eb6f27..5b8dee0 100755
--- a/kubernetes/so/components/so-request-db-adapter/templates/service.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/templates/service.yaml
@@ -29,11 +29,11 @@
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index e932a0b..6bcd388 100755
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -83,7 +83,7 @@
type: ClusterIP
internalPort: *containerPort
externalPort: *containerPort
- portName: so-reqdb-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1
diff --git a/kubernetes/so/components/so-sdc-controller/Chart.yaml b/kubernetes/so/components/so-sdc-controller/Chart.yaml
index a50e498..2f7cac5 100755
--- a/kubernetes/so/components/so-sdc-controller/Chart.yaml
+++ b/kubernetes/so/components/so-sdc-controller/Chart.yaml
@@ -17,24 +17,24 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-sdc-controller
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
index b20e33a..ffa66e9 100755
--- a/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-sdc-controller/resources/config/overrides/override.yaml
@@ -63,19 +63,28 @@
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.requestDb.auth )}}
aai:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
asdc-connections:
asdc-controller1:
user: mso
consumerGroup: SO-OpenSource-Env11
consumerId: SO-COpenSource-Env11
environmentName: AUTO
+ {{ if (include "common.needTLS" .) }}
asdcAddress: sdc-be.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ asdcAddress: sdc-be.{{ include "common.namespace" . }}:8080
+ {{ end }}
password: {{ index .Values "mso" "asdc-connections" "asdc-controller1" "password" }}
pollingInterval: 60
pollingTimeout: 60
relevantArtifactTypes: HEAT,HEAT_ENV,HEAT_VOL
useHttpsWithDmaap: false
+ useHttpsWithSdc: {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
activateServerTLSAuth: false
keyStorePassword:
keyStorePath:
diff --git a/kubernetes/so/components/so-sdc-controller/templates/deployment.yaml b/kubernetes/so/components/so-sdc-controller/templates/deployment.yaml
index f370fbd..55493f7 100755
--- a/kubernetes/so/components/so-sdc-controller/templates/deployment.yaml
+++ b/kubernetes/so/components/so-sdc-controller/templates/deployment.yaml
@@ -87,7 +87,7 @@
{{ include "so.helpers.livenessProbe" .| indent 8 }}
ports:
- containerPort: {{ index .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
# Filebeat sidecar container
{{ include "common.log.sidecar" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-sdc-controller/templates/service.yaml b/kubernetes/so/components/so-sdc-controller/templates/service.yaml
index 6eb6f27..5b8dee0 100755
--- a/kubernetes/so/components/so-sdc-controller/templates/service.yaml
+++ b/kubernetes/so/components/so-sdc-controller/templates/service.yaml
@@ -29,11 +29,11 @@
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index 58e93f5..c0e3f50 100755
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -91,7 +91,7 @@
type: ClusterIP
internalPort: *containerPort
externalPort: *containerPort
- portName: so-sdc-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1
diff --git a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
index 01bb209..f75662d 100755
--- a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
@@ -17,21 +17,21 @@
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: so-sdnc-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-sdnc-adapter/templates/deployment.yaml b/kubernetes/so/components/so-sdnc-adapter/templates/deployment.yaml
index 01e0ab7..b95e0b5 100755
--- a/kubernetes/so/components/so-sdnc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/templates/deployment.yaml
@@ -91,7 +91,7 @@
{{ include "so.helpers.livenessProbe" .| indent 8 }}
ports:
- containerPort: {{ index .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
# Filebeat sidecar container
{{ include "common.log.sidecar" . | nindent 6 }}
diff --git a/kubernetes/so/components/so-sdnc-adapter/templates/service.yaml b/kubernetes/so/components/so-sdnc-adapter/templates/service.yaml
index 6eb6f27..5b8dee0 100755
--- a/kubernetes/so/components/so-sdnc-adapter/templates/service.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/templates/service.yaml
@@ -29,11 +29,11 @@
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index cb9d02a..54fa88c 100755
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -110,7 +110,7 @@
type: ClusterIP
internalPort: *containerPort
externalPort: *containerPort
- portName: so-sdnc-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
index 6508ca4..a9f3821 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml
@@ -17,24 +17,24 @@
apiVersion: v2
description: ONAP SO VE VNFM Adapter (SOL002)
name: so-ve-vnfm-adapter
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: readinessCheck
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: soHelpers
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://../soHelpers'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
index f46219c..8471540 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/resources/config/overrides/override.yaml
@@ -18,10 +18,18 @@
port: {{ include "common.getPort" (dict "global" . "name" "http") }}
vevnfmadapter:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://msb-iag:30283/api/{{ include "common.servicename" . }}/v1
+ {{ else }}
+ endpoint: http://msb-iag:30283/api/{{ include "common.servicename" . }}/v1
+ {{ end }}
aai:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
dmaap:
endpoint: http://message-router.{{ include "common.namespace" . }}:3904
diff --git a/kubernetes/so/components/soHelpers/Chart.yaml b/kubernetes/so/components/soHelpers/Chart.yaml
index a8415a3..2029d4f 100755
--- a/kubernetes/so/components/soHelpers/Chart.yaml
+++ b/kubernetes/so/components/soHelpers/Chart.yaml
@@ -16,15 +16,15 @@
apiVersion: v2
description: A Helm chart for SO helpers
name: soHelpers
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml
index efb3fab..6933607 100755
--- a/kubernetes/so/resources/config/overrides/override.yaml
+++ b/kubernetes/so/resources/config/overrides/override.yaml
@@ -1,5 +1,9 @@
aai:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
server:
port: {{ index .Values.containerPort }}
@@ -45,13 +49,21 @@
activate:
instanceid: test
userid: cs0008
- endpoint: http://sdc-be.{{ include "common.namespace" . }}:8443
+ {{ if (include "common.needTLS" .) }}
+ endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://sdc-be.{{ include "common.namespace" . }}:8080
+ {{ end }}
tenant:
isolation:
retry:
count: 3
aai:
+ {{ if (include "common.needTLS" .) }}
endpoint: https://aai.{{ include "common.namespace" . }}:8443
+ {{ else }}
+ endpoint: http://aai.{{ include "common.namespace" . }}:8080
+ {{ end }}
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
extApi:
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index 47701d8..99a5eff 100755
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -87,7 +87,7 @@
{{ include "so.helpers.livenessProbe" .| indent 8 }}
ports:
- containerPort: {{ index .Values.containerPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
protocol: TCP
# Filebeat sidecar container
{{ include "common.log.sidecar" . | nindent 6 }}
diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml
index 2849ede..5a83d56 100755
--- a/kubernetes/so/templates/service.yaml
+++ b/kubernetes/so/templates/service.yaml
@@ -392,11 +392,11 @@
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 1f454f6..553de8c 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -213,7 +213,7 @@
nodePort: 77
internalPort: *containerPort
externalPort: *containerPort
- portName: so-apih-port
+ portName: http
updateStrategy:
type: RollingUpdate
maxUnavailable: 1
diff --git a/kubernetes/strimzi/Chart.yaml b/kubernetes/strimzi/Chart.yaml
index 6ce866b..17da739 100644
--- a/kubernetes/strimzi/Chart.yaml
+++ b/kubernetes/strimzi/Chart.yaml
@@ -15,19 +15,19 @@
apiVersion: v2
description: ONAP Strimzi kafka
name: strimzi
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml
index 58193e3..4e8779d 100644
--- a/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@ -88,6 +88,7 @@
replicas: {{ .Values.replicaCount }}
config:
ssl.hostnameVerification: false
+ ssl.quorum.hostnameVerification: false
{{- if (include "common.onServiceMesh" .) }}
sslQuorum: false
{{- end }}
diff --git a/kubernetes/strimzi/values.yaml b/kubernetes/strimzi/values.yaml
index 9e63c2c..26b714a 100644
--- a/kubernetes/strimzi/values.yaml
+++ b/kubernetes/strimzi/values.yaml
@@ -23,7 +23,7 @@
#################################################################
# Application configuration defaults.
#################################################################
-replicaCount: 2
+replicaCount: 3
kafkaInternalPort: 9092
saslMechanism: scram-sha-512
version: 3.0.0
diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml
index dab69dd..6a0b0c9 100644
--- a/kubernetes/uui/Chart.yaml
+++ b/kubernetes/uui/Chart.yaml
@@ -17,24 +17,24 @@
apiVersion: v2
description: ONAP uui
name: uui
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: uui-server
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/uui-server'
- name: uui-nlp
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/uui-nlp'
diff --git a/kubernetes/uui/components/uui-nlp/Chart.yaml b/kubernetes/uui/components/uui-nlp/Chart.yaml
index d748aad..84664dc 100644
--- a/kubernetes/uui/components/uui-nlp/Chart.yaml
+++ b/kubernetes/uui/components/uui-nlp/Chart.yaml
@@ -20,15 +20,15 @@
apiVersion: v2
description: ONAP UUI NLP
name: uui-nlp
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: serviceAccount
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/uui/components/uui-server/Chart.yaml b/kubernetes/uui/components/uui-server/Chart.yaml
index d6cc6f0..133ebc5 100644
--- a/kubernetes/uui/components/uui-server/Chart.yaml
+++ b/kubernetes/uui/components/uui-server/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: ONAP uui server
name: uui-server
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/vfc/Chart.yaml b/kubernetes/vfc/Chart.yaml
index aecd278..26c9747 100644
--- a/kubernetes/vfc/Chart.yaml
+++ b/kubernetes/vfc/Chart.yaml
@@ -17,48 +17,48 @@
apiVersion: v2
description: ONAP Virtual Function Controller (VF-C)
name: vfc
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: vfc-generic-vnfm-driver
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/vfc-generic-vnfm-driver'
condition: vfc-generic-vnfm-driver.enabled
- name: vfc-huawei-vnfm-driver
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/vfc-huawei-vnfm-driver'
condition: vfc-huawei-vnfm-driver.enabled
- name: vfc-nslcm
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/vfc-nslcm'
condition: vfc-nslcm.enabled
- name: vfc-redis
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/vfc-redis'
condition: vfc-redis.enabled
- name: vfc-vnflcm
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/vfc-vnflcm'
condition: vfc-vnflcm.enabled
- name: vfc-vnfmgr
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/vfc-vnfmgr'
condition: vfc-vnfmgr.enabled
- name: vfc-vnfres
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/vfc-vnfres'
condition: vfc-vnfres.enabled
- name: vfc-zte-vnfm-driver
- version: ~10.x-0
+ version: ~11.x-0
repository: 'file://components/vfc-zte-vnfm-driver'
condition: vfc-zte-vnfm-driver.enabled
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
index 1e1bb3c..74f472e 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP VFC - Generic VNFM Driver
name: vfc-generic-vnfm-driver
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
index d5a043d..b5ab1fb 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/deployment.yaml
@@ -59,9 +59,14 @@
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MSB_HOST
- value: "{{ .Values.global.config.msbprotocol }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ value: "{{ .Values.global.config.msbprotocol }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ {{- if and (include "common.needTLS" .) (eq .Values.global.config.ssl_enabled true) }}
- name: SSL_ENABLED
- value: "{{ .Values.global.config.ssl_enabled }}"
+ value: "true"
+ {{- else }}
+ - name: SSL_ENABLED
+ value: "false"
+ {{- end }}
- name: REG_TO_MSB_WHEN_START
value: "{{ .Values.global.config.reg_to_msb_when_start }}"
volumeMounts:
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
index df7fe31..85498ae 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/templates/service.yaml
@@ -43,11 +43,11 @@
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
index b1d1aa3..6a4a802 100644
--- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/values.yaml
@@ -60,7 +60,7 @@
service:
type: ClusterIP
name: vfc-generic-vnfm-driver
- portName: vfc-generic-vnfm-driver
+ portName: http
externalPort: 8484
internalPort: 8484
# nodePort: 30484
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
index 33698ea..3fa0c45 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP VFC - Huawei VNFM Driver
name: vfc-huawei-vnfm-driver
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
index dd763b4..f96d4d6 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/deployment.yaml
@@ -60,9 +60,14 @@
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MSB_PROTO
- value: "{{ .Values.global.config.msbprotocol }}"
+ value: "{{ .Values.global.config.msbprotocol }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}"
+ {{- if and (include "common.needTLS" .) (eq .Values.global.config.ssl_enabled true) }}
- name: SSL_ENABLED
- value: "{{ .Values.global.config.ssl_enabled }}"
+ value: "true"
+ {{- else }}
+ - name: SSL_ENABLED
+ value: "false"
+ {{- end }}
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
- name: REG_TO_MSB_WHEN_START
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
index 95a84cf..def3fa2 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/templates/service.yaml
@@ -44,7 +44,7 @@
port: {{ .Values.service.internalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- - name: {{ .Values.service.portName }}2
+ - name: {{ .Values.service.portName }}s
port: {{ .Values.service.internalPort2 }}
targetPort: {{ .Values.service.internalPort2 }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
@@ -54,7 +54,7 @@
name: {{ .Values.service.portName }}
- port: {{ .Values.service.externalPort2 }}
targetPort: {{ .Values.service.internalPort2 }}
- name: {{ .Values.service.portName }}2
+ name: {{ .Values.service.portName }}s
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
index 596a1cf..3222169 100644
--- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/values.yaml
@@ -60,7 +60,7 @@
service:
type: ClusterIP
name: vfc-huawei-vnfm-driver
- portName: vfc-huawei-vnfm-driver
+ portName: http
externalPort: 8482
internalPort: 8482
externalPort2: 8483
diff --git a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
index 24942d1..f415fec 100644
--- a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP VFC - NS Life Cycle Management
name: vfc-nslcm
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
index 13c1705..f9faa7e 100644
--- a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@ -79,9 +79,14 @@
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MSB_HOST
- value: "{{ .Values.global.config.msbprotocol }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ value: "{{ .Values.global.config.msbprotocol }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ {{- if and (include "common.needTLS" .) (eq .Values.global.config.ssl_enabled true) }}
- name: SSL_ENABLED
- value: "{{ .Values.global.config.ssl_enabled }}"
+ value: "true"
+ {{- else }}
+ - name: SSL_ENABLED
+ value: "false"
+ {{- end }}
- name: MYSQL_ADDR
value: '{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}'
- name: MYSQL_ROOT_USER
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/service.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/service.yaml
index f46530d..4ca1cb8 100644
--- a/kubernetes/vfc/components/vfc-nslcm/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/service.yaml
@@ -52,11 +52,11 @@
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/vfc/components/vfc-nslcm/values.yaml b/kubernetes/vfc/components/vfc-nslcm/values.yaml
index 5ffe4c1..0cd3ce1 100644
--- a/kubernetes/vfc/components/vfc-nslcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/values.yaml
@@ -78,7 +78,7 @@
service:
type: ClusterIP
name: vfc-nslcm
- portName: vfc-nslcm
+ portName: http
externalPort: 8403
internalPort: 8403
# nodePort: 30403
diff --git a/kubernetes/vfc/components/vfc-redis/Chart.yaml b/kubernetes/vfc/components/vfc-redis/Chart.yaml
index dac35a7..9fe692b 100644
--- a/kubernetes/vfc/components/vfc-redis/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-redis/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP VFC - REDIS
name: vfc-redis
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-redis/templates/service.yaml b/kubernetes/vfc/components/vfc-redis/templates/service.yaml
index b20f3f8..23518e9 100644
--- a/kubernetes/vfc/components/vfc-redis/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-redis/templates/service.yaml
@@ -31,11 +31,11 @@
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/vfc/components/vfc-redis/values.yaml b/kubernetes/vfc/components/vfc-redis/values.yaml
index 0bbb395..1c6c4b4 100644
--- a/kubernetes/vfc/components/vfc-redis/values.yaml
+++ b/kubernetes/vfc/components/vfc-redis/values.yaml
@@ -55,7 +55,7 @@
service:
type: ClusterIP
name: vfc-redis
- portName: vfc-redis
+ portName: http
externalPort: 6379
internalPort: 6379
diff --git a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
index a816c4a..288e447 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP VFC - VNF Life Cycle Management
name: vfc-vnflcm
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
index 69de15c..8c414ff 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
@@ -79,9 +79,14 @@
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MSB_HOST
- value: "{{ .Values.global.config.msbprotocol }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ value: "{{ .Values.global.config.msbprotocol }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ {{- if and (include "common.needTLS" .) (eq .Values.global.config.ssl_enabled true) }}
- name: SSL_ENABLED
- value: "{{ .Values.global.config.ssl_enabled }}"
+ value: "true"
+ {{- else }}
+ - name: SSL_ENABLED
+ value: "false"
+ {{- end }}
- name: MYSQL_ADDR
value: '{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}'
- name: MYSQL_ROOT_USER
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml
index b64740b..7970e8a 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/service.yaml
@@ -43,11 +43,11 @@
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/vfc/components/vfc-vnflcm/values.yaml b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
index f291692..fcad261 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/values.yaml
@@ -78,7 +78,7 @@
service:
type: ClusterIP
name: vfc-vnflcm
- portName: vfc-vnflcm
+ portName: http
externalPort: 8801
internalPort: 8801
# nodePort: 30801
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
index 49191ef..93fb2ed 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP VFC - VNF Manager
name: vfc-vnfmgr
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index 0ee0b93..9fcf9b9 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -79,9 +79,14 @@
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MSB_HOST
- value: "{{ .Values.global.config.msbprotocol }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ value: "{{ .Values.global.config.msbprotocol }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ {{- if and (include "common.needTLS" .) (eq .Values.global.config.ssl_enabled true) }}
- name: SSL_ENABLED
- value: "{{ .Values.global.config.ssl_enabled }}"
+ value: "true"
+ {{- else }}
+ - name: SSL_ENABLED
+ value: "false"
+ {{- end }}
- name: MYSQL_ADDR
value: '{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}'
- name: REDIS_HOST
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
index 97ef463..9daf4e0 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/service.yaml
@@ -43,11 +43,11 @@
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
index cc2becc..528bbe0 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/values.yaml
@@ -78,7 +78,7 @@
service:
type: ClusterIP
name: vfc-vnfmgr
- portName: vfc-vnfmgr
+ portName: http
externalPort: 8803
internalPort: 8803
# nodePort: 30803
diff --git a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
index 383b34a..b02dfef 100644
--- a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP VFC - VNF Resource Manager
name: vfc-vnfres
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
index a017815..5723b0f 100644
--- a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
@@ -79,9 +79,14 @@
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MSB_HOST
- value: "{{ .Values.global.config.msbprotocol }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ value: "{{ .Values.global.config.msbprotocol }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ {{- if and (include "common.needTLS" .) (eq .Values.global.config.ssl_enabled true) }}
- name: SSL_ENABLED
- value: "{{ .Values.global.config.ssl_enabled }}"
+ value: "true"
+ {{- else }}
+ - name: SSL_ENABLED
+ value: "false"
+ {{- end }}
- name: MYSQL_ADDR
value: '{{ include "common.mariadbService" . }}:{{ include "common.mariadbPort" . }}'
- name: REDIS_HOST
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/service.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/service.yaml
index c043913..4f583f2 100644
--- a/kubernetes/vfc/components/vfc-vnfres/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/service.yaml
@@ -43,11 +43,11 @@
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/vfc/components/vfc-vnfres/values.yaml b/kubernetes/vfc/components/vfc-vnfres/values.yaml
index 8230144..c2954d5 100644
--- a/kubernetes/vfc/components/vfc-vnfres/values.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/values.yaml
@@ -78,7 +78,7 @@
service:
type: ClusterIP
name: vfc-vnfres
- portName: vfc-vnfres
+ portName: http
externalPort: 8802
internalPort: 8802
# nodePort: 30802
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
index f4c5d39..5f8a392 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml
@@ -17,12 +17,12 @@
apiVersion: v2
description: ONAP VFC - ZTE VNFM Driver
name: vfc-zte-vnfm-driver
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
index 9dcba3b..855532d 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/deployment.yaml
@@ -59,9 +59,14 @@
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: MSB_HOST
- value: "{{ .Values.global.config.msbprotocol }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ value: "{{ .Values.global.config.msbprotocol }}{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}://{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
+ {{- if and (include "common.needTLS" .) (eq .Values.global.config.ssl_enabled true) }}
- name: SSL_ENABLED
- value: "{{ .Values.global.config.ssl_enabled }}"
+ value: "true"
+ {{- else }}
+ - name: SSL_ENABLED
+ value: "false"
+ {{- end }}
- name: REG_TO_MSB_WHEN_START
value: "{{ .Values.global.config.reg_to_msb_when_start }}"
volumeMounts:
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
index 826b690..8a80a87 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/templates/service.yaml
@@ -43,11 +43,11 @@
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.portName }}
+ name: {{ .Values.service.portName }}{{ if (include "common.needTLS" .) }}s{{ end }}
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
index c6db92a..258407b 100644
--- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
+++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/values.yaml
@@ -60,7 +60,7 @@
service:
type: ClusterIP
name: vfc-zte-vnfm-driver
- portName: vfc-zte-vnfm-driver
+ portName: http
externalPort: 8410
internalPort: 8410
diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml
index 01d9eef..a0b69e0 100644
--- a/kubernetes/vfc/values.yaml
+++ b/kubernetes/vfc/values.yaml
@@ -15,7 +15,7 @@
global:
config:
ssl_enabled: false
- msbprotocol: https
+ msbprotocol: http
msbServiceName: msb-iag
msbPort: 443
redisServiceName: vfc-redis
diff --git a/kubernetes/vid/Chart.yaml b/kubernetes/vid/Chart.yaml
index aea0849..fe6164a 100644
--- a/kubernetes/vid/Chart.yaml
+++ b/kubernetes/vid/Chart.yaml
@@ -17,26 +17,26 @@
apiVersion: v2
description: ONAP Virtual Infrastructure Deployment
name: vid
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: mariadb-galera
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
diff --git a/kubernetes/vnfsdk/Chart.yaml b/kubernetes/vnfsdk/Chart.yaml
index 59522b8..7ef08bd 100644
--- a/kubernetes/vnfsdk/Chart.yaml
+++ b/kubernetes/vnfsdk/Chart.yaml
@@ -17,18 +17,18 @@
apiVersion: v2
description: ONAP VNF SDK
name: vnfsdk
-version: 10.0.0
+version: 11.0.0
dependencies:
- name: common
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: certInitializer
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: postgres
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'
- name: repositoryGenerator
- version: ~10.x-0
+ version: ~11.x-0
repository: '@local'