8e4da9da55
This reverts the changes made to Elasticsearch, Kibana and fluent logging charts in https://review.openstack.org/#/c/550229/7. Specifically, this moves the images back to previous used versions and makes the required changes to the fluent-logging elasticsearch template job to include the correct mapping directives for the elasticsearch template. This change was made to give more time for evaluating a more robust solution for switching to the official upstream images that will not cause intermittent gate failures as seen since 550229 was merged Change-Id: I9f70b3412a8edc5cb1d80937b158aa2fe7b1ec82
251 lines
9.7 KiB
YAML
251 lines
9.7 KiB
YAML
{{/*
|
|
Copyright 2017 The Openstack-Helm Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- if .Values.manifests.deployment_client }}
|
|
{{- $envAll := . }}
|
|
{{- $esUserSecret := .Values.secrets.elasticsearch.user }}
|
|
{{- if .Values.images.local_registry.active -}}
|
|
{{- $_ := set .Values "pod_dependency" dict -}}
|
|
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_client .Values.dependencies.dynamic.common.local_image_registry) -}}
|
|
{{- else -}}
|
|
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_client -}}
|
|
{{- end -}}
|
|
|
|
{{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }}
|
|
|
|
{{- $serviceAccountName := printf "%s-%s" .Release.Name "elasticsearch-client"}}
|
|
{{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
|
---
|
|
apiVersion: rbac.authorization.k8s.io/v1beta1
|
|
kind: ClusterRoleBinding
|
|
metadata:
|
|
name: run-elasticsearch-client
|
|
subjects:
|
|
- kind: ServiceAccount
|
|
name: {{ $serviceAccountName }}
|
|
namespace: {{ .Release.Namespace }}
|
|
roleRef:
|
|
kind: ClusterRole
|
|
name: {{ $serviceAccountName }}
|
|
apiGroup: rbac.authorization.k8s.io
|
|
---
|
|
apiVersion: rbac.authorization.k8s.io/v1beta1
|
|
kind: ClusterRole
|
|
metadata:
|
|
name: {{ $serviceAccountName }}
|
|
rules:
|
|
- nonResourceURLs:
|
|
- /
|
|
verbs:
|
|
- get
|
|
- apiGroups:
|
|
- ""
|
|
resources:
|
|
- endpoints
|
|
verbs:
|
|
- get
|
|
- apiGroups:
|
|
- apps
|
|
resources:
|
|
- statefulsets/status
|
|
verbs:
|
|
- get
|
|
---
|
|
apiVersion: extensions/v1beta1
|
|
kind: Deployment
|
|
metadata:
|
|
name: elasticsearch-client
|
|
spec:
|
|
replicas: {{ .Values.pod.replicas.client }}
|
|
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{ tuple $envAll "elasticsearch" "client" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
|
annotations:
|
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
spec:
|
|
serviceAccountName: {{ $serviceAccountName }}
|
|
affinity:
|
|
{{ tuple $envAll "elasticsearch" "client" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
|
|
nodeSelector:
|
|
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
|
|
terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.client.timeout | default "600" }}
|
|
initContainers:
|
|
{{ tuple $envAll .Values.pod_dependency list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
- name: memory-map-increase
|
|
securityContext:
|
|
privileged: true
|
|
runAsUser: 0
|
|
{{ tuple $envAll "memory_init" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
command:
|
|
- sysctl
|
|
- -w
|
|
- vm.max_map_count={{ .Values.conf.init.max_map_count }}
|
|
{{ if .Values.storage.filesystem_repository.enabled }}
|
|
- name: elasticsearch-repository-perms
|
|
{{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
securityContext:
|
|
runAsUser: 0
|
|
{{ tuple $envAll $envAll.Values.pod.resources.client | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
|
|
command:
|
|
- chown
|
|
- -R
|
|
- "elasticsearch:"
|
|
- {{ .Values.conf.elasticsearch.repository.location }}
|
|
volumeMounts:
|
|
- name: storage
|
|
mountPath: {{ .Values.conf.elasticsearch.repository.location }}
|
|
{{ end }}
|
|
containers:
|
|
- name: apache-proxy
|
|
{{ tuple $envAll "apache_proxy" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.apache_proxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
command:
|
|
- /tmp/apache.sh
|
|
- start
|
|
ports:
|
|
- name: http
|
|
containerPort: 80
|
|
env:
|
|
- name: ELASTICSEARCH_PORT
|
|
value: {{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
|
|
- name: ELASTICSEARCH_USERNAME
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: {{ $esUserSecret }}
|
|
key: ELASTICSEARCH_USERNAME
|
|
- name: ELASTICSEARCH_PASSWORD
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: {{ $esUserSecret }}
|
|
key: ELASTICSEARCH_PASSWORD
|
|
volumeMounts:
|
|
- name: elasticsearch-bin
|
|
mountPath: /tmp/apache.sh
|
|
subPath: apache.sh
|
|
readOnly: true
|
|
- name: elasticsearch-etc
|
|
mountPath: /usr/local/apache2/conf/httpd.conf
|
|
subPath: httpd.conf
|
|
readOnly: true
|
|
- name: pod-etc-apache
|
|
mountPath: /usr/local/apache2/conf/sites-enabled
|
|
- name: elasticsearch-etc
|
|
mountPath: /usr/local/apache2/conf/sites-enabled/elasticsearch-host.conf
|
|
subPath: elasticsearch-host.conf
|
|
readOnly: true
|
|
- name: elasticsearch-client
|
|
securityContext:
|
|
privileged: true
|
|
capabilities:
|
|
add:
|
|
- IPC_LOCK
|
|
- SYS_RESOURCE
|
|
{{ tuple $envAll "elasticsearch" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.client | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
|
|
command:
|
|
- /tmp/elasticsearch.sh
|
|
- start
|
|
lifecycle:
|
|
preStop:
|
|
exec:
|
|
command:
|
|
- /tmp/elasticsearch.sh
|
|
- stop
|
|
ports:
|
|
- name: http
|
|
containerPort: {{ tuple "elasticsearch" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
- name: transport
|
|
containerPort: {{ tuple "elasticsearch" "internal" "discovery" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
livenessProbe:
|
|
tcpSocket:
|
|
port: {{ tuple "elasticsearch" "internal" "discovery" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
initialDelaySeconds: 20
|
|
periodSeconds: 10
|
|
readinessProbe:
|
|
httpGet:
|
|
path: /_cluster/health
|
|
port: {{ tuple "elasticsearch" "internal" "client" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
env:
|
|
- name: NAMESPACE
|
|
valueFrom:
|
|
fieldRef:
|
|
fieldPath: metadata.namespace
|
|
- name: NODE_NAME
|
|
valueFrom:
|
|
fieldRef:
|
|
fieldPath: metadata.name
|
|
- name: NODE_MASTER
|
|
value: "false"
|
|
- name: NODE_DATA
|
|
value: "false"
|
|
- name: HTTP_ENABLE
|
|
value: "true"
|
|
- name: DISCOVERY_SERVICE
|
|
value: {{ tuple "elasticsearch" "discovery" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
|
|
- name: ES_JAVA_OPTS
|
|
value: "{{ .Values.conf.elasticsearch.env.java_opts }}"
|
|
volumeMounts:
|
|
- name: elasticsearch-logs
|
|
mountPath: {{ .Values.conf.elasticsearch.config.path.logs }}
|
|
- name: elasticsearch-bin
|
|
mountPath: /tmp/elasticsearch.sh
|
|
subPath: elasticsearch.sh
|
|
readOnly: true
|
|
- name: elasticsearch-config
|
|
mountPath: /usr/share/elasticsearch/config
|
|
- name: elasticsearch-etc
|
|
mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
|
|
subPath: elasticsearch.yml
|
|
readOnly: true
|
|
- name: elasticsearch-etc
|
|
mountPath: /usr/share/elasticsearch/config/log4j2.properties
|
|
subPath: log4j2.properties
|
|
readOnly: true
|
|
- name: storage
|
|
mountPath: {{ .Values.conf.elasticsearch.config.path.data }}
|
|
{{ if .Values.storage.filesystem_repository.enabled }}
|
|
- name: snapshots
|
|
mountPath: {{ .Values.conf.elasticsearch.repository.location }}
|
|
{{ end }}
|
|
{{ if $mounts_elasticsearch.volumeMounts }}{{ toYaml $mounts_elasticsearch.volumeMounts | indent 12 }}{{ end }}
|
|
volumes:
|
|
- name: pod-etc-apache
|
|
emptyDir: {}
|
|
- name: elasticsearch-config
|
|
emptyDir: {}
|
|
- name: elasticsearch-logs
|
|
emptyDir: {}
|
|
- name: elasticsearch-bin
|
|
configMap:
|
|
name: elasticsearch-bin
|
|
defaultMode: 0555
|
|
- name: elasticsearch-etc
|
|
configMap:
|
|
name: elasticsearch-etc
|
|
defaultMode: 0444
|
|
- name: storage
|
|
emptyDir: {}
|
|
{{ if .Values.storage.filesystem_repository.enabled }}
|
|
- name: snapshots
|
|
persistentVolumeClaim:
|
|
claimName: {{ .Values.storage.filesystem_repository.pvc.name }}
|
|
{{ end }}
|
|
{{ if $mounts_elasticsearch.volumes }}{{ toYaml $mounts_elasticsearch.volumes | indent 8 }}{{ end }}
|
|
{{- end }}
|