openstack/openstack-helm-infra
Code Issues Proposed changes

RabbitMQ: fix dependency checks for tests and wait job

Browse Source 
This PS fixes the dependency checks tor the tests and wait job.

Change-Id: I09301083bfc2d0218298a8c5e0dd4957bef11c42
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2019-03-22 12:34:38 -05:00 committed by Pete Birley
parent edb24bd537
commit f6ed763a6a
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rabbitmq/templates/job-cluster-wait.yaml
View File

@ -39,7 +39,7 @@ spec:
nodeSelector:
{{ $envAll.Values.labels.jobs.node_selector_key }}: {{ $envAll.Values.labels.test.node_selector_value | quote }}
initContainers:
{{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
{{ tuple $envAll "cluster_wait" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: {{.Release.Name}}-rabbitmq-cluster-wait
{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 10 }}

6
rabbitmq/templates/pod-test.yaml
View File

@ -17,6 +17,12 @@ limitations under the License.
{{- if .Values.manifests.pod_test }}
{{- $envAll := . }}
{{ if kindIs "string" $envAll.Values.dependencies.static.tests.jobs }}
{{ if eq $envAll.Values.dependencies.static.tests.jobs "cluster_wait" }}
{{ $_ := set $envAll.Values.dependencies.static.tests "jobs" ( list ( print $envAll.Release.Name "-cluster-wait" ) ) }}
{{ end }}
{{ end }}
{{- $serviceAccountName := print .Release.Name "-test" }}
{{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---

4
rabbitmq/values.yaml
View File

@ -155,6 +155,10 @@ dependencies:
services:
- endpoint: internal
service: oslo_messaging
# NOTE (portdirect): this key is somewhat special, if set to the string
# `cluster_wait` then the job dep will be populated with a single value
# containing the generated name for the `cluster_wait` job name.
jobs: cluster_wait
cluster_wait:
services:
- endpoint: internal