[MULTICLOUD] Uses new tpls for repos / images

This commit makes Multicloud 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: I34049a733bddc6faf7a68e4c768c447b6c2e34b1

2 files changed, 0 insertions, 87 deletions

diff --git a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json b/kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json
deleted file mode 100644
index 2ce2d8564b..0000000000
--- a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/config.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "name":"SDCDistributionGroup",
-    "restServerParameters":{
-        "host":"0.0.0.0",
-        "port":9014,
-        "userName":"healthcheck",
-        "password":"zb!XztG34",
-        "https":true
-    },
-    "receptionHandlerParameters":{
-        "SDCReceptionHandler":{
-            "receptionHandlerType":"SDC",
-            "receptionHandlerClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandler",
-        "receptionHandlerConfigurationName":"sdcConfiguration",
-            "pluginHandlerParameters":{
-                "artifactForwarders":{
-                    "PAPEngineForwarder":{
-                        "forwarderType":"PAPEngine",
-                        "forwarderClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarder",
-                        "forwarderConfigurationName": "k8sConfiguration"
-                    }
-                }
-            }
-        }
-    },
-    "receptionHandlerConfigurationParameters":{
-        "sdcConfiguration":{
-            "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
-            "parameters":{
-            "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:8443",
-                "messageBusAddress": [
-                    "message-router.{{ include "common.namespace" . }}"
-                 ],
-                "user": "multicloud",
-                "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
-                "pollingInterval":20,
-                "pollingTimeout":30,
-                "consumerId": "multicloud-k8s-id",
-                "artifactTypes": [
-                    "TOSCA_CSAR",
-                    "HEAT",
-                    "HEAT_ARTIFACT",
-                    "HEAT_ENV",
-                    "HEAT_NESTED",
-                    "HEAT_VOL",
-                    "OTHER",
-                    "VF_MODULES_METADATA",
-                    "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT",
-                    "HELM"
-                ],
-                "consumerGroup": "multicloud-k8s-group",
-                "environmentName": "AUTO",
-                "keystorePath": "null",
-                "keystorePassword": "null",
-                "activeserverTlsAuth": false,
-                "isFilterinEmptyResources": true,
-                "isUseHttpsWithDmaap": false
-            }
-        }
-    },
-    "artifactForwarderConfigurationParameters":{
-        "k8sConfiguration":{
-            "parameterClassName":"org.onap.policy.distribution.forwarding.k8s.K8sArtifactForwarderParameterGroup",
-            "parameters":{
-                "useHttps": true,
-                "hostname": "pdp",
-                "port": 8081,
-                "userName": "testpdp",
-                "password": "alpha123",
-                "clientAuth": "cHl0aG9uOnRlc3Q=",
-                "isManaged": true,
-                "pdpGroup": "default"
-            }
-        }
-    }
-}
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json b/kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json
deleted file mode 100644
index d6fa40d471..0000000000
--- a/kubernetes/multicloud/charts/multicloud-k8s/resources/config/k8sconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "ca-file": "/opt/multicloud/k8splugin/certs/root_ca.cer",
-    "server-cert": "/opt/multicloud/k8splugin/certs/multicloud-k8s.pub",
-    "server-key": "/opt/multicloud/k8splugin/certs/multicloud-k8s.pr",
-    "password": "c2VjcmV0bWFuYWdlbWVudHNlcnZpY2VzZWNyZXRwYXNzd29yZA==",
-
-    "database-type": "mongo",
-    "database-address": "multicloud-k8s-mongo",
-    "etcd-ip": "multicloud-k8s-etcd",
-    "plugin-dir": "/opt/multicloud/k8splugin/plugins"
-}
\ No newline at end of file