Skip to content

Commit

Permalink
Add var to set QDR auth to none (#498)
Browse files Browse the repository at this point in the history
* Add var to set QDR auth to none

The smoketests don't support spec.transport.qdr.auth = basic.
Add a var to allow us to set this value to "none" in ci.

This commit can be reverted when PR#492 is merged.
  • Loading branch information
elfiesmelfie authored Sep 29, 2023
1 parent 713be16 commit fe97f48
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions build/stf-run-ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ choose to override:
| `__service_telemetry_trap_default_oid` | <default_oid> | 1.3.6.1.4.1.50495.15.1.2.1 | The trap OID if none is found in the Prometheus alert labels. |
| `__service_telemetry_trap_default_severity` | <default_severity> | <undefined> | The trap severity if none is found in the Prometheus alert labels. |
| `__service_telemetry_observability_strategy` | <observability_strategy> | `use_redhat` | Which observability strategy to use for deployment. Default is 'use_redhat'. Also supported are 'use_hybrid', 'use_community', and 'none' |
| `__service_telemetry_transports_qdr_auth` | {'none', 'basic'} | `none` | Which auth method to use for QDR. Can be 'none' or 'basic'. Note: 'basic' is not yet supported in smoketests. |
| `__service_telemetry_transports_certificates_endpoint_cert_duration` | [ParseDuration](https://golang.org/pkg/time/#ParseDuration) | 70080h | Lifetime of the QDR endpoint certificate (minimum duration is 1h) |
| `__service_telemetry_transports_certificates_ca_cert_duration` | [ParseDuration](https://golang.org/pkg/time/#ParseDuration) | 70080h | Lifetime of the QDR CA certificate (minimum duration is 1h) |
| `__internal_registry_path` | <registry_path> | image-registry.openshift-image-registry.svc:5000 | Path to internal registry for image path |
Expand Down
3 changes: 3 additions & 0 deletions build/stf-run-ci/tasks/deploy_stf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
transports:
qdr:
enabled: true
{% if __service_telemetry_transports_qdr_auth is defined %}
auth: "{{ __service_telemetry_transports_qdr_auth }}"
{% endif %}
certificates:
endpointCertDuration: {{ __service_telemetry_transports_certificates_endpoint_cert_duration }}
caCertDuration: {{ __service_telemetry_transports_certificates_ca_cert_duration }}
Expand Down
1 change: 1 addition & 0 deletions ci/vars-zuul-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
namespace: "service-telemetry"
setup_bundle_registry_tls_ca: false
setup_bundle_registry_auth: false
__service_telemetry_transports_qdr_auth: none
base_dir: "{{ sto_dir }}/build"
logfile_dir: "{{ ansible_user_dir }}/zuul-output/logs/controller"

0 comments on commit fe97f48

Please sign in to comment.