From 655708d5dba4b1c970fa7c1086914388339fbbb6 Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Mon, 18 Mar 2019 16:30:47 +0000 Subject: [PATCH] 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 Issue-ID: DMAAP-904 --- kubernetes/dmaap/Makefile | 6 +++--- kubernetes/dmaap/components/{dbc => dmaap-bc}/.helmignore | 0 kubernetes/dmaap/components/{dbc => dmaap-bc}/Chart.yaml | 2 +- kubernetes/dmaap/components/{dbc => dmaap-bc}/README.md | 0 kubernetes/dmaap/components/{dbc => dmaap-bc}/requirements.yaml | 0 .../components/{dbc => dmaap-bc}/resources/config/buscontroller.env | 0 .../{dbc => dmaap-bc}/resources/config/dmaapbc.properties | 0 .../{dbc => dmaap-bc}/resources/dcaeLocations/san-francisco.json | 0 .../dmaap/components/{dbc => dmaap-bc}/resources/dmaap/onap.json | 0 .../{dbc => dmaap-bc}/resources/mr_clusters/san-francisco.json | 0 kubernetes/dmaap/components/{dbc => dmaap-bc}/templates/NOTES.txt | 0 .../dmaap/components/{dbc => dmaap-bc}/templates/configmap.yaml | 0 .../dmaap/components/{dbc => dmaap-bc}/templates/deployment.yaml | 0 .../components/{dbc => dmaap-bc}/templates/post-install-job.yaml | 2 +- .../dmaap/components/{dbc => dmaap-bc}/templates/service.yaml | 0 kubernetes/dmaap/components/{dbc => dmaap-bc}/values.yaml | 0 .../dmaap/components/dmaap-dr-node/templates/post-install-job.yaml | 2 +- .../dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml | 5 +---- .../dmaap/components/message-router/templates/post-install-job.yaml | 2 +- kubernetes/dmaap/requirements.yaml | 4 ++-- kubernetes/dmaap/values.yaml | 4 +--- 21 files changed, 11 insertions(+), 16 deletions(-) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/.helmignore (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/Chart.yaml (98%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/README.md (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/requirements.yaml (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/resources/config/buscontroller.env (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/resources/config/dmaapbc.properties (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/resources/dcaeLocations/san-francisco.json (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/resources/dmaap/onap.json (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/resources/mr_clusters/san-francisco.json (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/templates/NOTES.txt (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/templates/configmap.yaml (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/templates/deployment.yaml (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/templates/post-install-job.yaml (98%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/templates/service.yaml (100%) rename kubernetes/dmaap/components/{dbc => dmaap-bc}/values.yaml (100%) 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/.helmignore rename to kubernetes/dmaap/components/dmaap-bc/.helmignore diff --git a/kubernetes/dmaap/components/dbc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml similarity index 98% rename from kubernetes/dmaap/components/dbc/Chart.yaml rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/README.md rename to kubernetes/dmaap/components/dmaap-bc/README.md diff --git a/kubernetes/dmaap/components/dbc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml similarity index 100% rename from kubernetes/dmaap/components/dbc/requirements.yaml rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/resources/config/buscontroller.env rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/resources/config/dmaapbc.properties rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/resources/dcaeLocations/san-francisco.json rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/resources/dmaap/onap.json rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/resources/mr_clusters/san-francisco.json rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/templates/NOTES.txt rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/templates/configmap.yaml rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/templates/deployment.yaml rename to 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 similarity index 98% rename from kubernetes/dmaap/components/dbc/templates/post-install-job.yaml rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/templates/service.yaml rename to 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 similarity index 100% rename from kubernetes/dmaap/components/dbc/values.yaml rename to 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 -- 2.16.6