From 7c0f04b760da0d724f365175a0046e9568541012 Mon Sep 17 00:00:00 2001 From: Jerome Doucerain Date: Sat, 17 Mar 2018 14:18:41 -0400 Subject: AAI parameterization added parameter for the AAI_CORE version added parameterized persisted storage location Issue-ID: OOM-734 Change-Id: Iefe3d89ae6d001754251e0f5ce2735c9a920bcd5 Signed-off-by: Jerome Doucerain --- .../aai/templates/aai-resources-deployment.yaml | 3 ++- .../aai/templates/aai-traversal-deployment.yaml | 3 ++- .../aai/templates/data-router-deployment.yaml | 3 ++- .../aai/templates/elasticsearch-deployment.yaml | 3 ++- kubernetes/aai/templates/hbase-deployment.yaml | 3 ++- kubernetes/aai/values.yaml | 23 ++++++++++++++++++++++ 6 files changed, 33 insertions(+), 5 deletions(-) diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml index cd4412dbfc..332b89045b 100644 --- a/kubernetes/aai/templates/aai-resources-deployment.yaml +++ b/kubernetes/aai/templates/aai-resources-deployment.yaml @@ -435,7 +435,7 @@ spec: - name: AAI_CHEF_ENV value: simpledemo - name: AAI_CORE_VERSION - value: 1.1.0-SNAPSHOT + value: {{ .Values.aaicoreversion }} - name: AAI_CHEF_LOC value: /var/chef/aai-data/environments - name: CHEF_GIT_URL @@ -498,3 +498,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml index 2445e1e716..f039d0f332 100644 --- a/kubernetes/aai/templates/aai-traversal-deployment.yaml +++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml @@ -267,7 +267,7 @@ spec: - name: AAI_CHEF_ENV value: simpledemo - name: AAI_CORE_VERSION - value: 1.1.0-SNAPSHOT + value: {{ .Values.aaicoreversion }} - name: AAI_CHEF_LOC value: /var/chef/aai-data/environments - name: CHEF_GIT_URL @@ -330,3 +330,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml index 37b9fb411c..b1cb834eeb 100644 --- a/kubernetes/aai/templates/data-router-deployment.yaml +++ b/kubernetes/aai/templates/data-router-deployment.yaml @@ -136,8 +136,9 @@ spec: name: aai-data-router-dynamic-configmap - name: aai-data-router-logs hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs" + path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/data-router/logs restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml index 902f31ef60..a07db04566 100644 --- a/kubernetes/aai/templates/elasticsearch-deployment.yaml +++ b/kubernetes/aai/templates/elasticsearch-deployment.yaml @@ -81,7 +81,8 @@ spec: name: aai-elasticsearch-configmap - name: elasticsearch-data hostPath: - path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/elasticsearch/data" + path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/elasticsearch/data imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml index 08c2ee3734..62b017db29 100644 --- a/kubernetes/aai/templates/hbase-deployment.yaml +++ b/kubernetes/aai/templates/hbase-deployment.yaml @@ -56,10 +56,11 @@ spec: volumes: - name: hbase-data hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/hbase + path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/aai/hbase - name: localtime hostPath: path: /etc/localtime imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml index 93a0c3ee65..e283cb6f2e 100644 --- a/kubernetes/aai/values.yaml +++ b/kubernetes/aai/values.yaml @@ -51,3 +51,26 @@ image: gremlinServerImage: aaionap/gremlin-server filebeat: docker.elastic.co/beats/filebeat:5.5.0 es_bb: busybox +aaicoreversion: 1.1.0-SNAPSHOT +persistence: + enabled: true + + ## A manually managed Persistent Volume and Claim + ## Requires persistence.enabled: true + ## If defined, PVC must be created manually before volume will be bound + # existingClaim: + volumeReclaimPolicy: Retain + + ## database data Persistent Volume Storage Class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + ## + # storageClass: "-" + accessMode: ReadWriteMany + size: 2Gi + mountPath: /dockerdata-nfs + mountSubPath: aai/data-router/logs + -- cgit 1.2.3-korg From d18576bc9bb956b1ef8cbc042cede2e864aefc51 Mon Sep 17 00:00:00 2001 From: Jerome Doucerain Date: Sat, 17 Mar 2018 14:21:42 -0400 Subject: Message-router parameterization added configmap added primer for zookeeper and kafka Issue-ID: OOM-731 Change-Id: I423294a57faa28beb95578a117ee02accc67a4b3 Signed-off-by: Jerome Doucerain --- .../resources/config/dmaap/MsgRtrApi.properties | 141 +++++++++++++++++++++ .../resources/config/dmaap/cadi.properties | 21 +++ .../message-router/resources/config/dmaap/mykey | 27 ++++ .../message-router/templates/dmaap-configmap.yaml | 23 ++++ .../templates/message-router-dmaap.yaml | 16 ++- .../templates/message-router-kafka.yaml | 12 ++ .../templates/message-router-zookeeper.yaml | 13 ++ kubernetes/message-router/values.yaml | 2 + 8 files changed, 249 insertions(+), 6 deletions(-) create mode 100755 kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties create mode 100755 kubernetes/message-router/resources/config/dmaap/cadi.properties create mode 100755 kubernetes/message-router/resources/config/dmaap/mykey create mode 100644 kubernetes/message-router/templates/dmaap-configmap.yaml diff --git a/kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties b/kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties new file mode 100755 index 0000000000..568d0d4ce0 --- /dev/null +++ b/kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties @@ -0,0 +1,141 @@ +############################################################################### +## +## Cambria API Server config +## +## - Default values are shown as commented settings. +## + +############################################################################### +## +## HTTP service +## +## - 3904 is standard as of 7/29/14. +# +## Zookeeper Connection +## +## Both Cambria and Kafka make use of Zookeeper. +## +# config.zk.servers=zookeeper.namespace-placeholder:2181 +config.zk.servers=zookeeper:2181 +#config.zk.servers=172.17.0.1:2181 +#dmaap.namespace-placeholder:2181 +#10.208.128.229:2181 +#config.zk.root=/fe3c/cambria/config + + +############################################################################### +## +## Kafka Connection +## +## Items below are passed through to Kafka's producer and consumer +## configurations (after removing "kafka.") +## if you want to change request.required.acks it can take this one value +#kafka.metadata.broker.list=localhost:9092,localhost:9093 +kafka.metadata.broker.list=global-kafka:9092 +#kafka.metadata.broker.list=172.17.0.1:9092 +#dmaap.namespace-placeholder:9092 +#10.208.128.229:9092 +##kafka.request.required.acks=-1 +#kafka.client.zookeeper=${config.zk.servers} +consumer.timeout.ms=100 +zookeeper.connection.timeout.ms=6000 +zookeeper.session.timeout.ms=6000 +zookeeper.sync.time.ms=2000 +auto.commit.interval.ms=1000 +fetch.message.max.bytes =1000000 +auto.commit.enable=false + + +############################################################################### +## +## Secured Config +## +## Some data stored in the config system is sensitive -- API keys and secrets, +## for example. to protect it, we use an encryption layer for this section +## of the config. +## +## The key is a base64 encode AES key. This must be created/configured for +## each installation. +#cambria.secureConfig.key= +## +## The initialization vector is a 16 byte value specific to the secured store. +## This must be created/configured for each installation. +#cambria.secureConfig.iv= + +## Southfield Sandbox +cambria.secureConfig.key=b/7ouTn9FfEw2PQwL0ov/Q== +cambria.secureConfig.iv=wR9xP5k5vbz/xD0LmtqQLw== +authentication.adminSecret=fe3cCompound +#cambria.secureConfig.key[pc569h]=YT3XPyxEmKCTLI2NK+Sjbw== +#cambria.secureConfig.iv[pc569h]=rMm2jhR3yVnU+u2V9Ugu3Q== + + +############################################################################### +## +## Consumer Caching +## +## Kafka expects live connections from the consumer to the broker, which +## obviously doesn't work over connectionless HTTP requests. The Cambria +## server proxies HTTP requests into Kafka consumer sessions that are kept +## around for later re-use. Not doing so is costly for setup per request, +## which would substantially impact a high volume consumer's performance. +## +## This complicates Cambria server failover, because we often need server +## A to close its connection before server B brings up the replacement. +## + +## The consumer cache is normally enabled. +#cambria.consumer.cache.enabled=true + +## Cached consumers are cleaned up after a period of disuse. The server inspects +## consumers every sweepFreqSeconds and will clean up any connections that are +## dormant for touchFreqMs. +#cambria.consumer.cache.sweepFreqSeconds=15 +#cambria.consumer.cache.touchFreqMs=120000 + +## The cache is managed through ZK. The default value for the ZK connection +## string is the same as config.zk.servers. +#cambria.consumer.cache.zkConnect=${config.zk.servers} + +## +## Shared cache information is associated with this node's name. The default +## name is the hostname plus the HTTP service port this host runs on. (The +## hostname is determined via InetAddress.getLocalHost ().getCanonicalHostName(), +## which is not always adequate.) You can set this value explicitly here. +## +#cambria.api.node.identifier= + +############################################################################### +## +## Metrics Reporting +## +## This server can report its metrics periodically on a topic. +## +#metrics.send.cambria.enabled=true +#metrics.send.cambria.topic=cambria.apinode.metrics #msgrtr.apinode.metrics.dmaap +#metrics.send.cambria.sendEverySeconds=60 + +cambria.consumer.cache.zkBasePath=/fe3c/cambria/consumerCache + +############################################################################## +#100mb +maxcontentlength=10000 + + +############################################################################## +#AAF Properties +msgRtr.namespace.aaf=org.openecomp.dcae.dmaap.mtnje2.mr.topic +msgRtr.topicfactory.aaf=org.openecomp.dcae.dmaap.topicFactory|:org.openecomp.dcae.dmaap.mtnje2.mr.topic: +enforced.topic.name.AAF=org.openecomp +forceAAF=false +transidUEBtopicreqd=false +defaultNSforUEB=org.openecomp.dmaap.mr.ueb +############################################################################## +#Mirror Maker Agent +msgRtr.mirrormakeradmin.aaf=org.openecomp.dmaap.mr.dev.mirrormaker|*|admin +msgRtr.mirrormakeruser.aaf=org.openecomp.dmaap.mr.dev.mirrormaker|*|user +msgRtr.mirrormakeruser.aaf.create=org.openecomp.dmaap.mr.dev.topicFactory|:org.openecomp.dmaap.mr.dev.topic: +msgRtr.mirrormaker.timeout=15000 +msgRtr.mirrormaker.topic=org.openecomp.dmaap.mr.prod.mm.agent +msgRtr.mirrormaker.consumergroup=mmagentserver +msgRtr.mirrormaker.consumerid=1 diff --git a/kubernetes/message-router/resources/config/dmaap/cadi.properties b/kubernetes/message-router/resources/config/dmaap/cadi.properties new file mode 100755 index 0000000000..1cb00a5cda --- /dev/null +++ b/kubernetes/message-router/resources/config/dmaap/cadi.properties @@ -0,0 +1,21 @@ +basic_realm=openecomp.org +basic_warn=TRUE + +cadi_loglevel=DEBUG +#cadi_keyfile=target/swm/package/nix/dist_files/appl/${artifactId}/etc/keyfile2 +cadi_keyfile=/appl/dmaapMR1/etc/keyfile +# Configure AAF +aaf_url=https://DME2RESOLVE/service=org.openecomp.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE + +aaf_id=dgl@openecomp.org +aaf_password=enc:f2u5br1mh29M02- +aaf_timeout=5000 +aaf_clean_interval=1200000 +aaf_user_expires=60000 +aaf_high_count=1000000 + + +# The following properties are being set by the AJSC Container and should NOT need to be set here. +AFT_LATITUDE=33.823589 +AFT_LONGITUDE=-84.366982 +AFT_ENVIRONMENT=AFTUAT diff --git a/kubernetes/message-router/resources/config/dmaap/mykey b/kubernetes/message-router/resources/config/dmaap/mykey new file mode 100755 index 0000000000..c2b8b8779b --- /dev/null +++ b/kubernetes/message-router/resources/config/dmaap/mykey @@ -0,0 +1,27 @@ +_sNOLphPzrU7L0L3oWv0pYwgV_ddGF1XoBsQEIAp34jfP-fGJFPfFYaMpDEZ3gwH59rNw6qyMZHk +k-4irklvVcWk36lC3twNvc0DueRCVrws1bkuhOLCXdxHJx-YG-1xM8EJfRmzh79WPlPkbAdyPmFF +Ah44V0GjAnInPOFZA6MHP9rNx9B9qECHRfmvzU13vJCcgTsrmOr-CEiWfRsnzPjsICxpq9OaVT_D +zn6rNaroGm1OiZNCrCgvRkCUHPOOCw3j9G1GeaImoZNYtozbz9u4sj13PU-MxIIAa64b1bMMMjpz +Upc8lVPI4FnJKg6axMmEGn5zJ6JUq9mtOVyPj__2GEuDgpx5H4AwodXXVjFsVgR8UJwI_BvS2JVp +JoQk0J1RqXmAXVamlsMAfzmmbARXgmrBfnuhveZnh9ymFVU-YZeujdANniXAwBGI7c6hG_BXkH7i +Eyf4Fn41_SV78PskP6qgqJahr9r3bqdjNbKBztIKCOEVrE_w3IM5r02l-iStk_NBRkj6cq_7VCpG +afxZ2CtZMwuZMiypO_wOgbdpCSKNzsL-NH2b4b08OlKiWb263gz634KJmV5WEfCl-6eH-JUFbWOS +JwQfActLNT2ZQPl2MyZQNBzJEWoJRgS6k7tPRO-zqeUtYYHGHVMCxMuMHGQcoilNNHEFeBCG_fBh +yAKb9g9F86Cbx9voMLiyTX2T3rwVHiSJFOzfNxGmfN5JWOthIun_c5hEY1tLQ15BomzkDwk7BAj7 +VbRCrVD45B6xrmSTMBSWYmLyr6mnQxQqeh9cMbD-0ZAncE3roxRnRvPKjFFa208ykYUp2V83r_PJ +fV5I9ZPKSjk9DwFyrjkcQQEYDhdK6IFqcd6nEthjYVkmunu2fsX0bIOm9GGdIbKGqBnpdgBO5hyT +rBr9HSlZrHcGdti1R823ckDF0Ekcl6kioDr5NLIpLtg9zUEDRm3QrbX2mv5Zs8W0pYnOqglxy3lz +bJZTN7oR7VasHUtjmp0RT9nLZkUs5TZ6MHhlIq3ZsQ6w_Q9Rv1-ofxfwfCC4EBrWKbWAGCf6By4K +Ew8321-2YnodhmsK5BrT4zQ1DZlmUvK8BmYjZe7wTljKjgYcsLTBfX4eMhJ7MIW1kpnl8AbiBfXh +QzN56Mki51Q8PSQWHm0W9tnQ0z6wKdck6zBJ8JyNzewZahFKueDTn-9DOqIDfr3YHvQLLzeXyJ8e +h4AgjW-hvlLzRGtkCknjLIgXVa3rMTycseAwbW-mgdCqqkw3SdEG8feAcyntmvE8j2jbtSDStQMB +9JdvyNLuQdNG4pxpusgvVso0-8NQF0YVa9VFwg9U6IPSx5p8FcW68OAHt_fEgT4ZtiH7o9aur4o9 +oYqUh2lALCY-__9QLq1KkNjMKs33Jz9E8LbRerG9PLclkTrxCjYAeUWBjCwSI7OB7xkuaYDSjkjj +a46NLpdBN1GNcsFFcZ79GFAK0_DsyxGLX8Tq6q0Bvhs8whD8wlSxpTGxYkyqNX-vcb7SDN_0WkCE +XSdZWkqTHXcYbOvoCOb_e6SFAztuMenuHWY0utX0gBfx_X5lPDFyoYXErxFQHiA7t27keshXNa6R +ukQRRS8kMjre1U74sc-fRNXkXpl57rG4rgxaEX0eBeowa53KAsVvUAoSac2aC_nfzXrDvoyf9Xi3 +JpEZNhUDLpFCEycV4I7jGQ9wo9qNaosvlsr6kbLDNdb_1xrGVgjT3xEvRNJNPqslSAu-yD-UFhC3 +AmCdYUnugw_eEFqXCHTARcRkdPPvl2XsmEKY2IqEeO5tz4DyXQFaL-5hEVh6lYEU1EOWHk3UGIXe +Vc5_Ttp82qNLmlJPbZvgmNTJzYTHDQ_27KBcp7IVVZgPDjVKdWqQvZ18KhxvfF3Idgy82LBZniFV +IbtxllXiPRxoPQriSXMnXjh3XkvSDI2pFxXfEvLRn1tvcFOwPNCz3QfPIzYg8uYXN5bRt3ZOrR_g +ZhIlrc7HO0VbNbeqEVPKMZ-cjkqGj4VAuDKoQc0eQ6X_wCoAGO78nPpLeIvZPx1X3z5YoqNA \ No newline at end of file diff --git a/kubernetes/message-router/templates/dmaap-configmap.yaml b/kubernetes/message-router/templates/dmaap-configmap.yaml new file mode 100644 index 0000000000..bd1e629b21 --- /dev/null +++ b/kubernetes/message-router/templates/dmaap-configmap.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: mr-dmaap-cadi-prop-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/dmaap/cadi.properties").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: mr-dmaap-msgrtrapi-prop-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/dmaap/MsgRtrApi.properties").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: mr-dmaap-mykey-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/dmaap/mykey").AsConfig . | indent 2 }} diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml index f81da769fd..a0c13802bb 100644 --- a/kubernetes/message-router/templates/message-router-dmaap.yaml +++ b/kubernetes/message-router/templates/message-router-dmaap.yaml @@ -63,10 +63,13 @@ spec: name: localtime readOnly: true - mountPath: /appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties + subPath: MsgRtrApi.properties name: appprops - mountPath: /appl/dmaapMR1/etc/cadi.properties + subPath: cadi.properties name: cadi - mountPath: /appl/dmaapMR1/etc/keyfile + subPath: mykey name: mykey restartPolicy: Always volumes: @@ -74,14 +77,15 @@ spec: hostPath: path: /etc/localtime - name: appprops - hostPath: - path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/MsgRtrApi.properties + configMap: + name: mr-dmaap-msgrtrapi-prop-configmap - name: cadi - hostPath: - path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/cadi.properties + configMap: + name: mr-dmaap-cadi-prop-configmap - name: mykey - hostPath: - path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/message-router/dmaap/mykey + configMap: + name: mr-dmaap-mykey-configmap imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" {{ end }} + diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml index 2607ce64b9..844de040d4 100644 --- a/kubernetes/message-router/templates/message-router-kafka.yaml +++ b/kubernetes/message-router/templates/message-router-kafka.yaml @@ -30,6 +30,17 @@ spec: name: message-router-global-kafka spec: initContainers: + - command: + - bash + args: + - -c + - "if [ -d /var/tmp/SDC-DISTR-NOTIF-TOPIC-SDC-OPENSOURCE-ENV1-0 ]; then echo nothing to do; else cp -a /opt/config/src/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/* /var/tmp/; fi" + image: {{ .Values.image.config }} + imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /var/tmp + name: kafka-data + name: kafka-primer - command: - /root/ready.py args: @@ -88,3 +99,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml index d232c2eede..1b3e8f8ed9 100644 --- a/kubernetes/message-router/templates/message-router-zookeeper.yaml +++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml @@ -29,6 +29,18 @@ spec: app: zookeeper name: message-router-zookeeper spec: + initContainers: + - command: + - bash + args: + - -c + - "if [ -d /var/tmp/version-2 ]; then echo nothing to do; else cp -a /opt/config/src/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper/* /var/tmp/; fi" + image: {{ .Values.image.config }} + imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /var/tmp + name: zookeeper-data + name: zookeeper-primer containers: - image: {{ .Values.image.zookeeper }} imagePullPolicy: {{ .Values.pullPolicy }} @@ -57,3 +69,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + diff --git a/kubernetes/message-router/values.yaml b/kubernetes/message-router/values.yaml index add7679f3f..68251471e6 100644 --- a/kubernetes/message-router/values.yaml +++ b/kubernetes/message-router/values.yaml @@ -24,3 +24,5 @@ image: dmaap: attos/dmaap:latest kafka: wurstmeister/kafka:latest zookeeper: wurstmeister/zookeeper:latest + config: oomk8s/config-init:2.0.0-SNAPSHOT + -- cgit 1.2.3-korg From 9d84e4397839580c401d457997c794a5c92db60e Mon Sep 17 00:00:00 2001 From: Jerome Doucerain Date: Sat, 17 Mar 2018 14:33:18 -0400 Subject: Portal selective readiness check added a condition on pap readiness Issue-ID: OOM-746 Change-Id: Id8a84b798dfab10038e24ed09d5d2c6712fbbeb4 Signed-off-by: Jerome Doucerain --- kubernetes/portal/templates/portal-vnc-dep.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml index 232f5b1576..f3418e7bb8 100644 --- a/kubernetes/portal/templates/portal-vnc-dep.yaml +++ b/kubernetes/portal/templates/portal-vnc-dep.yaml @@ -61,6 +61,7 @@ spec: image: {{ .Values.image.readiness }} imagePullPolicy: {{ .Values.pullPolicy }} name: portal-vnc-readiness +{{- if empty .Values.disablePolicyPap | not }} - command: - /root/ready.py args: @@ -72,6 +73,7 @@ spec: image: {{ .Values.image.readiness }} imagePullPolicy: {{ .Values.pullPolicy }} name: vnc-pap-readiness +{{- end }} - command: - /root/ready.py args: @@ -132,3 +134,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} + -- cgit 1.2.3-korg From aa56bbc3f170f6d4b417354a111ad2c50d79d53a Mon Sep 17 00:00:00 2001 From: Jerome Doucerain Date: Sat, 17 Mar 2018 14:36:12 -0400 Subject: SDNC parameterized persisted type and location conditional subpath in case we are not using the NFS provisioner parameterized location if we are using hostpath Issue-ID: OOM-748 Change-Id: I982a75a91fa5e6349697867d188c3c83093e5e78 Signed-off-by: Jerome Doucerain --- kubernetes/sdnc/templates/db-statefulset.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kubernetes/sdnc/templates/db-statefulset.yaml b/kubernetes/sdnc/templates/db-statefulset.yaml index d0f141f868..29d592a6a7 100644 --- a/kubernetes/sdnc/templates/db-statefulset.yaml +++ b/kubernetes/sdnc/templates/db-statefulset.yaml @@ -82,7 +82,9 @@ spec: volumeMounts: - name: sdnc-data mountPath: /var/lib/mysql +#{{ if not .Values.disableNfsProvisioner }} subPath: mysql +#{{ end }} - name: conf mountPath: /etc/mysql/conf.d containers: @@ -99,7 +101,9 @@ spec: volumeMounts: - mountPath: /var/lib/mysql name: sdnc-data +#{{ if not .Values.disableNfsProvisioner }} subPath: mysql +#{{ end }} - name: conf mountPath: /etc/mysql/conf.d ports: @@ -178,7 +182,9 @@ spec: volumeMounts: - name: sdnc-data mountPath: /var/lib/mysql +#{{ if not .Values.disableNfsProvisioner }} subPath: mysql +#{{ end }} - name: conf mountPath: /etc/mysql/conf.d resources: @@ -197,7 +203,7 @@ spec: #{{ if .Values.disableNfsProvisioner }} - name: sdnc-data hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/data + path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdnc/data/mysql #{{ else }} volumeClaimTemplates: - metadata: @@ -211,3 +217,4 @@ spec: storage: 1Gi #{{ end }} #{{ end }} + -- cgit 1.2.3-korg From 96bebdcf842ef0e6c1c65713930331f0c72d1d55 Mon Sep 17 00:00:00 2001 From: Jerome Doucerain Date: Sat, 17 Mar 2018 16:03:08 -0400 Subject: SO endpoints and service update updated the endpoints and service in a single namespace onap deployment prospective updated the parameters order for the image source to allow override Issue-ID: OOM-743 Change-Id: I6a379ec4661d465f95478b383d60c3b2eecc0f72 Signed-off-by: Jerome Doucerain --- kubernetes/so/resources/config/mso/mso-docker.json | 73 +++++++++++----------- kubernetes/so/templates/deployment.yaml | 3 +- kubernetes/so/templates/service.yaml | 5 +- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/kubernetes/so/resources/config/mso/mso-docker.json b/kubernetes/so/resources/config/mso/mso-docker.json index 7a0c579a97..17f01931a6 100755 --- a/kubernetes/so/resources/config/mso/mso-docker.json +++ b/kubernetes/so/resources/config/mso/mso-docker.json @@ -9,9 +9,9 @@ "mso-api-handler-infra-config": { - "bpelURL": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080", + "bpelURL": "http://so:8080", "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1", - "camundaURL": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080", + "camundaURL": "http://so:8080", "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1" }, @@ -23,7 +23,7 @@ "consumerGroup": "sdc-OpenSource-Env1", "consumerId": "sdc-COpenSource-Env11", "environmentName": "{{ .Values.config.dmaapTopic }}", - "asdcAddress": "sdc-be.onap-sdc.svc.cluster.local:8443", + "asdcAddress": "sdc-be:8443", "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247", "pollingInterval": 60, "pollingTimeout": 60, @@ -38,20 +38,20 @@ { "sdncurls": [ - "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/L3SDN-API:", - "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/config/L3SDN-API:", - "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/Firewall-API:", - "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/config", - "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/VNF-API:", - "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/NBNC-API:", - "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/NORTHBOUND-API:service-topology-operation", - "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/GENERIC-RESOURCE-API:", - "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/VNFTOPOLOGYAIC-API:" + "http://sdnhost:8282/restconf/operations/L3SDN-API:", + "http://sdnhost:8282/restconf/config/L3SDN-API:", + "http://sdnhost:8282/restconf/operations/Firewall-API:", + "http://sdnhost:8282/restconf/config", + "http://sdnhost:8282/restconf/operations/VNF-API:", + "http://sdnhost:8282/restconf/operations/NBNC-API:", + "http://sdnhost:8282/restconf/operations/NORTHBOUND-API:service-topology-operation", + "http://sdnhost:8282/restconf/operations/GENERIC-RESOURCE-API:", + "http://sdnhost:8282/restconf/operations/VNFTOPOLOGYAIC-API:" ], - "bpelurl": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService", - "restbpelurl": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/WorkflowMessage", - "myurl": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/adapters/rest/SDNCNotify", + "bpelurl": "http://so:8080/mso/SDNCAdapterCallbackService", + "restbpelurl": "http://so:8080/mso/WorkflowMessage", + "myurl": "http://so:8080/adapters/rest/SDNCNotify", "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73", "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1", "sdncconnecttime": "5000" @@ -92,7 +92,7 @@ "mso-workflow-message-adapter-config": { - "wmbpelurl": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/WorkflowMessage", + "wmbpelurl": "http://so:8080/mso/WorkflowMessage", "wmbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1" }, @@ -128,37 +128,37 @@ "versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44", "infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77", "sniroAuth": "test:testpwd", - "sniroEndpoint": "http://sniro-emulator.{{ .Release.Name }}-mock.svc.cluster.local:8080/sniro/api/v2/placement", + "sniroEndpoint": "http://sniro-emulator:8080/sniro/api/v2/placement", "sniroTimeout": "PT30M", - "serviceAgnosticSniroHost": "http://sniro-emulator.{{ .Release.Name }}-mock.svc.cluster.local:8080", + "serviceAgnosticSniroHost": "http://sniro-emulator:8080", "serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement", - "aaiEndpoint": "https://aai-service.{{ .Release.Name }}-aai.svc.cluster.local:8443", + "aaiEndpoint": "https://aai-service:8443", "aaiAuth": "2630606608347B7124C244AB0FE34F6F", "adaptersNamespace": "http://org.openecomp.mso", - "adaptersCompletemsoprocessEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/CompleteMsoProcess", - "adaptersDbEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/dbadapters/MsoRequestsDbAdapter", - "adaptersOpenecompDbEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/dbadapters/RequestsDbAdapter", - "catalogDbEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/ecomp/mso/catalog", - "adaptersSdncEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/adapters/SDNCAdapter", - "adaptersSdncRestEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/adapters/rest/v1/sdnc", - "adaptersTenantEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/tenants/TenantAdapter", + "adaptersCompletemsoprocessEndpoint": "http://so:8080/CompleteMsoProcess", + "adaptersDbEndpoint": "http://so:8080/dbadapters/MsoRequestsDbAdapter", + "adaptersOpenecompDbEndpoint": "http://so:8080/dbadapters/RequestsDbAdapter", + "catalogDbEndpoint": "http://so:8080/ecomp/mso/catalog", + "adaptersSdncEndpoint": "http://so:8080/adapters/SDNCAdapter", + "adaptersSdncRestEndpoint": "http://so:8080/adapters/rest/v1/sdnc", + "adaptersTenantEndpoint": "http://so:8080/tenants/TenantAdapter", "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", - "adaptersWorkflowMessageEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/workflows/messages/message", - "workflowMessageEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/WorkflowMessage", - "workflowSdncAdapterCallback": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService", + "adaptersWorkflowMessageEndpoint": "http://so:8080/workflows/messages/message", + "workflowMessageEndpoint": "http://so:8080/mso/WorkflowMessage", + "workflowSdncAdapterCallback": "http://so:8080/mso/SDNCAdapterCallbackService", "workflowSdncReplicationDelay": "PT5S", "workflowAaiDistributionDelay": "PT30S", "msoKey": "07a7159d3bf51a0e53be7a8f89699be7", "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", "sdncTimeout": "PT5M", "rollback": "true", - "adaptersNetworkEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/networks/NetworkAdapter", - "adaptersNetworkRestEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/networks/rest/v1/networks", - "adaptersVnfAsyncEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/vnfs/VnfAdapterAsync", - "workflowVnfAdapterDeleteCallback": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/vnfAdapterNotify", - "workflowVnfAdapterCreateCallback": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/vnfAdapterNotify", - "adaptersVnfRestEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/vnfs/rest/v1/vnfs", - "workflowVnfAdapterRestCallback": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/vnfAdapterRestNotify", + "adaptersNetworkEndpoint": "http://so:8080/networks/NetworkAdapter", + "adaptersNetworkRestEndpoint": "http://so:8080/networks/rest/v1/networks", + "adaptersVnfAsyncEndpoint": "http://so:8080/vnfs/VnfAdapterAsync", + "workflowVnfAdapterDeleteCallback": "http://so:8080/mso/vnfAdapterNotify", + "workflowVnfAdapterCreateCallback": "http://so:8080/mso/vnfAdapterNotify", + "adaptersVnfRestEndpoint": "http://so:8080/vnfs/rest/v1/vnfs", + "workflowVnfAdapterRestCallback": "http://so:8080/mso/vnfAdapterRestNotify", "poTimeout": "PT5M", "sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui", "sdncFirewallYangModelVersion": "2015-05-15", @@ -179,3 +179,4 @@ "mso-config": "~> 1.0.0" } } + diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml index 8706951467..0727ce80a3 100644 --- a/kubernetes/so/templates/deployment.yaml +++ b/kubernetes/so/templates/deployment.yaml @@ -49,7 +49,7 @@ spec: - name: {{ .Chart.Name }} command: - /tmp/start-jboss-server.sh - image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}" + image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -189,3 +189,4 @@ spec: mode: 0755 imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" + diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml index de7e1c4a4c..63e41acc46 100644 --- a/kubernetes/so/templates/service.yaml +++ b/kubernetes/so/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.fullname" . }} + name: so namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -80,4 +80,5 @@ spec: {{- end}} selector: app: {{ include "common.name" . }} - release: {{ .Release.Name }} \ No newline at end of file + release: {{ .Release.Name }} + -- cgit 1.2.3-korg