openstack/openstack-helm-infra
Code Issues Proposed changes

Fix elasticsearch cronjob rendering

Browse Source 
The pod security context for the elasticsearch cron jobs is in the wrong
location, causing an error when installing or upgrading the chart.

    ValidationError(CronJob.spec.jobTemplate.spec):
        unknown field "securityContext" in io.k8s.api.batch.v1.JobSpec

This change fixes the rendering.

Change-Id: I0e04b1ba27113d4b7aeefa2035b2b29c45be455a
This commit is contained in:
Phil Sphicas 2022-03-16 15:58:28 -07:00
parent 3a10c5ba95
commit c3da3a6f79
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elasticsearch/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v7.6.2 appVersion: v7.6.2
description: OpenStack-Helm ElasticSearch description: OpenStack-Helm ElasticSearch
name: elasticsearch name: elasticsearch
version: 0.2.13 version: 0.2.14
home: https://www.elastic.co/ home: https://www.elastic.co/
sources: sources:
- https://github.com/elastic/elasticsearch - https://github.com/elastic/elasticsearch

2
elasticsearch/templates/cron-job-curator.yaml
View File

@ -38,12 +38,12 @@ spec:
labels: labels:
{{ tuple $envAll "elasticsearch" "curator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} {{ tuple $envAll "elasticsearch" "curator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
spec: spec:
{{ dict "envAll" $envAll "application" "curator" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:
{{ tuple $envAll "elasticsearch" "curator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 12 }} {{ tuple $envAll "elasticsearch" "curator" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 12 }}
spec: spec:
{{ dict "envAll" $envAll "application" "curator" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 10 }}
nodeSelector: nodeSelector:
{{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value | quote }} {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value | quote }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}

2
elasticsearch/templates/cron-job-verify-repositories.yaml
View File

@ -40,12 +40,12 @@ spec:
annotations: annotations:
{{ dict "envAll" $envAll "podName" "elasticsearch-verify-repositories" "containerNames" (list "elasticsearch-verify-repositories" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} {{ dict "envAll" $envAll "podName" "elasticsearch-verify-repositories" "containerNames" (list "elasticsearch-verify-repositories" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec: spec:
{{ dict "envAll" $envAll "application" "verify_repositories" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
template: template:
metadata: metadata:
labels: labels:
{{ tuple $envAll "elasticsearch" "verify-repositories" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 12 }} {{ tuple $envAll "elasticsearch" "verify-repositories" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 12 }}
spec: spec:
{{ dict "envAll" $envAll "application" "verify_repositories" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 10 }}
nodeSelector: nodeSelector:
{{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value | quote }} {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value | quote }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}

1
releasenotes/notes/elasticsearch.yaml
View File

@ -23,4 +23,5 @@ elasticsearch:
- 0.2.11 Enable TLS path between Curator and Elasticsearch - 0.2.11 Enable TLS path between Curator and Elasticsearch
- 0.2.12 Helm 3 - Fix Job labels - 0.2.12 Helm 3 - Fix Job labels
- 0.2.13 Update htk requirements - 0.2.13 Update htk requirements
- 0.2.14 Fix cronjob rendering
... ...