diff options
Diffstat (limited to 'kubernetes/onap')
| -rw-r--r-- | kubernetes/onap/Chart.yaml | 80 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/core-onap.yaml | 20 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/dev.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/disable-allcharts.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/minimal-onap.yaml | 20 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml | 12 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml | 14 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml | 11 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-vfw.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/sm-onap.yaml | 23 | ||||
| -rwxr-xr-x | kubernetes/onap/values.yaml | 42 |
12 files changed, 197 insertions, 49 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml index c1b321a8b0..951543473a 100644 --- a/kubernetes/onap/Chart.yaml +++ b/kubernetes/onap/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v2 name: onap -version: 11.0.0 +version: 12.0.0 appVersion: Kohn description: Open Network Automation Platform (ONAP) home: https://www.onap.org/ @@ -26,156 +26,156 @@ kubeVersion: ">=1.19.11-0" dependencies: - name: aaf - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: aaf.enabled - name: aai - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: aai.enabled - name: appc - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: appc.enabled - name: cassandra - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: cassandra.enabled - name: cds - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: cds.enabled - name: cli - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: cli.enabled - name: common - version: ~11.x-0 + version: ~12.x-0 repository: '@local' - name: consul - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: consul.enabled - name: contrib - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: global.addTestingComponents - name: cps - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: cps.enabled - name: dcaegen2-services - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: dcaegen2-services.enabled - name: dcaemod - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: dcaemod.enabled - name: holmes - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: holmes.enabled - name: dmaap - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: dmaap.enabled - name: log - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: log.enabled - name: sniro-emulator - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: sniro-emulator.enabled - name: mariadb-galera - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: mariadb-galera.enabled - name: msb - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: msb.enabled - name: multicloud - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: multicloud.enabled - name: nbi - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: nbi.enabled - name: policy - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: policy.enabled - name: portal - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: portal.enabled - name: postgres - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: postgres.enabled - name: oof - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: oof.enabled - name: repository-wrapper - version: ~11.x-0 + version: ~12.x-0 repository: '@local' - name: robot - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: robot.enabled - name: sdc - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: sdc.enabled - name: sdnc - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: sdnc.enabled - name: so - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: so.enabled - name: strimzi - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: strimzi.enabled - name: uui - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: uui.enabled - name: vfc - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: vfc.enabled - name: vid - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: vid.enabled - name: vnfsdk - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: vnfsdk.enabled - name: modeling - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: modeling.enabled - name: platform - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: platform.enabled - name: a1policymanagement - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: a1policymanagement.enabled - name: cert-wrapper - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: cert-wrapper.enabled - name: roles-wrapper - version: ~11.x-0 + version: ~12.x-0 repository: '@local' condition: roles-wrapper.enabled diff --git a/kubernetes/onap/resources/environments/core-onap.yaml b/kubernetes/onap/resources/environments/core-onap.yaml index abf2cd1dfa..8a4bb706d9 100644 --- a/kubernetes/onap/resources/environments/core-onap.yaml +++ b/kubernetes/onap/resources/environments/core-onap.yaml @@ -16,7 +16,7 @@ # This override file is used to deploy a core configuration. It is based on # minimal-onap.yaml and Orange accomplishments [1][2][3]. # It includes the following components: -# AAI, DMAAP, SDC, SDNC, SO (+ Cassandra) +# AAI, DMAAP Message Router, SDC, SDNC, SO (+ Cassandra), STRIMZI Kafka # # Minimal resources are also reviewed for the various containers # AAI: no override => to be fixed @@ -75,6 +75,14 @@ holmes: enabled: false dmaap: enabled: true + message-router: + enabled: true + dmaap-bc: + enabled: false + dmaap-dr-prov: + enabled: false + dmaap-dr-node: + enabled: false log: enabled: false mariadb-galera: @@ -126,6 +134,16 @@ so: openStackKeyStoneUrl: "$OPENSTACK_KEYSTONE_URL" openStackServiceTenantName: "$OPENSTACK_TENANT_NAME" openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD" +strimzi: + enabled: true + replicaCount: 2 + persistence: + kafka: + size: 1Gi + zookeeper: + size: 500Mbi + strimzi-kafka-bridge: + enabled: false uui: enabled: false vid: diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml index e2971f70cc..2caad2d530 100644 --- a/kubernetes/onap/resources/environments/dev.yaml +++ b/kubernetes/onap/resources/environments/dev.yaml @@ -137,6 +137,8 @@ so: mariadb: config: mariadbRootPassword: password +strimzi: + enabled: false uui: enabled: false vfc: diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml index 092dc1ab9b..43aa4c8c05 100644 --- a/kubernetes/onap/resources/environments/disable-allcharts.yaml +++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml @@ -77,6 +77,8 @@ sdnc: enabled: false so: enabled: false +strimzi: + enabled: false uui: enabled: false vfc: diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml index 12cccfb9e8..7bfa258e5a 100644 --- a/kubernetes/onap/resources/environments/minimal-onap.yaml +++ b/kubernetes/onap/resources/environments/minimal-onap.yaml @@ -16,7 +16,7 @@ # This override file is used to deploy a minimal configuration to # onboard and deploy a VNF. # It includes the following components: -# A&AI, Cassandra, DMAAP, Portal, Robot, SDC, SDNC, SO, VID +# A&AI, Cassandra, DMAAP Message Router, Portal, Robot, SDC, SDNC, SO, STRIMZI Kafka, VID # # Minimal resources are also reviewed for the various containers # A&AI: no override => to be fixed @@ -70,6 +70,14 @@ holmes: enabled: false dmaap: enabled: true + message-router: + enabled: true + dmaap-bc: + enabled: false + dmaap-dr-prov: + enabled: false + dmaap-dr-node: + enabled: false log: enabled: false mariadb-galera: @@ -170,6 +178,16 @@ so: openStackKeyStoneUrl: "$OPENSTACK_KEYSTONE_URL" openStackServiceTenantName: "$OPENSTACK_TENANT_NAME" openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD" +strimzi: + enabled: true + replicaCount: 1 + persistence: + kafka: + size: 1Gi + zookeeper: + size: 500Mbi + strimzi-kafka-bridge: + enabled: false uui: enabled: false vid: diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml index 6686e160e5..506dd4f7fe 100644 --- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml +++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml @@ -102,6 +102,14 @@ holmes: enabled: false dmaap: enabled: true + message-router: + enabled: true + dmaap-bc: + enabled: false + dmaap-dr-prov: + enabled: false + dmaap-dr-node: + enabled: false log: enabled: true sniro-emulator: @@ -161,6 +169,10 @@ so: openStackServiceTenantName: "service" openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e" +strimzi: + enabled: true + strimzi-kafka-bridge: + enabled: false uui: enabled: true vfc: diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml index dc98a422cc..c78ac8abd2 100644 --- a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml +++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml @@ -19,6 +19,8 @@ global: ingress: enabled: true + # enable all component's Ingress interfaces + enable_all: true # All http requests via ingress will be redirected config: ssl: "redirect" @@ -100,6 +102,8 @@ dcaegen2-services: enabled: true dcae-ves-collector: enabled: true + applicationConfig: + auth.method: "noAuth" dcae-ves-mapper: enabled: true dcae-ves-openapi-manager: @@ -110,6 +114,14 @@ holmes: enabled: true dmaap: enabled: true + message-router: + enabled: true + dmaap-bc: + enabled: true + dmaap-dr-prov: + enabled: true + dmaap-dr-node: + enabled: true oof: enabled: true msb: @@ -132,6 +144,8 @@ so: enabled: true strimzi: enabled: true + strimzi-kafka-bridge: + enabled: true uui: enabled: true vfc: diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml index 54e2cf3c4f..9a090c1a41 100644 --- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml +++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml @@ -19,6 +19,7 @@ global: ingress: enabled: true + enable_all: true addTestingComponents: &testing true centralizedLoggingEnabled: ¢ralizedLogging false cassandra: @@ -61,6 +62,14 @@ holmes: enabled: true dmaap: enabled: true + message-router: + enabled: true + dmaap-bc: + enabled: true + dmaap-dr-prov: + enabled: true + dmaap-dr-node: + enabled: true oof: enabled: true msb: @@ -83,6 +92,8 @@ so: enabled: true strimzi: enabled: true + strimzi-kafka-bridge: + enabled: true uui: enabled: true vfc: diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml index 849b55f0a9..aeac83f7ef 100644 --- a/kubernetes/onap/resources/overrides/onap-all.yaml +++ b/kubernetes/onap/resources/overrides/onap-all.yaml @@ -99,6 +99,14 @@ holmes: enabled: true dmaap: enabled: true + message-router: + enabled: true + dmaap-bc: + enabled: true + dmaap-dr-prov: + enabled: true + dmaap-dr-node: + enabled: true oof: enabled: true msb: @@ -121,6 +129,8 @@ so: enabled: true strimzi: enabled: true + strimzi-kafka-bridge: + enabled: true uui: enabled: true vfc: diff --git a/kubernetes/onap/resources/overrides/onap-vfw.yaml b/kubernetes/onap/resources/overrides/onap-vfw.yaml index 053f56e00f..fc0c94de24 100644 --- a/kubernetes/onap/resources/overrides/onap-vfw.yaml +++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml @@ -37,6 +37,14 @@ holmes: enabled: true dmaap: enabled: true + message-router: + enabled: true + dmaap-bc: + enabled: false + dmaap-dr-prov: + enabled: false + dmaap-dr-node: + enabled: false log: enabled: true oof: @@ -57,5 +65,7 @@ so: enabled: true strimzi: enabled: true + strimzi-kafka-bridge: + enabled: false vid: enabled: true diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml index f744fca5d0..1d3b2eb5c9 100644 --- a/kubernetes/onap/resources/overrides/sm-onap.yaml +++ b/kubernetes/onap/resources/overrides/sm-onap.yaml @@ -20,7 +20,8 @@ # # Minimal resources are also reviewed for the various containers # AAI: no override => to be fixed -# DMAAP: no override # SO: no override +# DMAAP: no override +# SO: no override # SDC: new values # SDNC: no override # @@ -44,6 +45,9 @@ ####################### global: aafEnabled: false + cmpv2Enabled: false + msbEnabled: false + tlsEnabled: false centralizedLoggingEnabled: false serviceMesh: enabled: true @@ -79,6 +83,16 @@ cps: enabled: false dcaegen2-services: enabled: false +dmaap: + enabled: true + message-router: + enabled: true + dmaap-bc: + enabled: true + dmaap-dr-prov: + enabled: true + dmaap-dr-node: + enabled: true holmes: enabled: false log: @@ -134,6 +148,8 @@ so: openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD" strimzi: enabled: true + strimzi-kafka-bridge: + enabled: true uui: enabled: false vid: @@ -144,7 +160,4 @@ vnfsdk: enabled: false cds: enabled: true -dmaap: - enabled: true - dmaap-bc: - enabled: false + diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 8a6af16c17..bdbf5ab323 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -146,9 +146,26 @@ global: # Global ingress configuration ingress: + # generally enable ingress for ONAP components enabled: false + # enable all component's Ingress interfaces + enable_all: false + # default Ingress base URL + # can be overwritten in component vy setting ingress.baseurlOverride virtualhost: baseurl: "simpledemo.onap.org" + # All http requests via ingress will be redirected on Ingress controller + # only valid for Istio Gateway (ServiceMesh enabled) + config: + ssl: "redirect" + # you can set an own Secret containing a certificate + # only valid for Istio Gateway (ServiceMesh enabled) + # tls: + # secret: 'my-ingress-cert' + + # optional: Namespace of the Istio IngressGateway + # only valid for Istio Gateway (ServiceMesh enabled) + namespace: istio-ingress # Global Service Mesh configuration # POC Mode, don't use it in production @@ -303,9 +320,17 @@ holmes: enabled: false dmaap: enabled: false + message-router: + enabled: false + dmaap-bc: + enabled: false + dmaap-dr-prov: + enabled: false + dmaap-dr-node: + enabled: false # Today, "logging" chart that perform the central part of logging must also be # enabled in order to make it work. So `logging.enabled` must have the same -# value than centralizedLoggingEnabled +# value as centralizedLoggingEnabled log: enabled: *centralizedLogging sniro-emulator: @@ -370,8 +395,22 @@ so: # server: # monitoring: # password: demo123456! + strimzi: enabled: false + # Kafka replication & disk storage should be dimensioned + # according to each given system use case. + replicaCount: 3 + persistence: + kafka: + size: 10Gi + zookeeper: + size: 1Gi + # Strimzi kafka bridge is an optional http api towards + # kafka provided by https://strimzi.io/docs/bridge/latest/ + strimzi-kafka-bridge: + enabled: false + uui: enabled: false vfc: @@ -386,7 +425,6 @@ platform: enabled: false a1policymanagement: enabled: false - cert-wrapper: enabled: true repository-wrapper: |