summaryrefslogtreecommitdiffstats
path: root/kubernetes/clamp/values.yaml
diff options
context:
space:
mode:
authorac2550 <ac2550@intl.att.com>2018-04-26 10:15:28 +0200
committerac2550 <ac2550@intl.att.com>2018-04-26 13:41:50 +0200
commit518760a1a314700f96adcbb717d53155df3a095a (patch)
treee10c7ee319166745ba8037723593c96e96b74856 /kubernetes/clamp/values.yaml
parent99a74ebd1ea743c78178196bfe9ede6bf4b50f6e (diff)
Remove namespace from clamp values
Templating system seems to fail when included in json. As namespace isn't required, use current namespace as default. Change-Id: Ic9936054c2285cd79004bc94c1aa8b6ee544324d Issue-ID: OOM-920 Signed-off-by: ac2550 <ac2550@intl.att.com>
Diffstat (limited to 'kubernetes/clamp/values.yaml')
-rw-r--r--kubernetes/clamp/values.yaml20
1 files changed, 10 insertions, 10 deletions
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index eef4dd7e65..827b5d99cc 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -42,17 +42,17 @@ config:
dataRootDir: /dockerdata-nfs
springApplicationJson: >
{
- "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clamp-mariadb.{{include "common.namespace" .}}:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3",
- "clamp.config.sdc.catalog.url": "https://sdc-be.{{include "common.namespace" .}}.svc.cluster.local:8443/sdc/v1/catalog/",
- "clamp.config.sdc.hostUrl": "https://sdc-be.{{include "common.namespace" .}}.svc.cluster.local:8443/",
- "clamp.config.sdc.serviceUrl": "https://sdc-be.{{include "common.namespace" .}}.svc.cluster.local:8443/sdc/v1/catalog/services",
+ "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://mariadb:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3",
+ "clamp.config.sdc.catalog.url": "https://sdc-be:8443/sdc/v1/catalog/",
+ "clamp.config.sdc.hostUrl": "https://sdc-be:8443/",
+ "clamp.config.sdc.serviceUrl": "https://sdc-be:8443/sdc/v1/catalog/services",
"clamp.config.sdc.serviceUsername": "clamp",
"clamp.config.sdc.servicePassword": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
- "clamp.config.dcae.inventory.url": "http://dcaegen2.{{include "common.namespace" .}}.svc.cluster.local:8080",
- "clamp.config.dcae.dispatcher.url": "http://dcaegen2.{{include "common.namespace" .}}.svc.cluster.local:8080",
- "clamp.config.policy.pdpUrl1": "https://policy-pdp.{{include "common.namespace" .}}.svc.cluster.local:9091/pdp/ , testpdp, alpha123",
- "clamp.config.policy.pdpUrl2": "https://policy-pdp.{{include "common.namespace" .}}.svc.cluster.local:9091/pdp/ , testpdp, alpha123",
- "clamp.config.policy.papUrl": "https://policy-pap.{{include "common.namespace" .}}.svc.cluster.local:8443/pap/ , testpap, alpha123",
+ "clamp.config.dcae.inventory.url": "http://dcaegen2:8080",
+ "clamp.config.dcae.dispatcher.url": "http://dcaegen2:8080",
+ "clamp.config.policy.pdpUrl1": "https://policy-pdp:9091/pdp/ , testpdp, alpha123",
+ "clamp.config.policy.pdpUrl2": "https://policy-pdp:9091/pdp/ , testpdp, alpha123",
+ "clamp.config.policy.papUrl": "https://policy-pap:8443/pap/ , testpap, alpha123",
"clamp.config.policy.clientKey": "5CE79532B3A2CB4D132FC0C04BF916A7"
}
@@ -70,7 +70,7 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 10
+ initialDelaySeconds: 30
periodSeconds: 10
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container