[DCAEGEN2] Updates for R10
By default, disable all dcaegen2 components except
config-binding-service, healthcheck,
and ves-openapi-manager.
Fix DNS name for the ONAP consul instance.
Move mongodb dependency from dcae-bootstrap to dcae-tcagen2.
Fix the generation of the JSON list of expected components for the
healthcheck services. (Previously could have a spurious leading
",")
Update healthcheck-container version to 2.3.0 for
logging enhancements and updated base image.
Issue-ID: DCAEGEN2-2968
Issue-ID: DCAEGEN2-2958
Issue-ID: DCAEGEN2-2983
Signed-off-by: Jack Lucas <jflos@sonoris.net>
Change-Id: I4bcce1d3e43e2e5c7cc2c3179870de72b55d5d2e
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
index 4dcaff6..aa47c66 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml
@@ -27,9 +27,6 @@
version: ~9.x-0
repository: '@local'
alias: postgres
- - name: mongo
- version: ~9.x-0
- repository: '@local'
- name: repositoryGenerator
version: ~9.x-0
repository: '@local'
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
index b012ee4..5b568c6 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
@@ -89,20 +89,6 @@
mountSubPath: dcae/data
mountInitPath: dcae
-mongo:
- nameOverride: dcae-mongo
- config:
- dbName: dcaecommondb
- service:
- name: dcae-mongohost
- internalPort: 27017
- nfsprovisionerPrefix: dcaemongo
- sdnctlPrefix: tcagen2
- persistence:
- mountSubPath: dcae/mongo/data
- enabled: true
- disableNfsProvisioner: true
-
# application image
image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:3.3.5
default_k8s_location: central
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
index c7e1d70..171fc7c 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
@@ -2,6 +2,7 @@
#============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2021 J. F. Lucas. 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.
@@ -106,7 +107,7 @@
mountPath: /opt/tls
env:
- name: CONSUL_HOST
- value: consul.{{ include "common.namespace" . }}
+ value: consul-server-ui.{{ include "common.namespace" . }}
- name: USE_HTTPS
value: "1"
- name: HTTPS_CERT_PATH
@@ -154,7 +155,7 @@
mountPath: /opt/logs
env:
- name: CONSUL_HOST
- value: consul.{{ include "common.namespace" . }}
+ value: consul-server-ui.{{ include "common.namespace" . }}
- name: {{ include "common.name" . }}-fb-onap-i
image: {{ include "repositoryGenerator.image.logging" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
index 1c6cff0..8134e0d 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
@@ -42,7 +42,7 @@
initialDelaySeconds: 10
periodSeconds: 10
# application image
-image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.2.0
+image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.3.0
# Resource Limit flavor -By Default using small
flavor: small