[DMAAP] Remove AAF dependency

[oom.git] / kubernetes / dmaap / components / dmaap-bc / values.yaml

diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
index 9f4799b..1e23424 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-bc/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml
@@ -17,80 +17,87 @@
 # Global configuration defaults.
 #################################################################
 global:
-  nodePortPrefix: 302
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  persistence: {}
 
 #################################################################
-# Application configuration defaults.
+# Secrets metaconfig
 #################################################################
-pullPolicy: Always
+secrets:
+  - uid: pg-root-pass
+    name: &pgRootPassSecretName '{{ include "common.release" . }}-dmaap-bc-pg-root-pass'
+    type: password
+    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgRootPasswordExternalSecret) .) (hasSuffix "dmaap-bc-pg-root-pass" .Values.postgres.config.pgRootPasswordExternalSecret) }}'
+    password: '{{ .Values.postgres.config.pgRootpassword }}'
+    policy: generate
+  - uid: pg-user-creds
+    name: &pgUserCredsSecretName '{{ include "common.release" . }}-dmaap-bc-pg-user-creds'
+    type: basicAuth
+    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "dmaap-bc-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
+    login: '{{ .Values.postgres.config.pgUserName }}'
+    password: '{{ .Values.postgres.config.pgUserPassword }}'
+    passwordPolicy: generate
 
+#################################################################
+# Application configuration defaults.
+#################################################################
 # application images
-repository: nexus3.onap.org:10001
-image: onap/dmaap/dmaap-bc:1.1.5
+image: onap/dmaap/dmaap-bc:2.0.11
+pullPolicy: Always
 
+#DMaaP Bus Controller client image for provisioning at deploy time
+dbcClientImage: onap/dmaap/dbc-client:2.0.11
 
 # application configuration
-dmaapMessageRouterService: message-router
-
-# change the following value to point to Windriver instance maintained
-# by AAF team.
-# e.g.
-#aafURL: https://aaf-onap-test.osaaf.org:8095/proxy/
-aafURL: https://aaf-service:8100/
-aafLocateUrl: https://aaf-locate:8095
-topicMgrUser: dmaap-bc@dmaap-bc.onap.org
-topicMgrPwd: demo123456!
-adminUser: aaf_admin@people.osaaf.org
-adminPwd: demo123456!
-
-# for Casablanca default deployment, leave this true to
-# get a topic namespace that matches MR.  When set to false,
-# it will compose the topic namespace using the kubernetes namespace value
-fixedTopicNamespace: true
-
-# for quicker deployments in dev, ability to disable using postgres
-PG:
-  enabled: true
+dmaapMessageRouterService: &mr_name message-router
+dmaapDataRouterProvService: &dr_prov_name dmaap-dr-prov
+dmaapDataRouterNodeService: &dr_node_name dmaap-dr-node
 
 nodeSelector: {}
 
 affinity: {}
 
+containerPort: &svc_port 8080
+
+service:
+  type: ClusterIP
+  name: &svc_name dmaap-bc
+  ports:
+    - name: &port http
+      port: *svc_port
+
+ingress:
+  enabled: false
+  service:
+    - baseaddr: "dmaap-bc-api"
+      name: *svc_name
+      port: *svc_port
+  config:
+    ssl: "redirect"
+
 # 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: false
+  port: *svc_port
+  enabled: true
 
 readiness:
   initialDelaySeconds: 10
   periodSeconds: 10
+  port: *svc_port
 
+usePostgres: &use_pg true
 
-service:
-  type: NodePort
-  name: dmaap-bc
-  portName: dmaap-bc
-  portName2: dmaap-bc
-  externalPort: 8080
-  internalPort: 8080
-  externalPort2: 8443
-  internalPort2: 8443
-  nodePort: 41
-  nodePort2: 42
-
-
-# application configuration override for postgres
 postgres:
-  nameOverride: dbc-pg
+# For Dev deployments, use in memory DB
+# postgres
+#   enabled: false
+  enabled: true
+  nameOverride: &pg_name dbc-postgres
   service:
-    name: dbc-postgres
+    name: *pg_name
     name2: dbc-pg-primary
     name3: dbc-pg-replica
   container:
@@ -100,35 +107,15 @@ postgres:
   config:
     pgUserName: dmaap_admin
     pgDatabase: dmaap
-    pgPrimaryPassword: onapdemodb
-    pgUserPassword: onapdemodb
-    pgRootPassword: onapdemodb
+    pgUserExternalSecret: *pgUserCredsSecretName
+    pgRootPasswordExternalSecret: *pgRootPassSecretName
   persistence:
     mountSubPath: dbc/data
     mountInitPath: dbc
-  pgpool:
-    nameOverride: dbc-pgpool
-    service:
-      name: dbc-pgpool
-    credentials:
-      pgusername: dmaap_admin
-      pgpassword: onapdemodb
-    container:
-      name:
-        primary: dbc-pgpool-primary
-        replica: dbc-pgpool-replica
-
-ingress:
-  enabled: false
-  service:
-    - baseaddr: "dmaapbc"
-      name: "dmaap-bc"
-      port: 8443
-  config:
-    ssl: "redirect"
 
 # Resource Limit flavor -By Default using small
 flavor: small
+
 # Segregation for Different environment (Small and Large)
 resources:
   small:
@@ -146,3 +133,22 @@ resources:
       cpu: 2
       memory: 2Gi
   unlimited: {}
+
+securityContext:
+  user_id: 1000
+  group_id: 101
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: *svc_name
+  roles:
+    - read
+
+readinessCheck:
+  wait_for:
+    - *mr_name
+    - *dr_node_name
+
+wait_for_job_container:
+  containers:
+    - 'dmaap-provisioning-job'
\ No newline at end of file