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

Add working examples for running Elasticsearch and Kibana on ope… #263

Merged
merged 4 commits into from
Sep 23, 2019
Merged

Add working examples for running Elasticsearch and Kibana on ope… #263

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77cac6a
Add working examples for running Elasticsearch and Kibana on openshift
Crazybus Aug 22, 2019
e702047
Remove unnecessary semicolon and newline escape
Crazybus Sep 19, 2019
e35f692
Fix fsGroup and runAsUser for Kibana
Crazybus Sep 20, 2019
2aa87a8
Update kibana/examples/openshift/Makefile
Crazybus Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions elasticsearch/examples/openshift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
default: test
include ../../../helpers/examples.mk

RELEASE := elasticsearch

template:
helm template --values ./values.yaml ../../

install:
helm upgrade --wait --timeout=600 --install $(RELEASE) --values ./values.yaml ../../ ; \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we have ; \ at the end of the line?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed! Guessing it was leftover from a copy paste where it is doing multiple commands.


test: install goss

purge:
helm del --purge $(RELEASE)
17 changes: 17 additions & 0 deletions elasticsearch/examples/openshift/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
http:
http://localhost:9200/_cluster/health:
status: 200
timeout: 2000
body:
- 'green'
- '"number_of_nodes":3'
- '"number_of_data_nodes":3'

http://localhost:9200:
status: 200
timeout: 2000
body:
- '"number" : "7.3.0"'
- '"cluster_name" : "elasticsearch"'
- '"name" : "elasticsearch-master-0"'
- 'You Know, for Search'
10 changes: 10 additions & 0 deletions elasticsearch/examples/openshift/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---

securityContext:
runAsUser: null

podSecurityContext:
fsGroup: null

sysctlInitContainer:
enabled: false
15 changes: 15 additions & 0 deletions kibana/examples/openshift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
default: test
include ../../../helpers/examples.mk

RELEASE := kibana

template:
helm template --values ./values.yml ../../

install:
helm upgrade --wait --timeout=600 --install --values ./values.yml $(RELEASE) ../../ ; \
Crazybus marked this conversation as resolved.
Show resolved Hide resolved

test: install goss

purge:
helm del --purge $(RELEASE)
4 changes: 4 additions & 0 deletions kibana/examples/openshift/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
http:
http://localhost:5601/app/kibana:
status: 200
timeout: 2000
4 changes: 4 additions & 0 deletions kibana/examples/openshift/values.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---

fsGroup: null
runAsUser: null
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we have the same structure as in elasticsearch/examples/openshift/values.yaml?

securityContext:
  runAsUser: null

podSecurityContext:
  fsGroup: null

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice indeed, but trying to keep the charts identical for every change is quite the challenge. For backwards compatibility reasons the Elasticsearch chart does actually still support fsGroup directly as per #171. These changes could also be backported to Kibana. Wherever possible I have been trying to keep changes in sync and to follow the same style as other charts but this one slipped in.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this already the case in kibana/values.yaml#L57-L66?

podSecurityContext:
  fsGroup: 1000

securityContext:
  capabilities:
    drop:
    - ALL
  # readOnlyRootFilesystem: true
  runAsNonRoot: true
  runAsUser: 1000

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are 100% right. I could have sworn this was working before my holiday. When I ran make template just now it is clearly not doing anything. Just pushed a new commit using the correct values.