From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 7 Sep 2020 07:55:16 +0000 (+0000)
Subject: Merge "[COMMON/elasticsearch] Avoid 'Warning: Merging destination map for chart'"
X-Git-Tag: 7.0.0~270
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2f987f69b45998da0ff21fd7dc14d18206352507;hp=-c;p=oom.git

Merge "[COMMON/elasticsearch] Avoid 'Warning: Merging destination map for chart'"
---

2f987f69b45998da0ff21fd7dc14d18206352507
diff --combined kubernetes/common/elasticsearch/values.yaml
index f8b3be5c8f,8a931154e5..e6e532d168
--- a/kubernetes/common/elasticsearch/values.yaml
+++ b/kubernetes/common/elasticsearch/values.yaml
@@@ -18,7 -18,8 +18,7 @@@
  global:
    aafEnabled: true
    nodePortPrefix: 302
 -  readinessRepository: oomk8s
 -  readinessImage: readiness-check:2.0.2
 +  readinessImage: onap/oom/readiness:3.0.1
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
    busyboxRepository: registry.hub.docker.com
@@@ -40,24 -41,22 +40,22 @@@ sysctlImage
    enabled: true
  
  # application image
- image:
-   imageName: bitnami/elasticsearch
-   tag: 6.8.6-debian-9-r23
-   ## 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
-   ##
-   pullPolicy: IfNotPresent
-   ## Optionally specify an array of imagePullSecrets.
-   ## Secrets must be manually created in the namespace.
-   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-   ##
-   # pullSecrets:
-   #   - myRegistryKeySecretName
-   ## Set to true if you would like to see extra information on logs
-   ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
-   ##
-   debug: false
+ image: bitnami/elasticsearch:6.8.6-debian-9-r23
+ ## 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
+ ##
+ pullPolicy: IfNotPresent
+ ## Optionally specify an array of imagePullSecrets.
+ ## Secrets must be manually created in the namespace.
+ ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+ ##
+ # pullSecrets:
+ #   - myRegistryKeySecretName
+ ## Set to true if you would like to see extra information on logs
+ ## ref:  https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
+ ##
+ debug: false
  
  ## String to partially override common.fullname template (will maintain the release name)
  ##