Merge "[COMMON] Correct Ingress template to create Istio GW/VS"

[oom.git] / kubernetes / onap / values.yaml

diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 83000af..bdbf5ab 100755 (executable)
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -78,7 +78,7 @@ global:
 
   # common global images
   # Busybox for simple shell manipulation
-  busyboxImage: busybox:1.32
+  busyboxImage: busybox:1.34.1
 
   # curl image
   curlImage: curlimages/curl:7.80.0
@@ -91,16 +91,16 @@ global:
   htpasswdImage: xmartlabs/htpasswd:latest
 
   # kubenretes client image
-  kubectlImage: bitnami/kubectl:1.19
+  kubectlImage: bitnami/kubectl:1.22.4
 
   # logging agent
   loggingImage: beats/filebeat:5.5.0
 
   # mariadb client image
-  mariadbImage: bitnami/mariadb:10.6.5-debian-10-r28
+  mariadbImage: bitnami/mariadb:10.5.8
 
   # nginx server image
-  nginxImage: bitnami/nginx:1.18-debian-10
+  nginxImage: bitnami/nginx:1.21.4
 
   # postgreSQL client and server image
   postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
@@ -135,7 +135,7 @@ global:
 
   # default password complexity
   # available options: phrase, name, pin, basic, short, medium, long, maximum security
-  # More datails: https://masterpassword.app/masterpassword-algorithm.pdf
+  # More datails: https://www.masterpasswordapp.com/masterpassword-algorithm.pdf
   passwordStrength: long
 
   # configuration to set log level to all components (the one that are using
@@ -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
@@ -295,8 +312,6 @@ contrib:
   enabled: *testing
 cps:
   enabled: false
-dcaegen2:
-  enabled: false
 dcaegen2-services:
   enabled: false
 dcaemod:
@@ -305,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:
@@ -372,6 +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: