Code Review / oom.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | compact (merge: 6e7a799 2cef564)
Merge "[CDS] Add cps-data resourceSourceMapping in application.properties"
authorFiachra Corcoran <fiachra.corcoran@est.tech>
Wed, 6 Jul 2022 15:41:15 +0000 (15:41 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 6 Jul 2022 15:41:15 +0000 (15:41 +0000)
1  2 
kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties patch | diff1 | diff2 | blob | history
kubernetes/cds/components/cds-blueprints-processor/values.yaml patch | diff1 | diff2 | blob | history

diff --combined kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
index b6a3433,f02a84b..2818fd9
--- 1/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
--- 2/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/components/cds-blueprints-processor/resources/config/application.properties
@@@ -18,7 -18,7 +18,7 @@@
  ### START -Controller Blueprints Properties
  # Load Resource Source Mappings
  */}}
- resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability,rest=source-rest,vault-data=source-rest,script=source-capability
+ resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability,rest=source-rest,vault-data=source-rest,script=source-capability,cps-data=source-rest
  
  # Blueprint Processor File Execution and Handling Properties
  blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy
@@@ -101,21 -101,25 +101,29 @@@ blueprintsprocessor.restclient.sdnc.pas
  
  # AAI Data REST Client settings
  blueprintsprocessor.restclient.aai-data.type=basic-auth
 -blueprintsprocessor.restclient.aai-data.url=https://aai:8443
 +{{ if ( include "common.needTLS" .) }}
 +blueprintsprocessor.restclient.aai-data.url=https://{{ .Values.global.aaiData.ServiceName }}:8443
 +{{- else -}}
 +blueprintsprocessor.restclient.aai-data.url=http://{{ .Values.global.aaiData.ServiceName }}:{{ .Values.global.aaiData.ExternalPlainPort }}
 +{{- end }}
  blueprintsprocessor.restclient.aai-data.username=aai@aai.onap.org
  blueprintsprocessor.restclient.aai-data.password=demo123456!
  blueprintsprocessor.restclient.aai-data.additionalHeaders.X-TransactionId=cds-transaction-id
  blueprintsprocessor.restclient.aai-data.additionalHeaders.X-FromAppId=cds-app-id
  blueprintsprocessor.restclient.aai-data.additionalHeaders.Accept=application/json
  
+ # CPS Data
+ blueprintsprocessor.restclient.cps-data.type=basic-auth
+ blueprintsprocessor.restclient.cps-data.url=http://cps-core:8080
+ blueprintsprocessor.restclient.cps-data.username=${CPS_USER}
+ blueprintsprocessor.restclient.cps-data.password=${CPS_PASS_PLAIN}
+ blueprintsprocessor.restclient.cps-data.additionalHeaders.Accept=application/json
+ blueprintsprocessor.restclient.cps-data.additionalHeaders.Content-Type=application/json
+ 
  # Self Service Request Kafka Message Consumer
  blueprintsprocessor.messageconsumer.self-service-api.kafkaEnable={{ .Values.kafkaRequestConsumer.enabled  }}
  blueprintsprocessor.messageconsumer.self-service-api.type={{ .Values.kafkaRequestConsumer.type  }}
 -{{- if eq .Values.useStrimziKafka true }}
 +{{ if eq .Values.useStrimziKafka true }}
  blueprintsprocessor.messageconsumer.self-service-api.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
  {{- else -}}
  blueprintsprocessor.messageconsumer.self-service-api.bootstrapServers={{ .Values.kafkaRequestConsumer.bootstrapServers  }}
@@@ -124,7 -128,7 +132,7 @@@ blueprintsprocessor.messageconsumer.sel
  blueprintsprocessor.messageconsumer.self-service-api.topic={{ .Values.kafkaRequestConsumer.topic  }}
  blueprintsprocessor.messageconsumer.self-service-api.clientId={{ .Values.kafkaRequestConsumer.clientId  }}
  blueprintsprocessor.messageconsumer.self-service-api.pollMillSec={{ .Values.kafkaRequestConsumer.pollMillSec  }}
 -{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
 +{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
  # SCRAM
  blueprintsprocessor.messageconsumer.self-service-api.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
  blueprintsprocessor.messageconsumer.self-service-api.scramPassword=${JAAS_PASS}
@@@ -132,14 -136,14 +140,14 @@@
  
  # Self Service Response Kafka Message Producer
  blueprintsprocessor.messageproducer.self-service-api.type={{ .Values.kafkaRequestProducer.type  }}
 -{{- if eq .Values.useStrimziKafka true }}
 +{{ if eq .Values.useStrimziKafka true }}
  blueprintsprocessor.messageproducer.self-service-api.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
  {{- else -}}
  blueprintsprocessor.messageproducer.self-service-api.bootstrapServers={{ .Values.kafkaRequestProducer.bootstrapServers  }}
  {{- end }}
  blueprintsprocessor.messageproducer.self-service-api.clientId={{ .Values.kafkaRequestProducer.clientId }}
  blueprintsprocessor.messageproducer.self-service-api.topic={{ .Values.kafkaRequestProducer.topic }}
 -{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
 +{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
  # SCRAM
  blueprintsprocessor.messageproducer.self-service-api.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
  blueprintsprocessor.messageproducer.self-service-api.scramPassword=${JAAS_PASS}
@@@ -150,14 -154,14 +158,14 @@@
  ## Audit request
  blueprintsprocessor.messageproducer.self-service-api.audit.kafkaEnable={{ .Values.kafkaAuditRequest.enabled }}
  blueprintsprocessor.messageproducer.self-service-api.audit.request.type={{ .Values.kafkaAuditRequest.type }}
 -{{- if eq .Values.useStrimziKafka true }}
 +{{ if eq .Values.useStrimziKafka true }}
  blueprintsprocessor.messageproducer.self-service-api.audit.request.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
  {{- else -}}
  blueprintsprocessor.messageproducer.self-service-api.audit.request.bootstrapServers={{ .Values.kafkaAuditRequest.bootstrapServers  }}
  {{- end }}
  blueprintsprocessor.messageproducer.self-service-api.audit.request.clientId={{ .Values.kafkaAuditRequest.clientId }}
  blueprintsprocessor.messageproducer.self-service-api.audit.request.topic={{ .Values.kafkaAuditRequest.topic }}
 -{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
 +{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
  # SCRAM
  blueprintsprocessor.messageproducer.self-service-api.audit.request.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
  blueprintsprocessor.messageproducer.self-service-api.audit.request.scramPassword=${JAAS_PASS}
@@@ -165,14 -169,14 +173,14 @@@
  
  ## Audit response
  blueprintsprocessor.messageproducer.self-service-api.audit.response.type={{ .Values.kafkaAuditResponse.type }}
 -{{- if eq .Values.useStrimziKafka true }}
 +{{ if eq .Values.useStrimziKafka true }}
  blueprintsprocessor.messageproducer.self-service-api.audit.response.bootstrapServers={{ include "common.release" . }}-strimzi-kafka-bootstrap:9092
  {{- else -}}
  blueprintsprocessor.messageproducer.self-service-api.audit.response.bootstrapServers={{ .Values.kafkaAuditRequest.bootstrapServers  }}
  {{- end }}
  blueprintsprocessor.messageproducer.self-service-api.audit.response.clientId={{ .Values.kafkaAuditResponse.clientId }}
  blueprintsprocessor.messageproducer.self-service-api.audit.response.topic={{ .Values.kafkaAuditResponse.topic }}
 -{{- if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
 +{{ if and (eq .Values.kafkaRequestConsumer.type "kafka-scram-plain-text-auth") (eq .Values.useStrimziKafka true) }}
  # SCRAM
  blueprintsprocessor.messageproducer.self-service-api.audit.response.scramUsername={{ include "common.release" . }}-{{ .Values.cdsKafkaUser }}
  blueprintsprocessor.messageproducer.self-service-api.audit.response.scramPassword=${JAAS_PASS}
@@@ -198,7 -202,7 +206,7 @@@ endpoints.user.name=eHbVUbJAj4AG2522cSb
  endpoints.user.password=eHbVUbJAj4AG2522cSbrOQ==
  
  #BaseUrls for health check blueprint processor services
 -blueprintprocessor.healthcheck.baseUrl=http://localhost:8080/
 +blueprintprocessor.healthcheck.baseUrl=http://cds-blueprints-processor-http:8080/
  blueprintprocessor.healthcheck.mapping-service-name-with-service-link=[Execution service,/api/v1/execution-service/health-check],[Resources service,/api/v1/resources/health-check],[Template service,/api/v1/template/health-check]
  
  #BaseUrls for health check Cds Listener services
diff --combined kubernetes/cds/components/cds-blueprints-processor/values.yaml
index c2745ca,7591a85..023bf49
--- 1/kubernetes/cds/components/cds-blueprints-processor/values.yaml
--- 2/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@@ -28,17 -28,10 +28,17 @@@ global
    persistence:
      mountPath: /dockerdata-nfs
  
 -  #This configuration specifies Service and port for SDNC OAM interface
 +  # This configuration specifies Service and port for SDNC OAM interface
    sdncOamService: sdnc-oam
    sdncOamPort: 8282
  
 +  # This concerns CDS/AAI communication through HTTP when TLS is not being needed
 +  # Port value should match the one in aai/values.yml : service.externalPlainPort
 +  aaiData:
 +    ExternalPlainPort: 80 # when TLS is not needed
 +    ServiceName: aai  # domain
 +    # http://aai:80 or https://aai:443
 +
    #AAF is enabled by default
    #aafEnabled: true
  
@@@ -72,6 -65,12 +72,12 @@@ secrets
        - name: password
          value: '{{ .Values.config.someConfig }}'
          policy: generate
+   - uid: cps-creds
+     type: basicAuth
+     externalSecret: '{{ tpl (default "" .Values.config.cps.cpsUserExternalSecret) . }}'
+     login: '{{ .Values.config.cps.cpsUsername }}'
+     password: '{{ .Values.config.cps.cpsPassword }}'
+     passwordPolicy: required
  
  #################################################################
  # AAF part
@@@ -115,7 -114,7 +121,7 @@@ config
      dbService: mariadb-galera
      dbPort: 3306
      dbName: sdnctl
 -    #dbRootPass: Custom root password
 +    # dbRootPass: Custom root password
      dbRootPassExternalSecret: '{{ include "common.mariadb.secret.rootPassSecretName" ( dict "dot" . "chartName" .Values.config.sdncDB.dbService ) }}'
    cdsDB:
      dbServer: cds-db
@@@ -127,6 -126,10 +133,10 @@@
      # dbRootPassword: password
      # dbRootPassExternalSecret
    someConfig: blah
+   cps:
+     cpsUsername: ''
+     cpsPassword: ''
+     cpsUserExternalSecret: '{{ include "common.release" . }}-cps-core-app-user-creds'
  
  # default number of instances
  replicaCount: 1
@@@ -177,12 -180,12 +187,12 @@@ startup
    periodSeconds: 10
  
  liveness:
 -  initialDelaySeconds: 0
 +  initialDelaySeconds: 1
    periodSeconds: 20
 -  timeoutSeconds: 20
 +  timeoutSeconds: 30
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
 -  enabled: true
 +  enabled: false
  
  readiness:
    initialDelaySeconds: 120
@@@ -192,17 -195,17 +202,17 @@@
  service:
    http:
      type: ClusterIP
 -    portName: blueprints-processor-http
 +    portName: http
      internalPort: 8080
      externalPort: 8080
    grpc:
      type: ClusterIP
 -    portName: blueprints-processor-grpc
 +    portName: grpc
      internalPort: 9111
      externalPort: 9111
    cluster:
      type: ClusterIP
 -    portName: blueprints-processor-cluster
 +    portName: tcp-cluster
      internalPort: 5701
      externalPort: 5701
  
@@@ -230,8 -233,8 +240,8 @@@ ingress
      - baseaddr: "blueprintsprocessorhttp"
        name: "cds-blueprints-processor-http"
        port: 8080
 -  config:
 -    ssl: "none"
 +      config:
 +        ssl: "none"
  
  logback:
    rootLogLevel: INFO
Introduces the ONAP Platform OOM (ONAP Operations Manager) to efficiently Deploy, Manage, Operate the ONAP platform and its components (e.g. MSO, DCAE, SDC, etc.) and infrastructure (VMs, Containers).