Integration w common/postgres

Patchset 1: first cut at integration with common/postgres

Patchset 2: Mandeep Khinda - refactored charts to standardize
            Wired in shared postgres chart

Patchset 6: Introduced simple dmaap/Makefile to force
            helm dep up in the deeper charts directory.
            Includes slight modification to parent make clean target
Patchset 8: merge conflict again

Change-Id: If59f08638bac8761ae5452b60f172c99fcf4ec86
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Issue-ID: DMAAP-117
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>

1 files changed, 1 insertions, 92 deletions

diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index f6c49842a4..76f0383f2e 100644
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -24,95 +24,4 @@ global:
   loggingImage: beats/filebeat:5.5.0
   postgresDatabase: dmaap
   postgresUser: dmaap_admin
-  postgresPassword: onapdemodb
-  nsPrefix: onap
-
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-#nsPrefix: onap
-pullPolicy: Always
-
-# application images
-repository: nexus3.onap.org:10001
-
-image:
-  buscontrollerImage: onap/dmaap/buscontroller
-  buscontrollerVersion: 1.0.5
-
-
-# application configuration
-# Example:
-config:
-#  username: myusername
-#  password: mypassword
-dmaapMessageRouterService: dmaap
-aafURL: https://onap-aaf:8905/proxy/
-topicMgrUser: m23456@dmaapbc.onap.org
-topicMgrPwd: onapdemo
-adminUser: m12345@dmaapbc.onap.org
-adminPwd: onapdemo
-
-
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-
-buscontroller:
-  service: prov-api
-  type: NodePort
-  name: buscontroller
-  httpExternalPort: 8080
-  httpsExternalPort: 8443
-  httpPort: 42
-  httpsPort: 43
-# default number of instances
-  replicas: 1
-# flag to enable debugging - application support required
-  debugEnabled: false
-
-service:
-  #Example service definition with external, internal and node ports.
-  #Services may use any combination of ports depending on the 'type' of
-  #service being defined.
-  type: NodePort
-  name: <onap-app>
-  externalPort: <8080>
-  internalPort: <80>
-  nodePort: <replace with unused node port suffix eg. 23>
-
-ingress:
-  enabled: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: 2
-#    memory: 4Gi
-#  requests:
-#    cpu: 2
-#    memory: 4Gi
+  postgresPassword: onapdemodb
\ No newline at end of file