openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "[CPCEPH-74] Use ca cert for helm tests"

Browse Source
This commit is contained in:
Zuul 2021-04-30 08:32:37 +00:00 committed by Gerrit Code Review
commit 901b9f72a8
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-rgw/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Ceph RadosGW
name: ceph-rgw
version: 0.1.6
version: 0.1.7
home: https://github.com/ceph/ceph
...

2
ceph-rgw/templates/bin/_helm-tests.sh.tpl
View File

@ -84,7 +84,7 @@ function rgw_s3_bucket_validation ()
bucket=s3://rgw-test-bucket
{{- if .Values.manifests.certificates }}
params="--host=$RGW_HOST --host-bucket=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --no-check-certificate"
params="--host=$RGW_HOST --host-bucket=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --ca-certs=/etc/tls/ca.crt"
{{- else }}
params="--host=$RGW_HOST --host-bucket=$RGW_HOST --access_key=$S3_ADMIN_ACCESS_KEY --secret_key=$S3_ADMIN_SECRET_KEY --no-ssl"
{{- end }}

4
ceph-rgw/templates/pod-helm-tests.yaml
View File

@ -99,6 +99,7 @@ spec:
mountPath: /tmp/helm-tests.sh
subPath: helm-tests.sh
readOnly: true
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.ceph_object_store.api.internal "path" "/etc/tls" | include "helm-toolkit.snippets.tls_volume_mount" | indent 8 }}
{{- end }}
volumes:
- name: pod-tmp
@ -119,4 +120,7 @@ spec:
{{- if .Values.conf.rgw_ks.enabled }}
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.object_store.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 4 }}
{{- end }}
{{- if .Values.conf.rgw_s3.enabled }}
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.ceph_object_store.api.internal | include "helm-toolkit.snippets.tls_volume" | indent 4 }}
{{- end }}
{{- end }}

1
releasenotes/notes/ceph-rgw.yaml
View File

@ -7,4 +7,5 @@ ceph-rgw:
- 0.1.4 Rgw placement target support
- 0.1.5 Add tls support
- 0.1.6 Update tls override options
- 0.1.7 Use ca cert for helm tests
...