From 6f048953ea3002a5b8d8b554580135276b72de50 Mon Sep 17 00:00:00 2001 From: JoeOLeary Date: Wed, 2 Oct 2019 15:25:11 +0100 Subject: Fix filter config as an object * Add use exisiting to DR feed * Add resource configuration * Add support for filter config as escaped JSON string Issue-ID: DCAEGEN2-1826 Change-Id: Ie4fe45e0443af8eb4d859e66609aa6cbffd0e920 Signed-off-by: JoeOLeary --- dpo/blueprints/k8s-pm-mapper.yaml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'dpo/blueprints/k8s-pm-mapper.yaml') diff --git a/dpo/blueprints/k8s-pm-mapper.yaml b/dpo/blueprints/k8s-pm-mapper.yaml index 1c9578f..c372618 100644 --- a/dpo/blueprints/k8s-pm-mapper.yaml +++ b/dpo/blueprints/k8s-pm-mapper.yaml @@ -29,7 +29,7 @@ inputs: filter: type: string description: PM Mapper filter on measInfo, measInfoId, measType, instanceId - default: '{ "filters":[]}' + default: "{ \"filters\":[] }" enable_http: type: boolean description: Option to turn on HTTP connections @@ -99,12 +99,25 @@ inputs: type: string description: DMAAP Message Router host port default: '3905' + cpu_limit: + type: string + default: '1000m' + cpu_request: + type: string + default: '1000m' + memory_limit: + type: string + default: '1024Mi' + memory_request: + type: string + default: '1024Mi' node_templates: pm-feed: type: ccsdk.nodes.Feed properties: feed_name: { get_input: feed_name } + useExisting: true pm-topic: type: ccsdk.nodes.Topic @@ -148,6 +161,13 @@ node_templates: dmaap_publisher: type: message_router dmaap_info: <> + resource_config: + limits: + cpu: { get_input: cpu_limit } + memory: { get_input: memory_limit } + requests: + cpu: { get_input: cpu_request } + memory: { get_input: memory_request } docker_config: healthcheck: endpoint: /healthcheck -- cgit 1.2.3-korg