diff options
Diffstat (limited to 'kubernetes/onap')
| -rw-r--r-- | kubernetes/onap/Chart.yaml | 52 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/dev.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/environment.yaml | 54 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml | 33 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml | 64 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml | 64 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml | 53 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-all.yaml | 58 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/onap-vfw.yaml | 14 | ||||
| -rw-r--r-- | kubernetes/onap/resources/overrides/sm-onap.yaml | 23 | ||||
| -rwxr-xr-x | kubernetes/onap/values.yaml | 10 |
11 files changed, 91 insertions, 336 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml index 45d8da170b..a035097004 100644 --- a/kubernetes/onap/Chart.yaml +++ b/kubernetes/onap/Chart.yaml @@ -15,8 +15,8 @@ apiVersion: v2 name: onap -version: 14.0.0 -appVersion: NewDelhi +version: 15.0.0 +appVersion: Oslo description: Open Network Automation Platform (ONAP) home: https://www.onap.org/ sources: @@ -25,8 +25,12 @@ icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png? kubeVersion: ">=1.19.11-0" dependencies: + - name: authentication + version: ~14.x-0 + repository: '@local' + condition: authentication:enabled - name: aai - version: ~13.x-0 + version: ~14.x-0 repository: '@local' condition: aai.enabled - name: cassandra @@ -37,10 +41,6 @@ dependencies: version: ~13.x-0 repository: '@local' condition: cds.enabled - - name: cli - version: ~13.x-0 - repository: '@local' - condition: cli.enabled - name: common version: ~13.x-0 repository: '@local' @@ -49,33 +49,17 @@ dependencies: repository: '@local' condition: cps.enabled - name: dcaegen2-services - version: ~13.x-0 + version: ~15.x-0 repository: '@local' condition: dcaegen2-services.enabled - - name: holmes - version: ~13.x-0 - repository: '@local' - condition: holmes.enabled - - name: dmaap - version: ~13.x-0 - repository: '@local' - condition: dmaap.enabled - name: mariadb-galera version: ~13.x-0 repository: '@local' condition: mariadb-galera.enabled - - name: msb - version: ~13.x-0 - repository: '@local' - condition: msb.enabled - name: multicloud - version: ~13.x-0 + version: ~15.x-0 repository: '@local' condition: multicloud.enabled - - name: nbi - version: ~13.x-0 - repository: '@local' - condition: nbi.enabled - name: policy version: ~14.x-0 repository: '@local' @@ -88,10 +72,6 @@ dependencies: version: ~13.x-0 repository: '@local' condition: postgres.enabled - - name: oof - version: ~13.x-0 - repository: '@local' - condition: oof.enabled - name: repository-wrapper version: ~13.x-0 repository: '@local' @@ -104,7 +84,7 @@ dependencies: repository: '@local' condition: sdc.enabled - name: sdnc - version: ~13.x-0 + version: ~15.x-0 repository: '@local' condition: sdnc.enabled - name: so @@ -119,18 +99,6 @@ dependencies: version: ~13.x-0 repository: '@local' condition: uui.enabled - - name: vfc - version: ~13.x-0 - repository: '@local' - condition: vfc.enabled - - name: vnfsdk - version: ~13.x-0 - repository: '@local' - condition: vnfsdk.enabled - - name: modeling - version: ~13.x-0 - repository: '@local' - condition: modeling.enabled - name: platform version: ~13.x-0 repository: '@local' diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml index c2b4403e33..fcf5de366c 100644 --- a/kubernetes/onap/resources/environments/dev.yaml +++ b/kubernetes/onap/resources/environments/dev.yaml @@ -32,7 +32,7 @@ global: #repository: nexus3.onap.org:10001 # readiness check - readinessImage: onap/oom/readiness:3.0.1 + readinessImage: onap/oom/readiness:6.0.3 # logging agent - temporary repo until images migrated to nexus3 loggingRepository: docker.elastic.co diff --git a/kubernetes/onap/resources/overrides/environment.yaml b/kubernetes/onap/resources/overrides/environment.yaml index 468aab8c18..554bacd51f 100644 --- a/kubernetes/onap/resources/overrides/environment.yaml +++ b/kubernetes/onap/resources/overrides/environment.yaml @@ -61,37 +61,6 @@ cassandra: readiness: timeoutSeconds: 30 periodSeconds: 60 -holmes: - holmes-rule-mgmt: - liveness: - initialDelaySeconds: 120 - readiness: - initialDelaySeconds: 120 - holmes-engine-mgmt: - liveness: - initialDelaySeconds: 120 - readiness: - initialDelaySeconds: 120 -dmaap: - dmaap-bus-controller: - liveness: - initialDelaySeconds: 120 - readiness: - initialDelaySeconds: 120 - dmaap-dr-prov: - liveness: - initialDelaySeconds: 120 - readiness: - initialDelaySeconds: 120 - mariadb: - liveness: - initialDelaySeconds: 180 - periodSeconds: 60 - dmaap-dr-node: - liveness: - initialDelaySeconds: 120 - readiness: - initialDelaySeconds: 120 mariadb-galera: liveness: initialDelaySeconds: 30 @@ -101,19 +70,6 @@ mariadb-galera: initialDelaySeconds: 120 readiness: initialDelaySeconds: 120 -modeling: - mariadb-galera: - liveness: - initialDelaySeconds: 180 - periodSeconds: 60 -oof: - oof-has: - music: - music-cassandra: - liveness: - periodSeconds: 120 - readiness: - periodSeconds: 60 sdc: sdc-fe: liveness: @@ -159,11 +115,6 @@ sdnc: initialDelaySeconds: 60 readiness: initialDelaySeconds: 60 - dmaap-listener: - liveness: - initialDelaySeconds: 120 - readiness: - initialDelaySeconds: 120 mariadb-galera: liveness: initialDelaySeconds: 180 @@ -190,8 +141,3 @@ uui: initialDelaySeconds: 120 readiness: initialDelaySeconds: 120 -vfc: - mariadb-galera: - liveness: - initialDelaySeconds: 180 - periodSeconds: 60 diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml index a51106f92b..159c800d4f 100644 --- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml +++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml @@ -35,7 +35,7 @@ global: password: docker # readiness check - readinessImage: onap/oom/readiness:3.0.1 + readinessImage: onap/oom/readiness:6.0.3 # logging agent - temporary repo until images migrated to nexus3 loggingRepository: docker.elastic.co @@ -74,36 +74,16 @@ cassandra: enabled: true cds: enabled: true -cli: - enabled: false cps: enabled: false dcaegen2-services: enabled: false -holmes: - enabled: false -dmaap: - enabled: true - message-router: - enabled: true - dmaap-dr-prov: - enabled: false - dmaap-dr-node: - enabled: false -oof: - enabled: true mariadb-galera: enabled: true msb: enabled: true multicloud: enabled: false -nbi: - enabled: true - config: - # openstack configuration - openStackRegion: "Yolo" - openStackVNFTenantId: "1234" policy: enabled: true portal-ng: @@ -117,21 +97,16 @@ sdc: enabled: true sdnc: enabled: false - replicaCount: 1 - mysql: replicaCount: 1 so: enabled: true - replicaCount: 1 - liveness: # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: false - # so server configuration config: # message router configuration @@ -149,9 +124,3 @@ strimzi: enabled: false uui: enabled: true -vfc: - enabled: false -vnfsdk: - enabled: false -modeling: - enabled: false diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml index ba7b50e53c..b4b7741be3 100644 --- a/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml +++ b/kubernetes/onap/resources/overrides/onap-all-ingress-gatewayapi.yaml @@ -62,84 +62,40 @@ mariadb-galera: enabled: true postgres: enabled: true +authentication: + enabled: true aai: enabled: true cds: enabled: true -cli: - enabled: true cps: enabled: true -dcaegen2: - 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 applicationConfig: auth.method: "noAuth" - dcae-ves-mapper: - enabled: true dcae-ves-openapi-manager: enabled: true -holmes: - enabled: true -dmaap: - enabled: true - message-router: - enabled: true - dmaap-dr-prov: - enabled: true - dmaap-dr-node: - enabled: true -oof: - enabled: true -msb: - enabled: true multicloud: enabled: true -nbi: - enabled: true platform: enabled: true cmpv2-cert-service: enabled: false - keycloak-init: - enabled: true - oauth2-proxy: - enabled: true policy: enabled: true portal-ng: @@ -150,6 +106,16 @@ sdc: enabled: true sdnc: enabled: true + network-name-gen: + enabled: true + dgbuilder: + enabled: true + ueb-listener: + enabled: true + sdnc-ansible-server: + enabled: true + sdnc-web: + enabled: true so: enabled: true strimzi: @@ -158,11 +124,5 @@ strimzi: enabled: true uui: enabled: true -vfc: - enabled: true -vnfsdk: - enabled: true -modeling: - enabled: true a1policymanagement: enabled: true diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml index cc830424e2..c4b5e0969f 100644 --- a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml +++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml @@ -63,84 +63,40 @@ mariadb-galera: enabled: true postgres: enabled: true +authentication: + enabled: true aai: enabled: true cds: enabled: true -cli: - enabled: true cps: enabled: true -dcaegen2: - 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 applicationConfig: auth.method: "noAuth" - dcae-ves-mapper: - enabled: true dcae-ves-openapi-manager: enabled: true -holmes: - enabled: true -dmaap: - enabled: true - message-router: - enabled: true - dmaap-dr-prov: - enabled: true - dmaap-dr-node: - enabled: true -oof: - enabled: true -msb: - enabled: true multicloud: enabled: true -nbi: - enabled: true platform: enabled: true cmpv2-cert-service: enabled: false - keycloak-init: - enabled: true - oauth2-proxy: - enabled: true policy: enabled: true portal-ng: @@ -151,6 +107,16 @@ sdc: enabled: true sdnc: enabled: true + network-name-gen: + enabled: true + dgbuilder: + enabled: true + ueb-listener: + enabled: true + sdnc-ansible-server: + enabled: true + sdnc-web: + enabled: true so: enabled: true strimzi: @@ -159,11 +125,5 @@ strimzi: enabled: true uui: enabled: true -vfc: - enabled: true -vnfsdk: - enabled: true -modeling: - enabled: true a1policymanagement: enabled: true 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 e5fd78e9ef..c90614b650 100644 --- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml +++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml @@ -39,35 +39,42 @@ mariadb-galera: enabled: true postgres: enabled: true - +authentication: + enabled: true aai: enabled: true cds: enabled: true -cli: - enabled: true cps: enabled: true dcaegen2-services: enabled: true -holmes: - enabled: true -dmaap: - enabled: true - message-router: + dcae-datalake-admin-ui: enabled: true - dmaap-dr-prov: + dcae-datalake-des: enabled: true - dmaap-dr-node: + dcae-datalake-feeder: + enabled: true + dcae-hv-ves-collector: + enabled: true + dcae-ms-healthcheck: + enabled: true + dcae-prh: + enabled: true + dcae-restconf-collector: + enabled: false + dcae-ves-collector: + enabled: true + applicationConfig: + auth.method: "noAuth" + dcae-ves-openapi-manager: enabled: true -oof: - enabled: true -msb: - enabled: true multicloud: enabled: true -nbi: +platform: enabled: true + cmpv2-cert-service: + enabled: false policy: enabled: true portal-ng: @@ -78,6 +85,16 @@ sdc: enabled: true sdnc: enabled: true + network-name-gen: + enabled: true + dgbuilder: + enabled: true + ueb-listener: + enabled: true + sdnc-ansible-server: + enabled: true + sdnc-web: + enabled: true so: enabled: true strimzi: @@ -86,8 +103,6 @@ strimzi: enabled: true uui: enabled: true -vfc: +a1policymanagement: enabled: true -vnfsdk: - enabled: true - + 55,15 39% diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml index 027f8b3225..444d904453 100644 --- a/kubernetes/onap/resources/overrides/onap-all.yaml +++ b/kubernetes/onap/resources/overrides/onap-all.yaml @@ -25,72 +25,34 @@ mariadb-galera: enabled: true postgres: enabled: true +authentication: + enabled: true aai: enabled: true cds: enabled: true -cli: - enabled: true cps: 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 -holmes: - enabled: true -dmaap: - enabled: true - message-router: - enabled: true - dmaap-dr-prov: - enabled: true - dmaap-dr-node: - enabled: true -oof: - enabled: true -msb: - enabled: true multicloud: enabled: true -nbi: - enabled: true policy: enabled: true portal-ng: @@ -101,6 +63,16 @@ sdc: enabled: true sdnc: enabled: true + network-name-gen: + enabled: true + dgbuilder: + enabled: true + ueb-listener: + enabled: true + sdnc-ansible-server: + enabled: true + sdnc-web: + enabled: true so: enabled: true strimzi: @@ -109,12 +81,6 @@ strimzi: enabled: true uui: enabled: true -vfc: - enabled: true -vnfsdk: - enabled: true -modeling: - enabled: true platform: enabled: true a1policymanagement: diff --git a/kubernetes/onap/resources/overrides/onap-vfw.yaml b/kubernetes/onap/resources/overrides/onap-vfw.yaml index 14748ddb2e..5ce3a97488 100644 --- a/kubernetes/onap/resources/overrides/onap-vfw.yaml +++ b/kubernetes/onap/resources/overrides/onap-vfw.yaml @@ -25,20 +25,6 @@ aai: enabled: true dcaegen2-services: enabled: true -holmes: - enabled: true -dmaap: - enabled: true - message-router: - enabled: true - dmaap-dr-prov: - enabled: false - dmaap-dr-node: - enabled: false -oof: - enabled: true -msb: - enabled: true policy: enabled: true portal-ng: diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml index dc5da35113..6877e33875 100644 --- a/kubernetes/onap/resources/overrides/sm-onap.yaml +++ b/kubernetes/onap/resources/overrides/sm-onap.yaml @@ -63,32 +63,14 @@ aai: cassandra: enabled: true replicaCount: 3 -cli: - enabled: false cps: enabled: false dcaegen2-services: enabled: false -dmaap: - enabled: true - message-router: - enabled: true - dmaap-dr-prov: - enabled: true - dmaap-dr-node: - enabled: true -holmes: - enabled: false mariadb-galera: enabled: true -msb: - enabled: false multicloud: enabled: false -nbi: - enabled: false -oof: - enabled: false policy: enabled: false portal-ng: @@ -130,10 +112,5 @@ strimzi: enabled: true uui: enabled: false -vfc: - enabled: false -vnfsdk: - enabled: false cds: enabled: true - diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index a4bf64b653..6ca0e26b1e 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -96,6 +96,9 @@ global: # mariadb client image mariadbImage: bitnami/mariadb:10.5.8 + # mongodb server image + mongodbImage: percona/percona-server-mongodb:7.0.5-3 + # nginx server image nginxImage: bitnami/nginx:1.21.4 @@ -103,7 +106,7 @@ global: postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1 # readiness check image - readinessImage: onap/oom/readiness:5.0.1 + readinessImage: onap/oom/readiness:6.0.3 # image pull policy pullPolicy: Always @@ -199,6 +202,9 @@ global: tls: true # be aware that linkerd is not well tested engine: "istio" # valid value: istio or linkerd + # if nativeSidecars are enabled in Istio, this value can be set to "true" + # and will disable the deployment of sidecar killer containers in jobs + nativeSidecars: false # Global Istio Authorization Policy configuration authorizationPolicies: @@ -297,6 +303,8 @@ global: # to customize the ONAP deployment. ################################################################# +authentication: + enabled: false aai: enabled: false cassandra: |