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
/
values.yaml
diff --git
a/kubernetes/common/elasticsearch/values.yaml
b/kubernetes/common/elasticsearch/values.yaml
index
7722af9
..
6c46f32
100644
(file)
--- a/
kubernetes/common/elasticsearch/values.yaml
+++ b/
kubernetes/common/elasticsearch/values.yaml
@@
-19,11
+19,6
@@
global:
aafEnabled: true
nodePortPrefix: 302
global:
aafEnabled: true
nodePortPrefix: 302
- readinessImage: onap/oom/readiness:3.0.1
- loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
- busyboxRepository: docker.io
- busyboxImage: library/busybox:latest
clusterName: cluster.local
persistence:
clusterName: cluster.local
persistence:
@@
-31,7
+26,6
@@
persistence:
backup:
mountPath: /dockerdata-nfs/backup
storageClass:
backup:
mountPath: /dockerdata-nfs/backup
storageClass:
-repositoryOverride: docker.io
#################################################################
# Application configuration defaults.
#################################################################
# Application configuration defaults.
@@
-134,13
+128,8
@@
serviceAccount:
##
# name:
##
# name:
-## Bitnami Minideb image version
-## ref: https://hub.docker.com/r/bitnami/minideb/tags/
-##
sysctlImage:
enabled: true
sysctlImage:
enabled: true
- imageName: bitnami/minideb
- tag: stretch
## 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
@@
-155,13
+144,11
@@
sysctlImage:
# nginx image
nginx:
# nginx image
nginx:
- imageName: bitnami/nginx
- tag: 1.16-debian-9
pullPolicy: IfNotPresent
service:
name: nginx
ports:
pullPolicy: IfNotPresent
service:
name: nginx
ports:
- - name:
elasticsearch
+ - name:
http-es
port: 8080
## Custom server block to be added to NGINX configuration
## PHP-FPM example server block:
port: 8080
## Custom server block to be added to NGINX configuration
## PHP-FPM example server block:
@@
-243,7
+230,7
@@
service:
##
type: ClusterIP
headlessPorts:
##
type: ClusterIP
headlessPorts:
- - name:
htt
p-transport
+ - name:
tc
p-transport
port: 9300
headless:
suffix: discovery
port: 9300
headless:
suffix: discovery
@@
-253,7
+240,7
@@
service:
## Elasticsearch tREST API port
##
ports:
## Elasticsearch tREST API port
##
ports:
- - name:
elasticsearch
+ - name:
http-es
port: 9200
port: 9200
@@
-292,7
+279,6
@@
certInitializer:
aaf_add_config: >
cd {{ .Values.credsPath }};
mkdir -p certs;
aaf_add_config: >
cd {{ .Values.credsPath }};
mkdir -p certs;
- export $(/opt/app/aaf_config/bin/agent.sh local showpass | grep '^c' | xargs -0);
keytool -exportcert -rfc -file certs/cacert.pem -keystore {{ .Values.fqi_namespace }}.trust.jks -alias ca_local_0 -storepass $cadi_truststore_password;
openssl pkcs12 -in {{ .Values.fqi_namespace }}.p12 -out certs/cert.pem -passin pass:$cadi_keystore_password_p12 -passout pass:$cadi_keystore_password_p12;
cp {{ .Values.fqi_namespace }}.key certs/key.pem;
keytool -exportcert -rfc -file certs/cacert.pem -keystore {{ .Values.fqi_namespace }}.trust.jks -alias ca_local_0 -storepass $cadi_truststore_password;
openssl pkcs12 -in {{ .Values.fqi_namespace }}.p12 -out certs/cert.pem -passin pass:$cadi_keystore_password_p12 -passout pass:$cadi_keystore_password_p12;
cp {{ .Values.fqi_namespace }}.key certs/key.pem;
@@
-318,7
+304,9
@@
master:
# dedicatednode: "no"
# handles master and data node functionality
dedicatednode: "no"
# dedicatednode: "no"
# handles master and data node functionality
dedicatednode: "no"
+ cluster_name: elasticsearch
data:
enabled: false
data:
enabled: false
+ cluster_name: elasticsearch
curator:
enabled: false
curator:
enabled: false