From 1ba2b2560856dae9f921745ca1298bb19ea57a96 Mon Sep 17 00:00:00 2001 From: Dominic Lunanuova Date: Mon, 30 Apr 2018 19:01:31 +0000 Subject: Merge message-router chart under dmaap Borislav: Fixed Makefile and renamed charts. Also cosmetic fixes. Includes corrections for the service name of MR used by dbc to be "message-router", which matches the message-router chart Patchset 2: standardize abbreviation for bus-controller to be "dbc" Patchset 3: correct references in README to match what is deployed Patchset 4: blew previous commit. Also added dmaap/Makefile lint step Change-Id: I36c07c7c1200f8e23ae12bd7357a5626346dcccd Signed-off-by: Dominic Lunanuova Issue-ID: DMAAP-386 Signed-off-by: Dominic Lunanuova --- .../dmaap-bus-controller/templates/NOTES.txt | 14 ++++++++++++ .../dmaap/charts/dmaap-bus-controller/values.yaml | 26 +++++++++++++--------- 2 files changed, 30 insertions(+), 10 deletions(-) (limited to 'kubernetes/dmaap/charts/dmaap-bus-controller') diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/NOTES.txt b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/NOTES.txt index fbab5a3758..254c6bf2a2 100644 --- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/NOTES.txt +++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/NOTES.txt @@ -1,3 +1,17 @@ +# Copyright © 2018 AT&T Intellectual Property. 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. + 1. Get the application URL by running these commands: {{- if .Values.ingress.enabled }} {{- range .Values.ingress.hosts }} diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml index 14b23e5084..2b4067d886 100644 --- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml +++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml @@ -36,8 +36,8 @@ image: onap/dmaap/buscontroller:1.0.8 # application configuration -dmaapMessageRouterService: dmaap -aafURL: https://onap-aaf:8905/proxy/ +dmaapMessageRouterService: message-router +aafURL: https://aaf-authz/ topicMgrUser: m23456@dmaapbc.onap.org topicMgrPwd: onapdemo adminUser: m12345@dmaapbc.onap.org @@ -61,32 +61,38 @@ readiness: service: - type: ClusterIP + type: NodePort name: dmaap-bc + portName: dmaap-bc + portName2: dmaap-bc externalPort: 8080 internalPort: 8080 externalPort2: 8443 internalPort2: 8443 + nodePort: 41 + nodePort2: 42 # application configuration override for postgres postgres: - nameOverride: dbcl-db + nameOverride: dbc-pg service: - name: dbcl-postgres - name2: dbcl-pg-primary - name3: dbcl-pg-replica + name: dbc-postgres + name2: dbc-pg-primary + name3: dbc-pg-replica container: name: - primary: dbcl-pg-primary - replica: dbcl-pg-replica + primary: dbc-pg-primary + replica: dbc-pg-replica config: pgUserName: dmaap_admin pgDatabase: dmaap pgPrimaryPassword: onapdemodb pgUserPassword: onapdemodb pgRootPassword: onapdemodb - + persistence: + mountSubPath: dbc/data + mountInitPath: dbc ingress: enabled: false -- cgit 1.2.3-korg