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 "[AUTHENTICATION] Restructured keycloak and Oauth2-proxy"
[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
e59b483
..
a3a219e
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.
@@
-21,10
+22,15
@@
global:
backup:
mountPath: /dockerdata-nfs/backup
storageClass:
backup:
mountPath: /dockerdata-nfs/backup
storageClass:
-repositoryOverride: docker.io
+ serviceMesh:
+ enabled: false
+
#################################################################
# Application configuration defaults.
#################################################################
#################################################################
# Application configuration defaults.
#################################################################
+
+cluster_name: onap
+
## Init containers parameters:
sysctlImage:
enabled: true
## Init containers parameters:
sysctlImage:
enabled: true
@@
-42,7
+48,7
@@
replicaCount: 3
## master acts as master only node, choose 'no' if no further data nodes are deployed)
dedicatednode: 'yes'
## dedicatednode: "no"
## master acts as master only node, choose 'no' if no further data nodes are deployed)
dedicatednode: 'yes'
## dedicatednode: "no"
-image: bitnami/elasticsearch:7.
6.1
+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,13
+108,13
@@
resources:
## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube.
limits:
## choice for the user. This also increases chances charts run on environments with little
## resources, such as Minikube.
limits:
- cpu:
250m
- memory:
1536Mi
- # cpu:
100m
- # memory:
128Mi
+ cpu:
"250m"
+ memory:
"1.5Gi"
+ # cpu:
"100m"
+ # memory:
"100Mi"
requests:
requests:
- cpu:
5m
- memory:
310Mi
+ cpu:
"5m"
+ memory:
"300Mi"
## 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
##
@@
-166,7
+172,7
@@
service:
## list of ports for "common.containerPorts"
## Elasticsearch transport port
ports:
## list of ports for "common.containerPorts"
## Elasticsearch transport port
ports:
- - name:
htt
p-transport
+ - name:
tc
p-transport
port: 9300
## master-eligible service type
##
port: 9300
## master-eligible service type
##