Normalize Elasticsearch pod related naming #1024
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nkvoll
requested review from
artemnikitin,
barkbay,
idanmo,
pebrc,
sebgl and
thbkrkr
as code owners
nkvoll
force-pushed
the
normalize-elasticsearch-pod-related-naming
branch
from
540d380 to
0d2f7fc
Compare
nkvoll
added a commit
to nkvoll/cloud-on-k8s
that referenced
this pull request
Jun 8, 2019
By default they will get a 1Gi volume, which is chosen because matches roughly 1:1 vs the default heap.
Users can opt out of this behavior by specifying the data volume in the Elasticsearch resource directly
```yaml
apiVersion: elasticsearch.k8s.elastic.co/v1alpha1
kind: Elasticsearch
metadata:
name: elasticsearch-sample
spec:
version: "7.1.0"
nodes:
- nodeCount: 1
podTemplate:
spec:
volumes:
- name: elasticsearch-data
emptyDir: {}
```
Builds on top of elastic#1024
Closes: elastic#913
sebgl
reviewed
Jun 10, 2019
There was a problem hiding this comment.
Not sure about:
- moving from
dataandlogstoelasticsearch-dataandelasticsearch-logs. I think they were already self-explanatory in their short version? - the
elastic-internalprefix. Maybeinternalis enough?elastic-internal-elasticsearch-config-managedfor example looks a bit hairy, compared to eg.internal-config. Also most things we mount aremanaged?
The new names are defined as consts to provide a slightly better overview.
Adds `-internal` to several things that should be considered internals.
Removes some no longer used (and mislabeled) "version specific" resources, such
as a generic ConfigMap and Secret.
Internal mounts are now mounted to directories under `/mnt/elastic-internal`.
Internal users has the `elastic-internal-` prefix and roles has the `elastic_internal_` prefix.
Since data and logs directories for ES are not considered internals, they now have the
canonical names `elasticsearch-data` and `elasticsearch-logs` (previously just `data` and `logs`)
Example Volume Mounts:
```
/mnt/elastic-internal/elasticsearch-config-managed from elastic-internal-elasticsearch-config-managed (ro)
/mnt/elastic-internal/keystore-user from elsatic-internal-keystore-user (ro)
/mnt/elastic-internal/probe-user from elastic-internal-probe-user (ro)
/mnt/elastic-internal/process-manager from elastic-internal-process-manager (rw)
/mnt/elastic-internal/secure-settings from elastic-internal-secure-settings (ro)
/mnt/elastic-internal/unicast-hosts from elastic-internal-unicast-hosts (ro)
/usr/share/elasticsearch/bin from elastic-internal-elasticsearch-bin-local (rw)
/usr/share/elasticsearch/config from elastic-internal-elasticsearch-config-local (rw)
/usr/share/elasticsearch/config/http-certs from elastic-internal-http-certificates (ro)
/usr/share/elasticsearch/config/transport-certs from elastic-internal-transport-certificates (ro)
/usr/share/elasticsearch/data from elasticsearch-data (rw)
/usr/share/elasticsearch/logs from elasticsearch-logs (rw)
/usr/share/elasticsearch/plugins from elastic-internal-elasticsearch-plugins-local (rw)
```
Example Volumes
```
elastic-internal-elasticsearch-config-local:
Type: EmptyDir (a temporary directory that shares a pod's lifetime)
Medium:
SizeLimit: <unset>
elastic-internal-elasticsearch-plugins-local:
Type: EmptyDir (a temporary directory that shares a pod's lifetime)
Medium:
SizeLimit: <unset>
elastic-internal-elasticsearch-bin-local:
Type: EmptyDir (a temporary directory that shares a pod's lifetime)
Medium:
SizeLimit: <unset>
elasticsearch-data:
Type: EmptyDir (a temporary directory that shares a pod's lifetime)
Medium:
SizeLimit: <unset>
elasticsearch-logs:
Type: EmptyDir (a temporary directory that shares a pod's lifetime)
Medium:
SizeLimit: <unset>
elastic-internal-process-manager:
Type: EmptyDir (a temporary directory that shares a pod's lifetime)
Medium:
SizeLimit: <unset>
elastic-internal-unicast-hosts:
Type: ConfigMap (a volume populated by a ConfigMap)
Name: elasticsearch-sample-es-unicast-hosts
Optional: false
elastic-internal-probe-user:
Type: Secret (a volume populated by a Secret)
SecretName: elasticsearch-sample-es-internal-users
Optional: false
elsatic-internal-keystore-user:
Type: Secret (a volume populated by a Secret)
SecretName: elasticsearch-sample-es-internal-users
Optional: false
elastic-internal-secure-settings:
Type: Secret (a volume populated by a Secret)
SecretName: elasticsearch-sample-es-secure-settings
Optional: false
elastic-internal-http-certificates:
Type: Secret (a volume populated by a Secret)
SecretName: elasticsearch-sample-es-http-certs-internal
Optional: false
elastic-internal-transport-certificates:
Type: Secret (a volume populated by a Secret)
SecretName: elasticsearch-sample-es-xdcbcdndf4-certs
Optional: false
elastic-internal-elasticsearch-config-managed:
Type: Secret (a volume populated by a Secret)
SecretName: elasticsearch-sample-es-xdcbcdndf4-config
Optional: false
```
nkvoll
force-pushed
the
normalize-elasticsearch-pod-related-naming
branch
from
0d2f7fc to
4c31968
Compare
|
Fixed the remaining comments, hoping for a happy build from CI since it took the weekend off :) |
pebrc
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rename secret -roles-users to -xpack-file-realm
This is a bit more descriptive about its actual contents
Normalize volumes, mounts, users and roles for ES
Adds
-internalto several things that should be considered internals.Removes some no longer used (and mislabeled) "version specific" resources, such
as a generic ConfigMap and Secret.
Internal mounts are now mounted to directories under
/mnt/elastic-internal.Internal users has the
elastic-internal-prefix and roles has theelastic_internal_prefix.Since data and logs directories for ES are not considered internals, they now have the
canonical names
elasticsearch-dataandelasticsearch-logs(previously justdataandlogs)Example Volume Mounts:
Example Volumes
Add an elstic-internal prefix to the init container names.
The new names are defined as consts to provide a slightly better overview.
Closes #547