aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2019-03-18 16:30:47 +0000
committerBorislav Glozman <Borislav.Glozman@amdocs.com>2019-03-20 14:52:45 +0000
commit655708d5dba4b1c970fa7c1086914388339fbbb6 (patch)
tree2d3ccc1b0ec142401901e377a24bb31000b0b059 /kubernetes
parentfbb1fe94675ed76ae23e52a49d3eb2630b21f669 (diff)
Patchset 4: refinement per Borislav
Not sure what made this commit be separate. It is intended to be patchset 4 on https://gerrit.onap.org/r/#/c/82150/ But please merge them together. Change-Id: Ia4c2341e450f0e2910b3ae19becefb6e798e3ef6 Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-904
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/dmaap/Makefile6
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/.helmignore (renamed from kubernetes/dmaap/components/dbc/.helmignore)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/Chart.yaml (renamed from kubernetes/dmaap/components/dbc/Chart.yaml)2
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/README.md (renamed from kubernetes/dmaap/components/dbc/README.md)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/requirements.yaml (renamed from kubernetes/dmaap/components/dbc/requirements.yaml)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/config/buscontroller.env (renamed from kubernetes/dmaap/components/dbc/resources/config/buscontroller.env)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties (renamed from kubernetes/dmaap/components/dbc/resources/config/dmaapbc.properties)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/dcaeLocations/san-francisco.json (renamed from kubernetes/dmaap/components/dbc/resources/dcaeLocations/san-francisco.json)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json (renamed from kubernetes/dmaap/components/dbc/resources/dmaap/onap.json)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/mr_clusters/san-francisco.json (renamed from kubernetes/dmaap/components/dbc/resources/mr_clusters/san-francisco.json)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/NOTES.txt (renamed from kubernetes/dmaap/components/dbc/templates/NOTES.txt)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml (renamed from kubernetes/dmaap/components/dbc/templates/configmap.yaml)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml (renamed from kubernetes/dmaap/components/dbc/templates/deployment.yaml)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml (renamed from kubernetes/dmaap/components/dbc/templates/post-install-job.yaml)2
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/service.yaml (renamed from kubernetes/dmaap/components/dbc/templates/service.yaml)0
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/values.yaml (renamed from kubernetes/dmaap/components/dbc/values.yaml)0
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml2
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml5
-rw-r--r--kubernetes/dmaap/components/message-router/templates/post-install-job.yaml2
-rw-r--r--kubernetes/dmaap/requirements.yaml4
-rw-r--r--kubernetes/dmaap/values.yaml4
21 files changed, 11 insertions, 16 deletions
diff --git a/kubernetes/dmaap/Makefile b/kubernetes/dmaap/Makefile
index e952a2b632..3a1931121a 100644
--- a/kubernetes/dmaap/Makefile
+++ b/kubernetes/dmaap/Makefile
@@ -12,10 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-make-dmaap: make-dbc make-message-router make-dmaap-dr-node make-dmaap-dr-prov
+make-dmaap: make-dmaap-bc make-message-router make-dmaap-dr-node make-dmaap-dr-prov
-make-dbc:
- cd components && helm dep up dbc && helm lint dbc
+make-dmaap-bc:
+ cd components && helm dep up dmaap-bc && helm lint dmaap-bc
make-message-router:
cd components && helm dep up message-router && helm lint message-router
diff --git a/kubernetes/dmaap/components/dbc/.helmignore b/kubernetes/dmaap/components/dmaap-bc/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/dmaap/components/dbc/.helmignore
+++ b/kubernetes/dmaap/components/dmaap-bc/.helmignore
diff --git a/kubernetes/dmaap/components/dbc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index bd07b7a102..37862dcc67 100644
--- a/kubernetes/dmaap/components/dbc/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
@@ -15,5 +15,5 @@
apiVersion: v1
description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
-name: dbc
+name: dmaap-bc
version: 4.0.0
diff --git a/kubernetes/dmaap/components/dbc/README.md b/kubernetes/dmaap/components/dmaap-bc/README.md
index a799fd44dd..a799fd44dd 100644
--- a/kubernetes/dmaap/components/dbc/README.md
+++ b/kubernetes/dmaap/components/dmaap-bc/README.md
diff --git a/kubernetes/dmaap/components/dbc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
index 61c265fe64..61c265fe64 100644
--- a/kubernetes/dmaap/components/dbc/requirements.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
diff --git a/kubernetes/dmaap/components/dbc/resources/config/buscontroller.env b/kubernetes/dmaap/components/dmaap-bc/resources/config/buscontroller.env
index cde43f95b7..cde43f95b7 100644
--- a/kubernetes/dmaap/components/dbc/resources/config/buscontroller.env
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/config/buscontroller.env
diff --git a/kubernetes/dmaap/components/dbc/resources/config/dmaapbc.properties b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
index faa19c6f4d..faa19c6f4d 100644
--- a/kubernetes/dmaap/components/dbc/resources/config/dmaapbc.properties
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
diff --git a/kubernetes/dmaap/components/dbc/resources/dcaeLocations/san-francisco.json b/kubernetes/dmaap/components/dmaap-bc/resources/dcaeLocations/san-francisco.json
index ca1e740dd8..ca1e740dd8 100644
--- a/kubernetes/dmaap/components/dbc/resources/dcaeLocations/san-francisco.json
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/dcaeLocations/san-francisco.json
diff --git a/kubernetes/dmaap/components/dbc/resources/dmaap/onap.json b/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json
index 9099e046ed..9099e046ed 100644
--- a/kubernetes/dmaap/components/dbc/resources/dmaap/onap.json
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json
diff --git a/kubernetes/dmaap/components/dbc/resources/mr_clusters/san-francisco.json b/kubernetes/dmaap/components/dmaap-bc/resources/mr_clusters/san-francisco.json
index 9e732d2af8..9e732d2af8 100644
--- a/kubernetes/dmaap/components/dbc/resources/mr_clusters/san-francisco.json
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/mr_clusters/san-francisco.json
diff --git a/kubernetes/dmaap/components/dbc/templates/NOTES.txt b/kubernetes/dmaap/components/dmaap-bc/templates/NOTES.txt
index 050853cfa2..050853cfa2 100644
--- a/kubernetes/dmaap/components/dbc/templates/NOTES.txt
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/NOTES.txt
diff --git a/kubernetes/dmaap/components/dbc/templates/configmap.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
index 1066c946af..1066c946af 100644
--- a/kubernetes/dmaap/components/dbc/templates/configmap.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
diff --git a/kubernetes/dmaap/components/dbc/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
index 0ecdc1c0e8..0ecdc1c0e8 100644
--- a/kubernetes/dmaap/components/dbc/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
diff --git a/kubernetes/dmaap/components/dbc/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
index 1272c53695..02ad199e45 100644
--- a/kubernetes/dmaap/components/dbc/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
@@ -15,7 +15,7 @@ metadata:
spec:
template:
metadata:
- name: "{{.Release.Name}}"
+ name: {{ include "common.fullname" . }}
labels:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
diff --git a/kubernetes/dmaap/components/dbc/templates/service.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/service.yaml
index 4b51d44fa2..4b51d44fa2 100644
--- a/kubernetes/dmaap/components/dbc/templates/service.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/service.yaml
diff --git a/kubernetes/dmaap/components/dbc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
index 2d791df6c6..2d791df6c6 100644
--- a/kubernetes/dmaap/components/dbc/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
index c6fa76ce72..79c47a10d8 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
@@ -15,7 +15,7 @@ metadata:
spec:
template:
metadata:
- name: "{{.Release.Name}}"
+ name: {{ include "common.fullname" . }}
labels:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
index 1f7214f3ec..ceb9a04ce2 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
@@ -15,7 +15,7 @@ metadata:
spec:
template:
metadata:
- name: "{{.Release.Name}}"
+ name: {{ include "common.fullname" . }}
labels:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
@@ -59,9 +59,6 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
-# - name: {{ include "common.name" . }}-config
-# configMap:
-# name: {{ include "common.fullname" . }}-config
- name: {{ include "common.fullname" . }}-dbc-feeds
configMap:
name: {{ include "common.fullname" . }}-dbc-feeds
diff --git a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
index df840ce828..5637812437 100644
--- a/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
@@ -15,7 +15,7 @@ metadata:
spec:
template:
metadata:
- name: "{{.Release.Name}}"
+ name: {{ include "common.fullname" . }}
labels:
app.kubernetes.io/managed-by: {{.Release.Service | quote }}
app.kubernetes.io/instance: {{.Release.Name | quote }}
diff --git a/kubernetes/dmaap/requirements.yaml b/kubernetes/dmaap/requirements.yaml
index c330403612..cda78cf04f 100644
--- a/kubernetes/dmaap/requirements.yaml
+++ b/kubernetes/dmaap/requirements.yaml
@@ -21,9 +21,9 @@ dependencies:
version: ~4.x-0
repository: 'file://components/message-router'
condition: message-router.enabled
- - name: dbc
+ - name: dmaap-bc
version: ~4.x-0
- repository: 'file://components/dbc'
+ repository: 'file://components/dmaap-bc'
condition: dmaap-bus-controller.enabled
- name: dmaap-dr-node
version: ~4.x-0
diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index a077d183d5..02f0ac5399 100644
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -30,9 +30,7 @@ config:
message-router:
enabled: true
-dmaap-bus-controller:
- enabled: true
-dbc:
+dmaap-bc:
enabled: true
dmaap-dr-node:
enabled: true