summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INFO.yaml10
-rwxr-xr-xkubernetes/common/music/charts/music-tomcat/templates/deployment.yaml4
-rw-r--r--kubernetes/pomba/charts/pomba-contextaggregator/resources/bin/pre_start.sh2
-rwxr-xr-xkubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties)0
-rwxr-xr-xkubernetes/pomba/charts/pomba-contextaggregator/values.yaml2
5 files changed, 9 insertions, 9 deletions
diff --git a/INFO.yaml b/INFO.yaml
index d6393366e9..da3cd81e8b 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -63,11 +63,11 @@ committers:
company: 'ATT'
id: 'jh245g'
timezone: 'America/New York'
- - name: 'Mike Elliott'
- email: 'mike.elliott@amdocs.com'
- company: 'Amdocs'
- id: 'melliott'
- timezone: 'Canada/Ontario'
+ - name: 'David Sauvageau'
+ email: 'david.sauvageau@bell.ca'
+ company: 'Bell'
+ id: 'david.sauvageau'
+ timezone: 'Canada/Montreal'
- name: 'Mandeep Khinda'
email: 'Mandeep.Khinda@amdocs.com'
company: 'Amdocs'
diff --git a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
index 1fec55caca..2e04b15561 100755
--- a/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
+++ b/kubernetes/common/music/charts/music-tomcat/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
fieldPath: metadata.namespace
# War Container
- name: "{{ .Chart.Name }}-war"
- image: "{{ .Values.repository }}/{{ .Values.warImage }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.warImage }}"
command: ["cp","/app/MUSIC.war","/webapps"]
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
@@ -73,7 +73,7 @@ spec:
containers:
# Tomcat Container
- name: "{{ include "common.name" . }}"
- image: "{{ .Values.repository }}/{{ .Values.image }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/bin/pre_start.sh b/kubernetes/pomba/charts/pomba-contextaggregator/resources/bin/pre_start.sh
index 3ef1434f20..8a76cdd929 100644
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/bin/pre_start.sh
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/bin/pre_start.sh
@@ -18,7 +18,7 @@ do
else
# code if not found
echo "$i_topic NOT found."
- curl -X POST -H "content-type: application/json" --data "Empty post to create topic" http://$dmaap_mr_host:$dmaap_mr_port/events/$i_topic
+ curl -X POST -H "content-type: application/json" --data '{"event":"create topic"}' http://$dmaap_mr_host:$dmaap_mr_port/events/$i_topic
fi
done
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties
index f07cb65c31..f07cb65c31 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
index 9c9a6ff185..0ec43f5ecd 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
@@ -25,7 +25,7 @@ global:
# Application configuration defaults.
#################################################################
# application image
-image: onap/pomba-context-aggregator:1.3.2
+image: onap/pomba-context-aggregator:1.3.3
pullPolicy: Always
# flag to enable debugging - application support required