From: Micha? Jagie??o <michal.jagiello@t-mobile.pl>
Date: Wed, 25 Oct 2023 13:32:51 +0000 (+0000)
Subject: Merge "[SO][UUI] Adjust resource settings"
X-Git-Tag: 13.0.0-DOC
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=09ed93b87cb27864b0f1211799af3aaea8b63db7;hp=867602f80edce6d9cc47bb26f78a3a2787d8322f;p=oom.git

Merge "[SO][UUI] Adjust resource settings"
---

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 0dc7a39db0..96cb265567 100644
--- 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 5f390ad55b..3b01e46d78 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -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/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml
index 421d93a6cb..4071aa03a6 100644
--- 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 95422db91a..bb22de7ebd 100644
--- 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