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 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 5f390ad..3b01e46 100644 (file)
--- 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 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