fc9677f718
Before this change, there was no ability to append custom volume for any of the services. The reason was a missing new line character, so the templates were formatted like this: - name: pod-shared mountPath: /tmp/pod-shared - mountPath: /tmp/test2 name: test2 Apart from that, for some of the services (mostly job-bootstrap) invalid indentation for custom volumes (and their mounts) was set. Closes-Bug: 1712745 Change-Id: Ib57c76a34c0e28ad9e67ea47d1fc250b17711a42 Signed-off-by: Mateusz Blaszkowski <mateusz.blaszkowski@intel.com>
71 lines
2.5 KiB
YAML
71 lines
2.5 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.pod_rally_test }}
|
|
{{- $envAll := . }}
|
|
{{- $dependencies := .Values.dependencies.tests }}
|
|
{{- $mounts_keystone_tests := .Values.pod.mounts.keystone_tests.keystone_tests }}
|
|
{{- $mounts_keystone_tests_init := .Values.pod.mounts.keystone_tests.init_container }}
|
|
---
|
|
apiVersion: v1
|
|
kind: Pod
|
|
metadata:
|
|
name: "{{.Release.Name}}-rally-test"
|
|
annotations:
|
|
"helm.sh/hook": test-success
|
|
spec:
|
|
restartPolicy: Never
|
|
initContainers:
|
|
{{ tuple $envAll $dependencies $mounts_keystone_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
|
|
containers:
|
|
- name: {{.Release.Name}}-token-issue-test
|
|
image: {{ .Values.images.test }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
|
|
env:
|
|
{{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
|
|
{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}
|
|
{{- end }}
|
|
- name: RALLY_ENV_NAME
|
|
value: {{.Release.Name}}
|
|
command:
|
|
- /tmp/rally-test.sh
|
|
volumeMounts:
|
|
- name: keystone-etc
|
|
mountPath: /etc/rally/rally_tests.yaml
|
|
subPath: rally_tests.yaml
|
|
readOnly: true
|
|
- name: keystone-bin
|
|
mountPath: /tmp/rally-test.sh
|
|
subPath: rally-test.sh
|
|
readOnly: true
|
|
- name: rally-db
|
|
mountPath: /var/lib/rally
|
|
{{ if $mounts_keystone_tests.volumeMounts }}{{ toYaml $mounts_keystone_tests.volumeMounts | indent 8 }}{{ end }}
|
|
volumes:
|
|
- name: keystone-etc
|
|
configMap:
|
|
name: keystone-etc
|
|
defaultMode: 0444
|
|
- name: keystone-bin
|
|
configMap:
|
|
name: keystone-bin
|
|
defaultMode: 0555
|
|
- name: rally-db
|
|
emptyDir: {}
|
|
{{ if $mounts_keystone_tests.volumes }}{{ toYaml $mounts_keystone_tests.volumes | indent 4 }}{{ end }}
|
|
{{- end }}
|