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 "[CDS] Add cps-data resourceSourceMapping in application.properties"
[oom.git]
/
kubernetes
/
common
/
elasticsearch
/
components
/
master
/
values.yaml
diff --git
a/kubernetes/common/elasticsearch/components/master/values.yaml
b/kubernetes/common/elasticsearch/components/master/values.yaml
index
22c4987
..
2eae0de
100644
(file)
--- a/
kubernetes/common/elasticsearch/components/master/values.yaml
+++ b/
kubernetes/common/elasticsearch/components/master/values.yaml
@@
-1,4
+1,5
@@
-# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Copyright (c) 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies
+# Modification Copyright (c) 2020 Nokia
#
# 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.
@@
-12,7
+13,6
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-
#################################################################
# Global configuration defaults.
#################################################################
#################################################################
# Global configuration defaults.
#################################################################
@@
-22,10
+22,13
@@
global:
backup:
mountPath: /dockerdata-nfs/backup
storageClass:
backup:
mountPath: /dockerdata-nfs/backup
storageClass:
-repositoryOverride: docker.io
+
#################################################################
# Application configuration defaults.
#################################################################
#################################################################
# Application configuration defaults.
#################################################################
+
+cluster_name: onap
+
## Init containers parameters:
sysctlImage:
enabled: true
## Init containers parameters:
sysctlImage:
enabled: true
@@
-41,9
+44,9
@@
name: master
##
replicaCount: 3
## master acts as master only node, choose 'no' if no further data nodes are deployed)
##
replicaCount: 3
## master acts as master only node, choose 'no' if no further data nodes are deployed)
-dedicatednode:
"yes"
+dedicatednode:
'yes'
## dedicatednode: "no"
## dedicatednode: "no"
-image: bitnami/elasticsearch:
6.8.6-debian-9-r2
3
+image: bitnami/elasticsearch:
7.9.
3
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@
-102,12
+105,14
@@
resources:
## We usually recommend not to specify default resources and to leave this as a conscious
## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube.
## We usually recommend not to specify default resources and to leave this as a conscious
## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube.
- limits: {}
+ limits:
+ cpu: 250m
+ memory: 1536Mi
# cpu: 100m
# memory: 128Mi
requests:
# cpu: 100m
# memory: 128Mi
requests:
- cpu:
2
5m
- memory:
256
Mi
+ cpu: 5m
+ memory:
310
Mi
## Elasticsearch master-eligible container's liveness and readiness probes
## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
##
## Elasticsearch master-eligible container's liveness and readiness probes
## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
##
@@
-160,13
+165,13
@@
persistence:
## Service parameters for master-eligible node(s)
##
service:
## Service parameters for master-eligible node(s)
##
service:
- suffix:
"service"
- name:
""
+ suffix:
'service'
+ name:
''
## list of ports for "common.containerPorts"
## Elasticsearch transport port
ports:
## list of ports for "common.containerPorts"
## Elasticsearch transport port
ports:
-
- name: htt
p-transport
- port: 9300
+
- name: tc
p-transport
+
port: 9300
## master-eligible service type
##
type: ClusterIP
## master-eligible service type
##
type: ClusterIP
@@
-192,10
+197,6
@@
serviceAccount:
## If not set and create is true, a name is generated using the fullname template
# name:
## If not set and create is true, a name is generated using the fullname template
# name:
-
## Elasticsearch cluster name
##
clusterName: elastic-cluster
## Elasticsearch cluster name
##
clusterName: elastic-cluster
-
-
-