[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

6 files changed, 3 insertions, 182 deletions

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/components/dcae-ves-openapi-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
deleted file mode 100644
index 3065b57a85..0000000000
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/Chart.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-#============LICENSE_START========================================================
-# ================================================================================
-# Copyright (c) 2021 Nokia. All rights reserved.
-# Modifications Copyright © 2021 Orange
-# Modifications Copyright © 2021 Nordix Foundation
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-
-apiVersion: v2
-description: ONAP DCAE VES OpenApi Manager
-name: dcae-ves-openapi-manager
-version: 10.0.0
-
-dependencies:
-  - name: common
-    version: ~10.x-0
-    repository: '@local'
-  - name: repositoryGenerator
-    version: ~10.x-0
-    repository: '@local'
-  - name: readinessCheck
-    version: ~10.x-0
-    repository: '@local'
-  - name: serviceAccount
-    version: ~10.x-0
-    repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml
deleted file mode 100644
index 1c6e3593ac..0000000000
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/templates/deployment.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-{{/*
-#============LICENSE_START========================================================
-# ================================================================================
-# Copyright (c) 2021 Nokia. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-*/}}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
-spec:
-  replicas: 1
-  selector: {{- include "common.selectors" . | nindent 4 }}
-  template:
-    metadata: {{- include "common.templateMetadata" . | nindent 6 }}
-    spec:
-      initContainers:
-      {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
-      containers:
-        - name: {{ include "common.name" . }}
-          image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          resources: {{ include "common.resources" . | nindent 12 }}
-          ports: {{ include "common.containerPorts" . | nindent 12 }}
-          # disable liveness probe when breakpoints set in debugger
-          # so K8s doesn't restart unresponsive container
-          {{- if eq .Values.liveness.enabled true }}
-          livenessProbe:
-            httpGet:
-              path: {{ .Values.liveness.path }}
-              port: {{ .Values.liveness.port }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.liveness.periodSeconds }}
-          {{ end }}
-          env:
-            - name: ASDC_ADDRESS
-              value: {{ .Values.externalServices.sdc_be_https }}
-            - name: SCHEMA_MAP_PATH
-              value: {{ .Values.schemaMap.directory }}/{{ .Values.schemaMap.filename }}
-          volumeMounts:
-            - name: schema-map
-              mountPath: {{ .Values.schemaMap.directory }}
-      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
-      volumes:
-        - name: schema-map
-          configMap:
-            name: {{ include "common.release" . }}-dcae-external-repo-configmap-schema-map
-            defaultMode: 0755
-            items:
-              - key: {{ .Values.schemaMap.filename }}
-                path: {{ .Values.schemaMap.filename }}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/values.yaml b/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/values.yaml
deleted file mode 100644
index 873579ee97..0000000000
--- a/kubernetes/dcaegen2/components/dcae-ves-openapi-manager/values.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-#============LICENSE_START========================================================
-#=================================================================================
-# Copyright (c) 2021 Nokia. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-
-# Global values
-global:
-  pullPolicy: Always
-image: onap/org.onap.dcaegen2.platform.ves-openapi-manager:1.0.1
-containerPort: &svc_port 8080
-
-service:
-  ports:
-    - name: &port http
-      port: *svc_port
-
-externalServices:
-  sdc_be_https: "sdc-be:8443"
-
-schemaMap:
-  filename: "schema-map.json"
-  directory: "/app/mappings"
-
-liveness:
-  initialDelaySeconds: 30
-  periodSeconds: 30
-  path: /health
-  port: *port
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  # liveness not desirable for Cloudify Manager container
-  enabled: true
-
-readinessCheck:
-  wait_for:
-  - message-router
-  - sdc-be
-
-flavor: small
-resources:
-  small:
-    limits:
-      cpu: 1
-      memory: 1Gi
-    requests:
-      cpu: 1
-      memory: 512Mi
-  large:
-    limits:
-      cpu: 2
-      memory: 2Gi
-    requests:
-      cpu: 1
-      memory: 1Gi
-  unlimited: {}
-
-#Pods Service Account
-serviceAccount:
-  nameOverride: dcae-ves-openapi-manager
-  roles:
-    - read
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
+