From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 19 Jan 2022 07:10:51 +0000 (+0000)
Subject: Merge "[DCAEGEN2] Move ves-openapi-manager to dcaegen2-services"
X-Git-Tag: 10.0.0~142
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0df88b139440c5bb2f0e46e5195bc2455554dc4d;hp=bc5844e278f6a27eb8797f7c2f5b1c27853553d2;p=oom.git

Merge "[DCAEGEN2] Move ves-openapi-manager to dcaegen2-services"
---

diff --git a/kubernetes/dcaegen2-services/Chart.yaml b/kubernetes/dcaegen2-services/Chart.yaml
index 609d78b6f4..4710acc2b3 100644
--- a/kubernetes/dcaegen2-services/Chart.yaml
+++ b/kubernetes/dcaegen2-services/Chart.yaml
@@ -103,3 +103,7 @@ dependencies:
     version: ~10.x-0
     repository: '@local'
     condition: dcae-ves-mapper.enabled
+  - name: dcae-ves-openapi-manager
+    version: ~10.x-0
+    repository: 'file://components/dcae-ves-openapi-manager'
+    condition: dcae-ves-openapi-manager.enabled
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
similarity index 100%
rename from kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
rename to kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/deployment.yaml
similarity index 100%
rename from kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml
rename to kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/deployment.yaml
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
similarity index 100%
rename from kubernetes/dcaegen2/components/dcae-ves-openapi-manager/values.yaml
rename to kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
diff --git a/kubernetes/dcaegen2-services/resources/expected-components.json b/kubernetes/dcaegen2-services/resources/expected-components.json
index f654ac8dc3..7c4c3fba4c 100644
--- a/kubernetes/dcaegen2-services/resources/expected-components.json
+++ b/kubernetes/dcaegen2-services/resources/expected-components.json
@@ -40,7 +40,7 @@
 */}}
 
 {{- $ctx := . -}}
-{{- $components := list "dcae-hv-ves-collector" "dcae-prh" "dcae-tcagen2" "dcae-ves-collector" -}}
+{{- $components := list "dcae-hv-ves-collector" "dcae-prh" "dcae-tcagen2" "dcae-ves-collector" "dcae-ves-openapi-manager" -}}
 {{- $enabled := dict "enabled" list -}}
 {{- range $components -}}
   {{- if index $ctx.Values . "enabled" -}}
diff --git a/kubernetes/dcaegen2-services/values.yaml b/kubernetes/dcaegen2-services/values.yaml
index 7db369c43f..5334caced0 100644
--- a/kubernetes/dcaegen2-services/values.yaml
+++ b/kubernetes/dcaegen2-services/values.yaml
@@ -26,7 +26,8 @@ filebeatConfig:
   logstashPort: 5044
 
 # Control deployment of DCAE microservices at ONAP installation time
-
+dcae-ves-openapi-manager:
+  enabled: true
 dcae-bbs-eventprocessor-ms:
   enabled: false
   logConfigMapNamePrefix: '{{ include "common.release" . }}-dcaegen2-services'
diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml
index a14f9eef86..eb69410121 100644
--- a/kubernetes/dcaegen2/Chart.yaml
+++ b/kubernetes/dcaegen2/Chart.yaml
@@ -59,7 +59,4 @@ dependencies:
     version: ~10.x-0
     repository: 'file://components/dcae-dashboard'
     condition: dcae-dashboard.enabled
-  - name: dcae-ves-openapi-manager
-    version: ~10.x-0
-    repository: 'file://components/dcae-ves-openapi-manager'
-    condition: dcae-ves-openapi-manager.enabled
+
diff --git a/kubernetes/dcaegen2/resources/expected-components.json b/kubernetes/dcaegen2/resources/expected-components.json
index 50c31845e1..43125d6195 100644
--- a/kubernetes/dcaegen2/resources/expected-components.json
+++ b/kubernetes/dcaegen2/resources/expected-components.json
@@ -40,7 +40,7 @@
 */}}
 
 {{- $ctx := . -}}
-{{- $components := list "dcae-cloudify-manager" "dcae-config-binding-service" "dcae-dashboard" "dcae-deployment-handler" "dcae-inventory-api" "dcae-policy-handler" "dcae-servicechange-handler" "dcae-ves-openapi-manager" -}}
+{{- $components := list "dcae-cloudify-manager" "dcae-config-binding-service" "dcae-dashboard" "dcae-deployment-handler" "dcae-inventory-api" "dcae-policy-handler" "dcae-servicechange-handler" -}}
 {{- $enabled := dict "enabled" list -}}
 {{- range $components -}}
   {{- if index $ctx.Values . "enabled" -}}
diff --git a/kubernetes/dcaegen2/values.yaml b/kubernetes/dcaegen2/values.yaml
index 7ce58ba88b..2c276a7827 100644
--- a/kubernetes/dcaegen2/values.yaml
+++ b/kubernetes/dcaegen2/values.yaml
@@ -67,5 +67,4 @@ dcae-policy-handler:
     cloudifyManagerPasswordExternalSecret: *cmPassSecretName
 dcae-servicechange-handler:
   enabled: false
-dcae-ves-openapi-manager:
-  enabled: true
+