Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "DNS add option for display target machine info"
[oom.git]
/
kubernetes
/
consul
/
charts
/
consul-server
/
values.yaml
diff --git
a/kubernetes/consul/charts/consul-server/values.yaml
b/kubernetes/consul/charts/consul-server/values.yaml
index
406f9b6
..
e9c96d1
100644
(file)
--- a/
kubernetes/consul/charts/consul-server/values.yaml
+++ b/
kubernetes/consul/charts/consul-server/values.yaml
@@
-1,4
+1,5
@@
# Copyright © 2017 Amdocs, Bell Canada
# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-16,8
+17,6
@@
#################################################################
global:
nodePortPrefix: 302
#################################################################
global:
nodePortPrefix: 302
- repository: nexus3.onap.org:10001
- repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
loggingRepository: docker.elastic.co
readinessRepository: oomk8s
readinessImage: readiness-check:2.0.0
loggingRepository: docker.elastic.co
@@
-43,24
+42,24
@@
affinity: {}
# probe configuration parameters
liveness:
initialDelaySeconds: 10
# probe configuration parameters
liveness:
initialDelaySeconds: 10
- periodSeconds:
10
+ periodSeconds:
5
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
readiness:
initialDelaySeconds: 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
+ periodSeconds:
5
service:
service:
- type:
NodePort
+ type:
ClusterIP
name: consul-server
name: consul-server
- portName: consul-
ui
- nodePort: 70
- internalPort: 8500
- portName2: consul-
join
- nodePort2: 71
- internalPort2: 8301
+ portName: consul-
join
+ internalPort: 8301
+ type2: ClusterIP
+ portName2: consul-
ui
+ internalPort2: 8500
+ nodePort2: 70
ingress:
enabled: false
ingress:
enabled: false