X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Felasticsearch%2Fvalues.yaml;h=6c46f32c96643b2d69bbe6579b476b081101d41b;hb=90aa482417e8731446baaa2040ff12531d6a4c58;hp=31edcabfa1c1f57445faf81eacfc8953c026787d;hpb=5f858f590bcca6fa5c382bd4db0fc3f084452026;p=oom.git

diff --git a/kubernetes/common/elasticsearch/values.yaml b/kubernetes/common/elasticsearch/values.yaml
index 31edcabfa1..6c46f32c96 100644
--- a/kubernetes/common/elasticsearch/values.yaml
+++ b/kubernetes/common/elasticsearch/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.
@@ -18,11 +19,6 @@
 global:
   aafEnabled: true
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
-  busyboxRepository: registry.hub.docker.com
-  busyboxImage: library/busybox:latest
   clusterName: cluster.local
 
 persistence:
@@ -30,7 +26,6 @@ persistence:
   backup:
     mountPath: /dockerdata-nfs/backup
   storageClass:
-repositoryOverride: docker.io
 
 #################################################################
 # Application configuration defaults.
@@ -40,7 +35,7 @@ sysctlImage:
   enabled: true
 
 # application image
-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
@@ -133,13 +128,8 @@ serviceAccount:
   ##
   # name:
 
-## Bitnami Minideb image version
-## ref: https://hub.docker.com/r/bitnami/minideb/tags/
-##
 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
@@ -154,13 +144,11 @@ sysctlImage:
 
 # nginx image
 nginx:
-  imageName: bitnami/nginx
-  tag: 1.16-debian-9
   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:
@@ -242,7 +230,7 @@ service:
   ##
   type: ClusterIP
   headlessPorts:
-  - name: http-transport
+  - name: tcp-transport
     port: 9300
   headless:
     suffix: discovery
@@ -252,7 +240,7 @@ service:
   ## Elasticsearch tREST API port
   ##
   ports:
-  - name: elasticsearch
+  - name: http-es
     port: 9200
 
 
@@ -291,7 +279,6 @@ certInitializer:
   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;
@@ -317,7 +304,9 @@ master:
   # dedicatednode: "no"
   # handles master and data node functionality
   dedicatednode: "no"
+  cluster_name: elasticsearch
 data:
   enabled: false
+  cluster_name: elasticsearch
 curator:
   enabled: false