From 0fd920eeb2286f236d9e6ee7246c110339f4d7a7 Mon Sep 17 00:00:00 2001 From: Hediberto C Silva Date: Wed, 13 Nov 2024 14:15:02 -0300 Subject: [PATCH] Fix YAML parse error due to special character This change prevents an error converting YAML to JSON in job-sync-osds helm template, where the OS_PASSWORD env variable provided contains the special character @ at the beginning of the string. Additionally, the quota helm subfunction was added to the others variables expected to be a string. Test Plan: PASS: Build rook-ceph app. PASS: Deploy the built app in a setup that cover the special character password scenario. Closes-Bug: 2088078 Change-Id: I5b3b07d81c85366a796b82681238d22e8b229eaf Signed-off-by: Hediberto C Silva --- .../rook-ceph-provisioner/templates/job-sync-osds.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/helm-charts/custom/rook-ceph-provisioner-helm/rook-ceph-provisioner-helm/rook-ceph-provisioner/templates/job-sync-osds.yaml b/helm-charts/custom/rook-ceph-provisioner-helm/rook-ceph-provisioner-helm/rook-ceph-provisioner/templates/job-sync-osds.yaml index 8eb4f4b..5c15920 100644 --- a/helm-charts/custom/rook-ceph-provisioner-helm/rook-ceph-provisioner-helm/rook-ceph-provisioner/templates/job-sync-osds.yaml +++ b/helm-charts/custom/rook-ceph-provisioner-helm/rook-ceph-provisioner-helm/rook-ceph-provisioner/templates/job-sync-osds.yaml @@ -311,15 +311,15 @@ spec: command: [ "/bin/bash", "/tmp/mount/sync_osds.sh" ] env: - name: OS_USERNAME - value: {{ .Values.sync_osds.os_username }} + value: {{ .Values.sync_osds.os_username | quote }} - name: OS_PASSWORD - value: {{ .Values.sync_osds.os_password }} + value: {{ .Values.sync_osds.os_password | quote }} - name: OS_AUTH_URL - value: {{ .Values.sync_osds.os_auth_url }} + value: {{ .Values.sync_osds.os_auth_url | quote }} - name: TIMEOUT - value: {{ .Values.sync_osds.timeout }} + value: {{ .Values.sync_osds.timeout | quote }} - name: DELAY - value: {{ .Values.sync_osds.delay }} + value: {{ .Values.sync_osds.delay | quote }} - name: OSDS value: {{ .Values.sync_osds.storage | toJson | quote }} volumeMounts: