Merge "[SDC] Update SDC images to 1.13.6"

diff --git a/docs/sections/guides/infra_guides/oom_infra_base_config_setup.rst b/docs/sections/guides/infra_guides/oom_infra_base_config_setup.rst
index e84f578..8f74ea9 100644 (file)
--- a/docs/sections/guides/infra_guides/oom_infra_base_config_setup.rst
+++ b/docs/sections/guides/infra_guides/oom_infra_base_config_setup.rst
@@ -123,7 +123,7 @@ Set the default StorageClass
 In some ONAP components it is important to have a default storageClass defined (e.g. cassandra),
 if you don't want to explicitly set it during the deployment via helm overrides.
 
-Therefor you should set the default storageClass (if not done during the K8S cluster setup) via the command:
+Therefor you should set the default storageClass (if not done during the K8S cluster setup) via the command::
 
     > kubectl patch storageclass <storageclass> -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
 
@@ -338,7 +338,7 @@ Gateway-API
 Keycloak Installation
 ---------------------
 
-- Add helm repositories
+- Add helm repositories::
 
   > helm repo add bitnami https://charts.bitnami.com/bitnami
 
@@ -346,7 +346,7 @@ Keycloak Installation
 
   > helm repo update
 
-- create keycloak namespace
+- create keycloak namespace::
 
   > kubectl create namespace keycloak
   > kubectl label namespace keycloak istio-injection=enabled
@@ -362,7 +362,7 @@ Install Keycloak-Database
       .. include:: ../../resources/yaml/keycloak-db-values.yaml
          :code: yaml
 
-- Install the Postgres DB
+- Install the Postgres DB::
 
   > helm -n keycloak upgrade -i keycloak-db bitnami/postgresql --values ./keycloak-db-values.yaml
 
@@ -377,7 +377,7 @@ Configure Keycloak
       .. include:: ../../resources/yaml/keycloak-server-values.yaml
          :code: yaml
 
-- Install keycloak
+- Install keycloak::
 
   > helm -n keycloak upgrade -i keycloak codecentric/keycloak --values ./keycloak-server-values.yaml
 

diff --git a/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
index e21c4b6..e46bee1 100644 (file)
--- a/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
+++ b/docs/sections/guides/infra_guides/oom_infra_deployment_requirements.rst
@@ -64,10 +64,10 @@ The versions of software that are supported by OOM are as follows:
 
 .. table:: OOM Software Requirements (optional)
 
-  ==============     ================= ==========
-  Release            Prometheus Stack  K8ssandra
-  ==============     ================= ==========
+  ==============     ================= ========== =================
+  Release            Prometheus Stack  K8ssandra  MariaDB-Operator
+  ==============     ================= ========== =================
   Kohn               35.x
   London             45.x              1.6.1
-  Montreal           45.x              1.8.0
-  ==============     ================= ==========
+  Montreal           45.x              1.9.1      0.21.0
+  ==============     ================= ========== =================

diff --git a/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst b/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst
index 71ce344..de26d11 100644 (file)
--- a/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst
+++ b/docs/sections/guides/infra_guides/oom_infra_optional_addons.rst
@@ -112,7 +112,7 @@ For setup the K8ssandra operator is used, see `K8ssandra setup guide`_
 
     > kubectl label namespace k8ssandra-operator istio-injection=enabled
 
-- Install the k8ssandra-operator::
+- Install the k8ssandra-operator replacing the <recommended-version> with the version defined in the :ref:`versions_table` table::
 
     > helm repo add k8ssandra https://helm.k8ssandra.io/stable
 
@@ -120,6 +120,7 @@ For setup the K8ssandra operator is used, see `K8ssandra setup guide`_
 
     > helm install k8ssandra-operator --namespace k8ssandra-operator
       k8ssandra/k8ssandra-operator --set global.clusterScoped=true
+      --version=<recommended-version>
 
 Mariadb-Operator Installation
 -----------------------------
@@ -135,7 +136,7 @@ For setup the Mariadb-Operator is used, see `Mariadb-Operator setup guide`_
 
     > kubectl label namespace mariadb-operator istio-injection=enabled
 
-- Install the mariadb-operator::
+- Install the mariadb-operator replacing the <recommended-version> with the version defined in the :ref:`versions_table` table::::
 
     > helm repo add mariadb-operator https://mariadb-operator.github.io/mariadb-operator
 
@@ -143,6 +144,8 @@ For setup the Mariadb-Operator is used, see `Mariadb-Operator setup guide`_
 
     > helm install mariadb-operator --namespace mariadb-operator
       mariadb-operator/mariadb-operator --set ha.enabled=true
+      --set metrics.enabled=true --set webhook.certificate.certManager=true
+      --version=<recommended-version>
 
 
 Kserve Installation

diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index e6db1aa..31edf9b 100644 (file)
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -81,14 +81,14 @@ serviceMesh:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 4Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 8Gi
     requests:
       cpu: 2

diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index 5105174..09396cc 100644 (file)
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -28,6 +28,8 @@ global: # global defaults
   cassandra:
     #This will instantiate AAI cassandra cluster, default:shared cassandra.
     localCluster: false
+    # flag to enable the DB creation via k8ssandra-operator
+    useOperator: true
   initContainers:
     enabled: true
   jobs:
@@ -244,14 +246,14 @@ accessLogback:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 4Gi
     requests:
       cpu: 0.5
       memory: 1.6Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 8Gi
     requests:
       cpu: 1

diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index 43f4b1b..57c562b 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -65,14 +65,14 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 4Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 8Gi
     requests:
       cpu: 1

diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 6efb129..e5cc716 100644 (file)
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -231,14 +231,14 @@ serviceMesh:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 4Gi
     requests:
       cpu: 1
       memory: 3Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 8Gi
     requests:
       cpu: 2

diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml
index 24e4fa3..88f1786 100644 (file)
--- a/kubernetes/aai/components/aai-schema-service/values.yaml
+++ b/kubernetes/aai/components/aai-schema-service/values.yaml
@@ -125,14 +125,14 @@ serviceMesh:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 4Gi
     requests:
       cpu: 1
       memory: 3Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 8Gi
     requests:
       cpu: 2

diff --git a/kubernetes/aai/components/aai-sparky-be/values.yaml b/kubernetes/aai/components/aai-sparky-be/values.yaml
index a2f13a2..8cfd2c6 100644 (file)
--- a/kubernetes/aai/components/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/values.yaml
@@ -109,14 +109,14 @@ podAnnotations:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 0.5
       memory: 4Gi
     requests:
       cpu: 0.25
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 8Gi
     requests:
       cpu: 0.5

diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index a759f98..349fe77 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -251,14 +251,14 @@ accessLogback:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 4Gi
     requests:
       cpu: 1
       memory: 3Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 8Gi
     requests:
       cpu: 2

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index b9223b1..04b5ac2 100644 (file)
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -443,14 +443,14 @@ serviceMesh:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 4Gi
     requests:
       cpu: 1
       memory: 1.2Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 8Gi
     requests:
       cpu: 2

diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index e6c0856..1be791c 100755 (executable)
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -203,14 +203,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1.8Gi
     requests:
       cpu: 0.5
       memory: 1.8Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 3.6Gi
     requests:
       cpu: 1

diff --git a/kubernetes/cds/components/cds-command-executor/values.yaml b/kubernetes/cds/components/cds-command-executor/values.yaml
index bea0d09..a6015eb 100755 (executable)
--- a/kubernetes/cds/components/cds-command-executor/values.yaml
+++ b/kubernetes/cds/components/cds-command-executor/values.yaml
@@ -81,14 +81,14 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.2Gi
     requests:
       cpu: 0.5
       memory: 0.2Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 0.4Gi
     requests:
       cpu: 1

diff --git a/kubernetes/cds/components/cds-py-executor/values.yaml b/kubernetes/cds/components/cds-py-executor/values.yaml
index 7d2f1bd..fb415d1 100755 (executable)
--- a/kubernetes/cds/components/cds-py-executor/values.yaml
+++ b/kubernetes/cds/components/cds-py-executor/values.yaml
@@ -97,14 +97,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.2Gi
     requests:
       cpu: 0.5
       memory: 0.2Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 0.4Gi
     requests:
       cpu: 1

diff --git a/kubernetes/cds/components/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index 404a9a8..3897a33 100644 (file)
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -97,14 +97,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.7Gi
     requests:
       cpu: 0.5
       memory: 0.7Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1.4Gi
     requests:
       cpu: 1

diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index cd7c64e..b45a89d 100644 (file)
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -96,14 +96,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.2Gi
     requests:
       cpu: 0.5
       memory: 0.2Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 0.2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index 930fe9b..205c711 100644 (file)
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -29,7 +29,7 @@ global: # global defaults
     enableServiceAccount: false
 
 k8ssandraOperator:
-  cassandraVersion: 4.0.1
+  cassandraVersion: 4.0.10
   persistence:
     #storageClassName: default
     size: 10Gi
@@ -41,12 +41,16 @@ k8ssandraOperator:
     casOptions:
       authorizer: AllowAllAuthorizer
     jvmOptions:
-      heapSize: 512M
+      heap_initial_size: 512M
+      heap_max_size: 4096M
     hostNetwork: false
   datacenters:
     - name: dc1
       size: 3
+  reaper:
+    enabled: true
   stargate:
+    enabled: true
     tag: v1.0.76
     size: 1
     jvmOptions:

diff --git a/kubernetes/common/common/templates/_cassOp.tpl b/kubernetes/common/common/templates/_cassOp.tpl
index d0f2387..b9f6766 100644 (file)
--- a/kubernetes/common/common/templates/_cassOp.tpl
+++ b/kubernetes/common/common/templates/_cassOp.tpl
@@ -23,17 +23,30 @@ kind: K8ssandraCluster
 metadata:
   name: {{ .Values.k8ssandraOperator.config.clusterName }}
 spec:
+  {{ if .Values.k8ssandraOperator.reaper.enabled -}}
   reaper:
+    initContainerImage:
+      registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
     containerImage:
       registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
     autoScheduling:
       enabled: true
+    metadata:
+      commonLabels:
+        app: {{ .Values.k8ssandraOperator.config.clusterName }}-reaper
+        version: {{ .Values.k8ssandraOperator.cassandraVersion }}
+  {{- end }}
+  {{ if .Values.k8ssandraOperator.stargate.enabled -}}
   stargate:
     containerImage:
       registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
       tag: {{ .Values.k8ssandraOperator.stargate.tag }}
     size: {{ .Values.k8ssandraOperator.stargate.size }}
     heapSize: {{ .Values.k8ssandraOperator.stargate.jvmOptions.heapSize }}
+    metadata:
+      commonLabels:
+        app: {{ .Values.k8ssandraOperator.config.clusterName }}-stargate
+        version: {{ .Values.k8ssandraOperator.cassandraVersion }}
     livenessProbe:
       initialDelaySeconds: 200
       periodSeconds: 10
@@ -46,6 +59,7 @@ spec:
       failureThreshold: 20
       successThreshold: 1
       timeoutSeconds: 20
+  {{- end }}
   cassandra:
     serverVersion: {{ .Values.k8ssandraOperator.cassandraVersion }}
     storageConfig:

diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index 7e127e2..5e0aed5 100644 (file)
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -126,6 +126,7 @@ spec:
     name: {{ $dbinst }}
   characterSet: utf8
   collate: utf8_general_ci
+  retryInterval: 5s
 {{- end -}}
 
 {{/*
@@ -151,6 +152,7 @@ spec:
     key: password
   # This field is immutable and defaults to 10
   maxUserConnections: 100
+  retryInterval: 5s
 {{- end -}}
 
 {{/*
@@ -174,6 +176,7 @@ spec:
   database: {{ $dbname }}
   table: "*"
   username: {{ $dbuser }}
+  retryInterval: 5s
   grantOption: true
 {{- end -}}
 
@@ -241,27 +244,20 @@ spec:
   rootPasswordSecretKeyRef:
     name: {{ $dbrootsecret }}
     key: password
-  image:
-    repository: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbOperator.image }}
-    tag: {{ $dot.Values.mariadbOperator.appVersion }}
-    pullPolicy: IfNotPresent
+  image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadbOperator.image }}:{{ $dot.Values.mariadbOperator.appVersion }}
+  imagePullPolicy: IfNotPresent
   imagePullSecrets:
     - name: {{ include "common.namespace" . }}-docker-registry-key
   port: 3306
   replicas: {{ $dot.Values.replicaCount }}
+  {{- if $dot.Values.mariadbOperator.galera.enabled }}
   galera:
-    {{- if eq (int $dot.Values.replicaCount) 1 }}
-    enabled: false
-    {{- else }}
-    enabled: {{ $dot.Values.mariadbOperator.galera.enabled }}
-    {{- end }}
+    enabled: true
     sst: mariabackup
     replicaThreads: 1
     agent:
-      image:
-        repository: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ .Values.mariadbOperator.galera.agentImage }}
-        tag: {{ $dot.Values.mariadbOperator.galera.agentVersion }}
-        pullPolicy: IfNotPresent
+      image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ .Values.mariadbOperator.galera.agentImage }}:{{ $dot.Values.mariadbOperator.galera.agentVersion }}
+      imagePullPolicy: IfNotPresent
       port: 5555
       kubernetesAuth:
         enabled: true
@@ -274,16 +270,15 @@ spec:
       podRecoveryTimeout: 5m
       podSyncTimeout: 10m
     initContainer:
-      image:
-        repository: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}
-        tag: {{ $dot.Values.mariadbOperator.galera.initVersion }}
-        pullPolicy: IfNotPresent
+      image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}:{{ $dot.Values.mariadbOperator.galera.initVersion }}
+      imagePullPolicy: IfNotPresent
     volumeClaimTemplate:
       resources:
         requests:
           storage: 50Mi
       accessModes:
         - ReadWriteOnce
+  {{- end }}
   livenessProbe:
     exec:
       command:
@@ -334,11 +329,11 @@ spec:
   resources: {{ include "common.resources" . | nindent 4 }}
   volumeClaimTemplate:
     {{- if $dot.Values.mariadbOperator.storageClassName }}
-    storageClassName: {{ $dot.Values.k8ssandraOperator.persistence.storageClassName }}
+    storageClassName: {{ $dot.Values.mariadbOperator.storageClassName }}
     {{- end }}
     resources:
       requests:
-        storage: {{ $dot.Values.persistence.size | quote }}
+        storage: {{ $dot.Values.mariadbOperator.persistence.size | quote }}
     accessModes:
       - ReadWriteOnce
 {{-  if $dot.Values.db.user }}

diff --git a/kubernetes/common/mariadb-galera/templates/service.yaml b/kubernetes/common/mariadb-galera/templates/service.yaml
index 2dea4e9..e1a9105 100644 (file)
--- a/kubernetes/common/mariadb-galera/templates/service.yaml
+++ b/kubernetes/common/mariadb-galera/templates/service.yaml
@@ -34,6 +34,10 @@ spec:
       app: {{ include "common.servicename" . }}
   portLevelMtls:
     '{{ .Values.service.internalPort }}':
+{{-     if .Values.mariadbOperator.galera.enabled }}
       mode: STRICT
+{{-     else }}
+      mode: DISABLE
+{{-     end }}
 {{-   end }}
 {{- end }}

diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index a749c09..1ad72e2 100644 (file)
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -57,12 +57,15 @@ secrets:
 mariadbOperator:
   image: mariadb
   appVersion: 11.1.2
+  persistence:
+    #storageClassName: default
+    size: 3Gi
   galera:
     enabled: true
     agentImage: mariadb-operator/agent
-    agentVersion: v0.0.2
+    agentVersion: v0.0.3
     initImage: mariadb-operator/init
-    initVersion: v0.0.5
+    initVersion: v0.0.6
 
 ## String to partially override common.names.fullname template (will maintain the release name)
 ##

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 1577514..e3c399f 100644 (file)
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -109,14 +109,14 @@ replicaCount: 1
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1.5Gi
     requests:
       cpu: 1
       memory: 1.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 3Gi
     requests:
       cpu: 2

diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index b6b072c..6eaeb35 100644 (file)
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -83,14 +83,14 @@ replicaCount: 1
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1
       memory: 2Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 4Gi
     requests:
       cpu: 2

diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index 4f0dfed..f3074c7 100644 (file)
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -88,14 +88,14 @@ replicaCount: 1
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 2Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
index 26bbd37..cb6e5f7 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@ -207,14 +207,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 2Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
index c482ea7..1328a24 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
@@ -81,14 +81,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 0.5Gi
     requests:
       cpu: 1
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 1Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
index 508a32e..e40b167 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
@@ -116,14 +116,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 2Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
index eaba37c..691a127 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
@@ -126,14 +126,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 2Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
index 17ef533..6994e30 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
@@ -136,14 +136,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 2Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
index 0dfbabf..aa2ac97 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-hv-ves-collector/values.yaml
@@ -206,7 +206,7 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
index 5576adf..ed6468a 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
@@ -116,14 +116,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 0.5Gi
     requests:
       cpu: 1
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 1Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
index 556da86..2079e6b 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ms-healthcheck/values.yaml
@@ -60,14 +60,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 0.5Gi
     requests:
       cpu: 1
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 1Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
index ab23b54..13c46cf 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
@@ -166,14 +166,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 2Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
index 7ae95b1..16fd772 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-prh/values.yaml
@@ -146,14 +146,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 3Gi
     requests:
       cpu: 0.5
       memory: 3Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 6Gi
     requests:
       cpu: 1

diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
index c628438..45e84b9 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
@@ -198,14 +198,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1
       memory: 2Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 4Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
index 477377d..2093c2c 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
@@ -207,14 +207,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 2Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
index 03db9a0..e0e84a5 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
@@ -161,14 +161,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index 1e61718..ab538fd 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@ -201,14 +201,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1.5Gi
     requests:
       cpu: 1
       memory: 1.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 3Gi
     requests:
       cpu: 2

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
index 2cf7e19..295fcfe 100644 (file)
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
@@ -53,17 +53,17 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 0.5Gi
     requests:
       cpu: 1
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 1Gi
     requests:
-      cpu: 1
+      cpu: 2
       memory: 1Gi
   unlimited: {}
 

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
index 5e654a9..9b85e7b 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
@@ -101,14 +101,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index da37a81..5d8c5e2 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -125,14 +125,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 958e29c..7361869 100644 (file)
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -96,14 +96,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 4Gi
     requests:
       cpu: 1
       memory: 2Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 8Gi
     requests:
       cpu: 2

diff --git a/kubernetes/helm/plugins/deploy/deploy.sh b/kubernetes/helm/plugins/deploy/deploy.sh
index 3b16bf3..f60a2d3 100755 (executable)
--- a/kubernetes/helm/plugins/deploy/deploy.sh
+++ b/kubernetes/helm/plugins/deploy/deploy.sh
@@ -296,8 +296,8 @@ deploy() {
         done
       fi
     done
-
-
+    # Disable delay
+    DELAY="false"
     for subchart in * ; do
       SUBCHART_OVERRIDES=$CACHE_SUBCHART_DIR/$subchart/subchart-overrides.yaml
 

diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index c0022be..3e26ad4 100644 (file)
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -108,14 +108,14 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index a6a0bd0..1b27247 100644 (file)
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -120,14 +120,14 @@ readiness:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/msb/components/kube2msb/values.yaml b/kubernetes/msb/components/kube2msb/values.yaml
index 50a09b1..508e67a 100644 (file)
--- a/kubernetes/msb/components/kube2msb/values.yaml
+++ b/kubernetes/msb/components/kube2msb/values.yaml
@@ -55,14 +55,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/msb/components/msb-consul/values.yaml b/kubernetes/msb/components/msb-consul/values.yaml
index bc200ea..98e23d9 100644 (file)
--- a/kubernetes/msb/components/msb-consul/values.yaml
+++ b/kubernetes/msb/components/msb-consul/values.yaml
@@ -69,14 +69,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/msb/components/msb-discovery/values.yaml b/kubernetes/msb/components/msb-discovery/values.yaml
index a6a32bb..556c925 100644 (file)
--- a/kubernetes/msb/components/msb-discovery/values.yaml
+++ b/kubernetes/msb/components/msb-discovery/values.yaml
@@ -69,14 +69,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/msb/components/msb-eag/values.yaml b/kubernetes/msb/components/msb-eag/values.yaml
index d66c4a8..d07ea3d 100644 (file)
--- a/kubernetes/msb/components/msb-eag/values.yaml
+++ b/kubernetes/msb/components/msb-eag/values.yaml
@@ -76,14 +76,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/msb/components/msb-iag/values.yaml b/kubernetes/msb/components/msb-iag/values.yaml
index 5c455d8..807419e 100644 (file)
--- a/kubernetes/msb/components/msb-iag/values.yaml
+++ b/kubernetes/msb/components/msb-iag/values.yaml
@@ -76,14 +76,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index a1f6527..b504733 100644 (file)
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -154,14 +154,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
index 6fa2a69..1dc9cf6 100755 (executable)
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
@@ -57,14 +57,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
index b569438..0f02693 100755 (executable)
--- a/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/values.yaml
@@ -45,14 +45,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
index 6c9ffde..d557f05 100755 (executable)
--- a/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-data/values.yaml
@@ -45,14 +45,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
index fd15206..812a4e6 100755 (executable)
--- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/values.yaml
@@ -45,14 +45,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
index 5395a74..31a065f 100755 (executable)
--- a/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/values.yaml
@@ -45,14 +45,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/oof/components/oof-has/values.yaml b/kubernetes/oof/components/oof-has/values.yaml
index 00d108d..2924ce8 100755 (executable)
--- a/kubernetes/oof/components/oof-has/values.yaml
+++ b/kubernetes/oof/components/oof-has/values.yaml
@@ -74,14 +74,14 @@ resources:
   small:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 4Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index 3388d8f..ddff8f4 100644 (file)
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -99,14 +99,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/platform/components/chartmuseum/values.yaml b/kubernetes/platform/components/chartmuseum/values.yaml
index 8d7c48d..de3892c 100644 (file)
--- a/kubernetes/platform/components/chartmuseum/values.yaml
+++ b/kubernetes/platform/components/chartmuseum/values.yaml
@@ -82,14 +82,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/platform/components/oom-cert-service/values.yaml b/kubernetes/platform/components/oom-cert-service/values.yaml
index 96b8518..c1a75ae 100644 (file)
--- a/kubernetes/platform/components/oom-cert-service/values.yaml
+++ b/kubernetes/platform/components/oom-cert-service/values.yaml
@@ -61,14 +61,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml
index 52c613f..b93e798 100755 (executable)
--- a/kubernetes/policy/components/policy-apex-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml
@@ -101,14 +101,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml
index 27d30e0..721cd35 100755 (executable)
--- a/kubernetes/policy/components/policy-api/values.yaml
+++ b/kubernetes/policy/components/policy-api/values.yaml
@@ -111,14 +111,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
index fcc907b..aeeb4d1 100755 (executable)
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
@@ -104,14 +104,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
index 74e00e4..646032e 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/values.yaml
@@ -94,14 +94,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

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 21def97..18f61fc 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
@@ -95,14 +95,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
index d6db600..5ae9d6b 100755 (executable)
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/values.yaml
@@ -94,14 +94,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.7Gi
     requests:
       cpu: 0.5
       memory: 0.7Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1.4Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
index a2eeb39..2de601e 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/values.yaml
@@ -115,14 +115,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
index 0dc7a39..96cb265 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
@@ -109,6 +109,9 @@ runtime:
         servers:
           - ${topicServer:message-router}
         {{ end }}
+  acmParameters:
+    toscaElementName: {{ .Values.customNaming.toscaElementName }}
+    toscaCompositionName: {{ .Values.customNaming.toscaCompositionName }}
 
 management:
   endpoints:

diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
index 34c128e..3b01e46 100644 (file)
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -129,14 +129,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1
@@ -156,3 +156,7 @@ readinessCheck:
 wait_for_job_container:
   containers:
     - '{{ include "common.release" . }}-policy-galera-config'
+
+customNaming:
+  toscaElementName: org.onap.policy.clamp.acm.AutomationCompositionElement
+  toscaCompositionName: org.onap.policy.clamp.acm.AutomationComposition
\ No newline at end of file

diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml
index 33483e1..48a05f1 100755 (executable)
--- a/kubernetes/policy/components/policy-distribution/values.yaml
+++ b/kubernetes/policy/components/policy-distribution/values.yaml
@@ -127,14 +127,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml
index d2f1630..3b4ad5c 100755 (executable)
--- a/kubernetes/policy/components/policy-drools-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml
@@ -157,14 +157,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.8Gi
     requests:
       cpu: 0.5
       memory: 0.8Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1.6Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-gui/values.yaml b/kubernetes/policy/components/policy-gui/values.yaml
index 607af49..b6bf2a9 100644 (file)
--- a/kubernetes/policy/components/policy-gui/values.yaml
+++ b/kubernetes/policy/components/policy-gui/values.yaml
@@ -109,14 +109,14 @@ serviceMesh:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.7Gi
     requests:
       cpu: 0.5
       memory: 0.7Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1.4Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml
index d52ff88..df2d679 100755 (executable)
--- a/kubernetes/policy/components/policy-pap/values.yaml
+++ b/kubernetes/policy/components/policy-pap/values.yaml
@@ -146,14 +146,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
index 4cebf4f..1f773dd 100755 (executable)
--- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml
@@ -131,14 +131,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 553f5ed..074a166 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -155,14 +155,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 3Gi
     requests:
       cpu: 0.5
       memory: 3Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 6Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index fa2453c..7c99757 100644 (file)
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -122,14 +122,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdc/components/sdc-helm-validator/values.yaml b/kubernetes/sdc/components/sdc-helm-validator/values.yaml
index 2c75b11..39f9a91 100644 (file)
--- a/kubernetes/sdc/components/sdc-helm-validator/values.yaml
+++ b/kubernetes/sdc/components/sdc-helm-validator/values.yaml
@@ -58,14 +58,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index 95babc6..81d6373 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -131,14 +131,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1.5Gi
     requests:
       cpu: 0.5
       memory: 1.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 3Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
index f3c8839..aedf620 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
@@ -130,14 +130,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
index 5a11c93..3c6645c 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
@@ -114,14 +114,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml
index db15a7a..51c6431 100644 (file)
--- a/kubernetes/sdnc/components/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml
@@ -124,14 +124,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
index cb778ae..ca6590d 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml
@@ -121,14 +121,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdnc/components/sdnc-prom/values.yaml b/kubernetes/sdnc/components/sdnc-prom/values.yaml
index 5b5026c..a1c0b1b 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-prom/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/values.yaml
@@ -96,14 +96,14 @@ ingress:
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml
index 18b3206..7913dd4 100644 (file)
--- a/kubernetes/sdnc/components/sdnc-web/values.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/values.yaml
@@ -93,14 +93,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 0.5Gi
     requests:
       cpu: 0.5
       memory: 0.5Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 1Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml
index 83d0e78..02bc047 100644 (file)
--- a/kubernetes/sdnc/components/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/values.yaml
@@ -144,14 +144,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 1Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 2Gi
     requests:
       cpu: 1

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 2c6abdd..1f21570 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -657,14 +657,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 4.7Gi
     requests:
       cpu: 1
       memory: 4.7Gi
   large:
     limits:
-      cpu: 999
+      cpu: 4
       memory: 9.4Gi
     requests:
       cpu: 2

diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 32074d9..c4e79df 100644 (file)
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -111,17 +111,17 @@ resources:
   small:
     requests:
       memory: 1Gi
-      cpu: 0.25
+      cpu: 0.5
     limits:
       memory: 4Gi
-      cpu: 999
+      cpu: 1
   large:
     requests:
       memory: 2Gi
-      cpu: 0.5
+      cpu: 1
     limits:
       memory: 8Gi
-      cpu: 999
+      cpu: 2
   unlimited: {}
 readinessProbe:
   port: 9091

diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index 0d5a0c4..80d5b67 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -136,14 +136,14 @@ resources:
   small:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 3Gi
       cpu: 0.5
   large:
     limits:
       memory: 6Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 6Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index 23a3b69..619ef03 100755 (executable)
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -100,14 +100,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 09e631a..3855c19 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -122,14 +122,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index 32171ba..2084bef 100644 (file)
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -113,17 +113,17 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 5Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
-      cpu: 4
+      cpu: 1
   unlimited: {}
 
 livenessProbe:

diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
index 0c02cb2..ca4e787 100755 (executable)
--- a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
@@ -87,14 +87,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
index e2816b0..f565eb0 100755 (executable)
--- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml
@@ -96,14 +96,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index c6a6f35..8e83734 100755 (executable)
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -121,14 +121,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index 24a171c..3ce43c6 100755 (executable)
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -103,14 +103,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 3258f8f..3b68a36 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -105,14 +105,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index 0ec56c0..5f02a85 100755 (executable)
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -96,14 +96,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index eea19df..77b94dd 100755 (executable)
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -107,14 +107,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index 1f0a18d..9542ab8 100755 (executable)
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -116,14 +116,14 @@ resources:
   small:
     limits:
       memory: 1.5Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1.5Gi
       cpu: 0.5
   large:
     limits:
       memory: 3Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 3Gi
       cpu: 1

diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
index e1d211c..183e7f6 100755 (executable)
--- a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
@@ -53,14 +53,14 @@ resources:
   small:
     limits:
       memory: 1Gi
-      cpu: 999
+      cpu: 1
     requests:
       memory: 1Gi
       cpu: 0.5
   large:
     limits:
       memory: 2Gi
-      cpu: 999
+      cpu: 2
     requests:
       memory: 2Gi
       cpu: 1

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index bf412e8..81cd1d9 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -549,14 +549,14 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 999
+      cpu: 1
       memory: 4Gi
     requests:
       cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 999
+      cpu: 2
       memory: 8Gi
     requests:
       cpu: 1

diff --git a/kubernetes/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml
index 421d93a..4071aa0 100644 (file)
--- a/kubernetes/strimzi/templates/strimzi-kafka.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml
@@ -81,6 +81,7 @@ spec:
       transaction.state.log.min.isr: {{ (eq 1.0 (.Values.replicaCount)) | ternary 1 (sub .Values.replicaCount 1) }}
       log.message.format.version: {{ .Values.config.kafkaVersion }}
       inter.broker.protocol.version: {{ .Values.config.kafkaVersion }}
+      auto.create.topics.enable: {{ .Values.config.autoCreateTopics }}
     storage:
       type: jbod
       volumes:

diff --git a/kubernetes/strimzi/values.yaml b/kubernetes/strimzi/values.yaml
index 95422db..bb22de7 100644 (file)
--- a/kubernetes/strimzi/values.yaml
+++ b/kubernetes/strimzi/values.yaml
@@ -39,6 +39,7 @@ config:
   advertizedPortBroker0: &advertizedPortBroker0 9000
   advertizedPortBroker1: &advertizedPortBroker1 9001
   advertizedPortBroker2: &advertizedPortBroker2 9002
+  autoCreateTopics: true
 
 persistence:
   enabled: &pvenabled true

diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 8cdda46..87756d6 100644 (file)
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -145,17 +145,17 @@ resources:
   small:
     limits:
       cpu: 1.5
-      memory: 350Mi
+      memory: 2Gi
     requests:
       cpu: 1
-      memory: 245Mi
+      memory: 1Gi
   large:
     limits:
       cpu: 2
-      memory: 500Mi
+      memory: 4Gi
     requests:
       cpu: 1
-      memory: 500Mi
+      memory: 2Gi
   unlimited: {}
 
 serviceAccount: