summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/buscontroller.env13
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json10
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml13
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml10
4 files changed, 21 insertions, 25 deletions
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/buscontroller.env b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/buscontroller.env
index 2a801f0ffe..cde43f95b7 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/buscontroller.env
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/config/buscontroller.env
@@ -12,17 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# Environment settings for starting a container
DMAAPBC_WAIT_TO_EXIT=Y
-DMAAPBC_PG_ENABLED=true
-# Need to connect to PG primary service, designated by service.name2
-DMAAPBC_PGHOST={{ .Values.postgres.service.name2 }}
-DMAAPBC_PGDBNAME={{ .Values.postgres.config.pgDatabase }}
-DMAAPBC_PGCRED={{ .Values.postgres.config.pgUserPassword }}
-DMAAPBC_PGUSER={{ .Values.postgres.config.pgUserName }}
-DMAAPBC_MR_CNAME={{ .Values.dmaapMessageRouterService }}
-DMAAPBC_AAF_URL={{ .Values.aafURL }}
-DMAAPBC_TOPICMGR_USER={{ .Values.topicMgrUser }}
-DMAAPBC_TOPICMGR_PWD={{ .Values.topicMgrPwd }}
-DMAAPBC_ADMIN_USER={{ .Values.adminUser }}
-DMAAPBC_ADMIN_PWD={{ .Values.adminPwd }}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json
index e8073474b1..411d7f41e1 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json
@@ -3,6 +3,14 @@
"feedVersion": "m1.1",
"feedDescription": "Default feed provisioned for PM File collector",
"asprClassification" : "unclassified",
- "owner": "onap"
+ "owner": "onap",
+ "pubs": [
+ {
+ "dcaeLocationName" : "san-francisco",
+ "username": "dradmin",
+ "userpwd": "dradmin"
+ }
+
+ ]
}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index 20265e017e..8ef03d43a9 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
@@ -50,9 +50,6 @@ spec:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- envFrom:
- - configMapRef:
- name: {{ include "common.fullname" . }}-config
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
@@ -62,7 +59,7 @@ spec:
port: {{ .Values.service.internalPort }}
path: /webapi/info
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.liveness.periodSeconds }}
+ periodSeconds: {{ .Values.liveness.periodSeconds }}
readinessProbe:
httpGet:
port: {{ .Values.service.internalPort }}
@@ -74,11 +71,13 @@ spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
+
+# NOTE: on the following several configMaps, careful to include / at end
+# since there may be more than one file in each mountPath
- name: {{ include "common.name" . }}-config
- mountPath: /opt/app/config/conf
- subPath: buscontroller.env
+ mountPath: /opt/app/config/conf/
-# NOTE: the basename of the subdirectory specified in mountPath is important - it matches the DBCL API URI
+# NOTE: the basename of the subdirectory is important - it matches the DBCL API URI
- name: {{ include "common.name" . }}-dmaap
mountPath: /opt/app/config/dmaap/
- name: {{ include "common.name" . }}-dcaelocations
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
index 39ecb8f8ac..372e1e45a2 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
@@ -31,16 +31,16 @@ pullPolicy: Always
# application images
repository: nexus3.onap.org:10001
-image: onap/dmaap/buscontroller:1.0.20
+image: onap/dmaap/buscontroller:1.0.22
# application configuration
dmaapMessageRouterService: message-router
aafURL: https://aaf-authz/
-topicMgrUser: m23456@dmaapbc.onap.org
-topicMgrPwd: onapdemo
-adminUser: m12345@dmaapbc.onap.org
-adminPwd: onapdemo
+topicMgrUser: dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org
+topicMgrPwd: demo123456!
+adminUser: aaf_admin@people.osaaf.org
+adminPwd: demo123456!
nodeSelector: {}