summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDustin Specker <dustin.specker@att.com>2019-01-03 11:32:20 -0600
committerDustin Specker <dustin.specker@att.com>2019-01-03 18:54:09 +0000
commitfa705f1aaa6394505ac9190eba940249fd37fd58 (patch)
tree84f59144d90859edbf96cb1a6fa0547d6286f5d4
parent3461a897142e01c597c7571eeec3163a24e86de9 (diff)
make publishing Sonobuoy results optional
This change enables operators to disable results publishing where Swift and Ceph may not be setup. This configuration option does not prevent deploying other resources such as ks-user. The operator will want to disable those via the `manifests` dictionary in `values.yaml`. Change-Id: I00be7d51309889fcaf3b2a9756e38dcf49c31312
Notes
Notes (review): Code-Review+1: Doug Schveninger <ds6901@att.com> Code-Review+1: Bryan Strassner <strassner.bryan@gmail.com> Code-Review+2: Steve Wilkerson <wilkers.steve@gmail.com> Code-Review+1: Jeffrey Williams <jw2610@att.com> Code-Review+2: Chris Wedgwood <cw@f00f.org> Workflow+1: Chris Wedgwood <cw@f00f.org> Code-Review+1: Kaustuv Royburman <kaustuv.royburman@ericsson.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 08 Jan 2019 06:52:46 +0000 Reviewed-on: https://review.openstack.org/628231 Project: openstack/openstack-helm-addons Branch: refs/heads/master
-rw-r--r--sonobuoy/templates/pod-api.yaml2
-rw-r--r--sonobuoy/values.yaml1
2 files changed, 3 insertions, 0 deletions
diff --git a/sonobuoy/templates/pod-api.yaml b/sonobuoy/templates/pod-api.yaml
index 390e27e..9b119da 100644
--- a/sonobuoy/templates/pod-api.yaml
+++ b/sonobuoy/templates/pod-api.yaml
@@ -81,6 +81,7 @@ spec:
81 mountPath: /run_master.sh 81 mountPath: /run_master.sh
82 subPath: run_master.sh 82 subPath: run_master.sh
83 readOnly: true 83 readOnly: true
84{{- if $envAll.Values.conf.publish_results }}
84 - name: results-publisher 85 - name: results-publisher
85{{ tuple $envAll "results_publisher" | include "helm-toolkit.snippets.image" | indent 4 }} 86{{ tuple $envAll "results_publisher" | include "helm-toolkit.snippets.image" | indent 4 }}
86 env: 87 env:
@@ -98,6 +99,7 @@ spec:
98 readOnly: true 99 readOnly: true
99 - mountPath: {{ .Values.conf.sonobuoy.ResultsDir }} 100 - mountPath: {{ .Values.conf.sonobuoy.ResultsDir }}
100 name: sonobuoy-output 101 name: sonobuoy-output
102{{- end }}
101 restartPolicy: Never 103 restartPolicy: Never
102 serviceAccountName: {{ $serviceAccountName }} 104 serviceAccountName: {{ $serviceAccountName }}
103 volumes: 105 volumes:
diff --git a/sonobuoy/values.yaml b/sonobuoy/values.yaml
index 633f08a..01fc1b2 100644
--- a/sonobuoy/values.yaml
+++ b/sonobuoy/values.yaml
@@ -99,6 +99,7 @@ manifests:
99 secret_keystone: true 99 secret_keystone: true
100 100
101conf: 101conf:
102 publish_results: true
102 swift: 103 swift:
103 container_name: sonobuoy 104 container_name: sonobuoy
104 # delete objects after 1 month (60 * 60 * 24 * 30 seconds) 105 # delete objects after 1 month (60 * 60 * 24 * 30 seconds)