[POMBA] Uses new tpls for repos / images

This commit makes Pomba chart to use the new generator for repositories and
images.
As new templates doesn't work well with "sub charts", we move also
subcharts to components folder.

Issue-ID: OOM-2364
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ib94d70d7eb0af5835774719851046ada0af96202

8 files changed, 0 insertions, 263 deletions

diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json
deleted file mode 100644
index 0927d98748..0000000000
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/analysis-config.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[{
-		"name": "whitespace_analyzer",
-		"description": "A standard whitespace analyzer.",
-		"behaviours": [
-			"Tokenize the text using white space characters as delimeters.",
-			"Convert all characters to lower case.",
-			"Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents."
-		],
-		"tokenizer": "whitespace",
-		"filters": [
-			"lowercase",
-			"asciifolding"
-		]
-	},
-	{
-		"name": "ngram_analyzer",
-		"description": "An analyzer which performs ngram filtering on the data stream.",
-		"behaviours": [
-			"Tokenize the text using white space characters as delimeters.",
-			"Convert all characters to lower case.",
-			"Convert all alphanumeric and symbolic Unicode characters above the first 127 ASCII characters into their ASCII equivalents.",
-			"Apply ngram filtering using the following values for minimum and maximum size in codepoints of a single n-gram: minimum = 1, maximum = 2."
-		],
-		"tokenizer": "whitespace",
-		"filters": [
-			"lowercase",
-			"asciifolding",
-			"ngram_filter"
-		]
-	}
-]
\ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json
deleted file mode 100644
index 00a6de5f4a..0000000000
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/search_policy.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "roles": [{
-    "name": "admin",
-    "functions": [{
-      "name": "search",
-      "methods": [{
-          "name": "GET"
-        },
-        {
-          "name": "DELETE"
-        },
-        {
-          "name": "PUT"
-        },
-        {
-          "name": "POST"
-        }
-      ]
-    }],
-    "users": [{
-      "username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"
-    }]
-  }]
-}
\ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/tomcat_keystore b/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/tomcat_keystore
deleted file mode 100644
index 9eec841aa2..0000000000
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/auth/tomcat_keystore
+++ /dev/null
diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json
deleted file mode 100644
index 0bd8686f85..0000000000
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/dynamic-custom-template.json
+++ /dev/null
@@ -1,10 +0,0 @@
-"dynamic_templates": [{
-    "strings": {
-        "match_mapping_type": "string",
-        "match": "*",
-        "mapping": {
-            "type": "text",
-            "fielddata": true
-        }
-    }
-}],
\ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties b/kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties
deleted file mode 100644
index a42eb427bb..0000000000
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/elastic-search.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-{{/*
-# ElasticSearch Configuration
-*/}}
-
-es.cluster-name=POMBA_ES
-es.ip-address=pomba-es.{{.Release.Namespace}}
-es.http-port={{.Values.config.elasticsearchHttpPort}}
diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json
deleted file mode 100644
index 58ed8f6428..0000000000
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/es-payload-translation.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "attr-translations": [       
-    {
-      "query": "$..[?(@.type=='string' && @.index=='analyzed')]",
-      "update": {"type": "text", "index": true, "fielddata": true}
-    },
-    {
-      "query": "$..[?(@.type=='string' && @.index=='not_analyzed')]",
-      "update": {"type": "keyword", "index": true}
-    },
-    {
-      "query": "$..[?(@.type=='string' && !@.index)]",
-      "update": {"type": "text", "fielddata": true}
-    }
-  ]
-}
\ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json b/kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json
deleted file mode 100644
index 5f9120e889..0000000000
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/filter-config.json
+++ /dev/null
@@ -1,5 +0,0 @@
-[{
-	"name": "ngram_filter",
-	"description": "Custom NGram Filter.",
-	"configuration": " \"type\": \"nGram\", \"min_gram\": 1, \"max_gram\": 50, \"token_chars\": [ \"letter\", \"digit\", \"punctuation\", \"symbol\" ]"
-}]
\ No newline at end of file
diff --git a/kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml b/kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml
deleted file mode 100644
index f84d1bbbb0..0000000000
--- a/kubernetes/pomba/charts/pomba-search-data/resources/config/log/logback.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<configuration scan="true" scanPeriod="3 seconds" debug="false">
-        <!--<jmxConfigurator /> -->
-        <!-- directory path for all other type logs -->
-
-        <property name="logDir" value="/var/log/onap" />
-
-
-        <!--  specify the component name
-                       <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC"  -->
-        <property name="componentName" value="AAI-SDB"></property>
-
-        <!--  default eelf log file names -->
-        <property name="generalLogName" value="error" />
-        <property name="metricsLogName" value="metrics" />
-        <property name="auditLogName" value="audit" />
-        <property name="debugLogName" value="debug" />
-
-        <property name="errorLogPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|SearchDataService|%mdc{PartnerName}|%logger||%.-5level|%msg%n" />
-        <property name="auditMetricPattern" value="%m%n" />
-
-        <property name="logDirectory" value="${logDir}/${componentName}" />
-
-        <!-- Example evaluator filter applied against console appender -->
-        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-                <encoder>
-                        <pattern>${errorLogPattern}</pattern>
-                </encoder>
-        </appender>
-
-        <!-- ============================================================================ -->
-        <!-- EELF Appenders -->
-        <!-- ============================================================================ -->
-
-        <!-- The EELFAppender is used to record events to the general application
-                      log -->
-
-        <appender name="EELF" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${logDirectory}/${generalLogName}.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                        <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip
-                        </fileNamePattern>
-                        <maxHistory>60</maxHistory>
-                </rollingPolicy>
-                <encoder>
-                        <pattern>${errorLogPattern}</pattern>
-                </encoder>
-        </appender>
-        <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
-                <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
-                <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-                        <level>INFO</level>
-                </filter>
-                <queueSize>256</queueSize>
-                <appender-ref ref="EELF" />
-        </appender>
-
-
-        <!-- EELF Audit Appender. This appender is used to record audit engine
-                      related logging events. The audit logger and appender are specializations
-         of the EELF application root logger and appender. This can be used to segregate
-         Policy engine events from other components, or it can be eliminated to record
-         these events as part of the application root log. -->
-
-        <appender name="EELFAudit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${logDirectory}/${auditLogName}.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                        <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip
-                        </fileNamePattern>
-                        <maxHistory>60</maxHistory>
-                </rollingPolicy>
-                <encoder>
-                        <pattern>${auditMetricPattern}</pattern>
-                </encoder>
-        </appender>
-        <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
-                <queueSize>256</queueSize>
-                <appender-ref ref="EELFAudit" />
-        </appender>
-
-        <appender name="EELFMetrics" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${logDirectory}/${metricsLogName}.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                        <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip
-                        </fileNamePattern>
-                        <maxHistory>60</maxHistory>
-                </rollingPolicy>
-                <encoder>
-                        <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
-                                              %msg%n"</pattern> -->
-                        <pattern>${auditMetricPattern}</pattern>
-                </encoder>
-        </appender>
-
-
-        <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
-                <queueSize>256</queueSize>
-                <appender-ref ref="EELFMetrics"/>
-        </appender>
-
-        <appender name="EELFDebug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                <file>${logDirectory}/${debugLogName}.log</file>
-                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-                        <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip
-                        </fileNamePattern>
-                        <maxHistory>60</maxHistory>
-                </rollingPolicy>
-                <encoder>
-                        <pattern>${errorLogPattern}</pattern>
-                </encoder>
-        </appender>
-
-        <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
-                <queueSize>256</queueSize>
-                <appender-ref ref="EELFDebug" />
-                <includeCallerData>false</includeCallerData>
-        </appender>
-
-
-        <!-- ============================================================================ -->
-        <!--  EELF loggers -->
-        <!-- ============================================================================ -->
-        <logger name="com.att.eelf" level="info" additivity="false">
-                <appender-ref ref="asyncEELF" />
-                <appender-ref ref="asyncEELFDebug" />
-        </logger>
-
-        <logger name="com.att.eelf.audit" level="info" additivity="false">
-                <appender-ref ref="asyncEELFAudit" />
-        </logger>
-        <logger name="com.att.eelf.metrics" level="info" additivity="false">
-                <appender-ref ref="asyncEELFMetrics" />
-        </logger>
-
-        <!-- Spring related loggers -->
-        <logger name="org.springframework" level="WARN" />
-        <logger name="org.springframework.beans" level="WARN" />
-        <logger name="org.springframework.web" level="WARN" />
-        <logger name="com.blog.spring.jms" level="WARN" />
-
-        <!-- SearchDB loggers -->
-        <logger name="org.openecomp.sa" level="INFO" />
-
-        <!-- Other Loggers that may help troubleshoot -->
-        <logger name="net.sf" level="WARN" />
-        <logger name="org.apache.commons.httpclient" level="WARN" />
-        <logger name="org.apache.commons" level="WARN" />
-        <logger name="org.apache.coyote" level="WARN" />
-        <logger name="org.apache.jasper" level="WARN" />
-
-        <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging.
-                      May aid in troubleshooting) -->
-        <logger name="org.apache.camel" level="WARN" />
-        <logger name="org.apache.cxf" level="WARN" />
-        <logger name="org.apache.camel.processor.interceptor" level="WARN" />
-        <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
-        <logger name="org.apache.cxf.service" level="WARN" />
-        <logger name="org.restlet" level="WARN" />
-        <logger name="org.apache.camel.component.restlet" level="WARN" />
-
-        <!-- logback internals logging -->
-        <logger name="ch.qos.logback.classic" level="WARN" />
-        <logger name="ch.qos.logback.core" level="WARN" />
-
-        <root>
-                <appender-ref ref="asyncEELF" />
-                <appender-ref ref="STDOUT" />
-                <!-- <appender-ref ref="asyncEELFDebug" /> -->
-        </root>
-
-</configuration>