Patchset 4: refinement per Borislav 00/82600/3
authordglFromAtt <dgl@research.att.com>
Mon, 18 Mar 2019 16:30:47 +0000 (16:30 +0000)
committerBorislav Glozman <Borislav.Glozman@amdocs.com>
Wed, 20 Mar 2019 14:52:45 +0000 (14:52 +0000)
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

21 files changed:
kubernetes/dmaap/Makefile
kubernetes/dmaap/components/dmaap-bc/.helmignore [moved from kubernetes/dmaap/components/dbc/.helmignore with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/Chart.yaml [moved from kubernetes/dmaap/components/dbc/Chart.yaml with 98% similarity]
kubernetes/dmaap/components/dmaap-bc/README.md [moved from kubernetes/dmaap/components/dbc/README.md with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/requirements.yaml [moved from kubernetes/dmaap/components/dbc/requirements.yaml with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/resources/config/buscontroller.env [moved from kubernetes/dmaap/components/dbc/resources/config/buscontroller.env with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties [moved from kubernetes/dmaap/components/dbc/resources/config/dmaapbc.properties with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/resources/dcaeLocations/san-francisco.json [moved from kubernetes/dmaap/components/dbc/resources/dcaeLocations/san-francisco.json with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/resources/dmaap/onap.json [moved from kubernetes/dmaap/components/dbc/resources/dmaap/onap.json with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/resources/mr_clusters/san-francisco.json [moved from kubernetes/dmaap/components/dbc/resources/mr_clusters/san-francisco.json with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/templates/NOTES.txt [moved from kubernetes/dmaap/components/dbc/templates/NOTES.txt with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml [moved from kubernetes/dmaap/components/dbc/templates/configmap.yaml with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml [moved from kubernetes/dmaap/components/dbc/templates/deployment.yaml with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml [moved from kubernetes/dmaap/components/dbc/templates/post-install-job.yaml with 98% similarity]
kubernetes/dmaap/components/dmaap-bc/templates/service.yaml [moved from kubernetes/dmaap/components/dbc/templates/service.yaml with 100% similarity]
kubernetes/dmaap/components/dmaap-bc/values.yaml [moved from kubernetes/dmaap/components/dbc/values.yaml with 100% similarity]
kubernetes/dmaap/components/dmaap-dr-node/templates/post-install-job.yaml
kubernetes/dmaap/components/dmaap-dr-prov/templates/post-install-job.yaml
kubernetes/dmaap/components/message-router/templates/post-install-job.yaml
kubernetes/dmaap/requirements.yaml
kubernetes/dmaap/values.yaml

index e952a2b..3a19311 100644 (file)
 # 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
similarity index 98%
rename from kubernetes/dmaap/components/dbc/Chart.yaml
rename to kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index bd07b7a..37862dc 100644 (file)
@@ -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
@@ -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 }}
index c6fa76c..79c47a1 100644 (file)
@@ -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 }}
index 1f7214f..ceb9a04 100644 (file)
@@ -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
index df840ce..5637812 100644 (file)
@@ -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 }}
index c330403..cda78cf 100644 (file)
@@ -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
index a077d18..02f0ac5 100644 (file)
@@ -30,9 +30,7 @@ config:
 
 message-router:
   enabled: true
-dmaap-bus-controller:
-  enabled: true
-dbc:
+dmaap-bc:
   enabled: true
 dmaap-dr-node:
   enabled: true