Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Commit

Permalink
[kibana] use new elasticsearch credentials
Browse files Browse the repository at this point in the history
This commit updates kibana values to use the new Elasticsearch
credentials from #1384.

Relates to #1375
  • Loading branch information
jmlrt committed Oct 12, 2021
1 parent 97c0e58 commit 45d2583
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 26 deletions.
6 changes: 6 additions & 0 deletions kibana/examples/default/test/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@ http:
http://localhost:5601/api/status:
status: 200
timeout: 2000
username: "{{ .Env.ELASTICSEARCH_USERNAME }}"
password: "{{ .Env.ELASTICSEARCH_PASSWORD }}"
body:
- '"number":"8.0.0"'

http://localhost:5601/app/kibana:
status: 200
timeout: 2000
username: "{{ .Env.ELASTICSEARCH_USERNAME }}"
password: "{{ .Env.ELASTICSEARCH_PASSWORD }}"

http://helm-kibana-default-kibana:5601/app/kibana:
status: 200
timeout: 2000
username: "{{ .Env.ELASTICSEARCH_USERNAME }}"
password: "{{ .Env.ELASTICSEARCH_PASSWORD }}"
19 changes: 9 additions & 10 deletions kibana/examples/security/values.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
---

elasticsearchHosts: "https://security-master:9200"

extraEnvs:
- name: 'ELASTICSEARCH_USERNAME'
- name: "KIBANA_ENCRYPTION_KEY"
valueFrom:
secretKeyRef:
name: elastic-credentials
key: username
- name: 'ELASTICSEARCH_PASSWORD'
name: kibana
key: encryptionkey
- name: "ELASTICSEARCH_USERNAME"
valueFrom:
secretKeyRef:
name: elastic-credentials
key: password
- name: 'KIBANA_ENCRYPTION_KEY'
name: security-master-credentials
key: username
- name: "ELASTICSEARCH_PASSWORD"
valueFrom:
secretKeyRef:
name: kibana
key: encryptionkey
name: security-master-credentials
key: password

kibanaConfig:
kibana.yml: |
Expand Down
12 changes: 12 additions & 0 deletions kibana/examples/upgrade/values.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
---
elasticsearchHosts: "http://upgrade-master:9200"

extraEnvs:
- name: "ELASTICSEARCH_USERNAME"
valueFrom:
secretKeyRef:
name: upgrade-master-credentials
key: username
- name: "ELASTICSEARCH_PASSWORD"
valueFrom:
secretKeyRef:
name: upgrade-master-credentials
key: password
42 changes: 26 additions & 16 deletions kibana/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ replicas: 1
extraEnvs:
- name: "NODE_OPTIONS"
value: "--max-old-space-size=1800"
- name: "ELASTICSEARCH_USERNAME"
valueFrom:
secretKeyRef:
name: elasticsearch-master-credentials
key: username
- name: "ELASTICSEARCH_PASSWORD"
valueFrom:
secretKeyRef:
name: elasticsearch-master-credentials
key: password
# - name: MY_ENVIRONMENT_VAR
# value: the_value_goes_here

Expand Down Expand Up @@ -42,7 +52,7 @@ imagePullPolicy: "IfNotPresent"
labels: {}

podAnnotations: {}
# iam.amazonaws.com/role: es-cluster
# iam.amazonaws.com/role: es-cluster

resources:
requests:
Expand Down Expand Up @@ -73,7 +83,7 @@ podSecurityContext:
securityContext:
capabilities:
drop:
- ALL
- ALL
# readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 1000
Expand Down Expand Up @@ -117,20 +127,20 @@ service:
nodePort: ""
labels: {}
annotations: {}
# cloud.google.com/load-balancer-type: "Internal"
# service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
# service.beta.kubernetes.io/azure-load-balancer-internal: "true"
# service.beta.kubernetes.io/openstack-internal-load-balancer: "true"
# service.beta.kubernetes.io/cce-load-balancer-internal-vpc: "true"
# cloud.google.com/load-balancer-type: "Internal"
# service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
# service.beta.kubernetes.io/azure-load-balancer-internal: "true"
# service.beta.kubernetes.io/openstack-internal-load-balancer: "true"
# service.beta.kubernetes.io/cce-load-balancer-internal-vpc: "true"
loadBalancerSourceRanges: []
# 0.0.0.0/0
# 0.0.0.0/0
httpPortName: http

ingress:
enabled: false
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
hosts:
- host: chart-example.local
paths:
Expand All @@ -156,12 +166,12 @@ nameOverride: ""
fullnameOverride: ""

lifecycle: {}
# preStop:
# exec:
# command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]
# postStart:
# exec:
# command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]
# preStop:
# exec:
# command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]
# postStart:
# exec:
# command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]

# Deprecated - use only with versions < 6.6
elasticsearchURL: "" # "http://elasticsearch-master:9200"

0 comments on commit 45d2583

Please sign in to comment.