summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorJack Lucas <jflos@sonoris.net>2022-01-11 12:57:19 -0500
committerJack Lucas <jflos@sonoris.net>2022-01-12 12:27:35 -0500
commitc1aa16001293e9ef6c36127c55b47e887f5f9250 (patch)
tree2d84c48ff606658b71960edb64013139713971ea /kubernetes
parent98b40be0f580491e015b0c1c33debfccb40a404f (diff)
[DCAEGEN2] Move ves-openapi-manager to dcaegen2-services
In preparation for disabling the entire dcaegen2 chart tree later in the Jakarta release cycling, move the dcae-ves-openapi-manager chart from dcaegen2 to dcaegen2-services. Add dcae-ves-openapi-manager to the list of components to be healthchecked as part of dcaegen2-services. Issue-ID: DCAEGEN2-2968 Signed-off-by: Jack Lucas <jflos@sonoris.net> Change-Id: I2fcc55ba0a8af7f249454f98a8d4749138a76948
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/dcaegen2-services/Chart.yaml4
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/Chart.yaml (renamed from kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml)0
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/templates/deployment.yaml (renamed from kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml)0
-rw-r--r--kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml (renamed from kubernetes/dcaegen2/components/dcae-ves-openapi-manager/values.yaml)0
-rw-r--r--kubernetes/dcaegen2-services/resources/expected-components.json2
-rw-r--r--kubernetes/dcaegen2-services/values.yaml3
-rw-r--r--kubernetes/dcaegen2/Chart.yaml5
-rw-r--r--kubernetes/dcaegen2/resources/expected-components.json2
-rw-r--r--kubernetes/dcaegen2/values.yaml3
9 files changed, 10 insertions, 9 deletions
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
index 3065b57a85..3065b57a85 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
+++ b/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
index 1c6e3593ac..1c6e3593ac 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml
+++ b/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
index 873579ee97..873579ee97 100644
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/values.yaml
+++ b/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
+