Skip to content

Commit fa0536f

Browse files
author
Matt Pryor
authored
Fix broken Velero CA bundle (#676)
1 parent fa758bc commit fa0536f

File tree

1 file changed

+27
-13
lines changed

1 file changed

+27
-13
lines changed

roles/velero/defaults/main.yml

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,32 @@ velero_cinder_snapshot_class_name: cinder-csi-snapshot
6060
velero_s3_plugin_image_source: velero/velero-plugin-for-aws
6161
velero_s3_plugin_image_version: v1.10.1
6262

63+
# The default backup storage location
64+
# We disable checksums because older Ceph doesn't implement them properly
65+
velero_default_backup_storage_location: >-
66+
{{-
67+
{
68+
"name": "default",
69+
"default": True,
70+
"provider": "aws",
71+
"bucket": velero_bucket_name,
72+
"credential": {
73+
"name": velero_s3_creds_secret_name,
74+
"key": "s3-creds",
75+
},
76+
"config": {
77+
"s3Url": velero_s3_url,
78+
"s3ForcePathStyle": True,
79+
"checksumAlgorithm": "",
80+
},
81+
} |
82+
combine(
83+
{"caCert": (velero_trust_bundle | b64encode)}
84+
if velero_trust_bundle
85+
else {}
86+
)
87+
}}
88+
6389
# Velero Helm chart config
6490
velero_chart_name: velero
6591
velero_chart_repo: https://vmware-tanzu.github.io/helm-charts
@@ -71,19 +97,7 @@ velero_release_defaults:
7197
configuration:
7298
features: EnableCSI
7399
backupStorageLocation:
74-
- name: default
75-
default: true
76-
provider: aws
77-
bucket: "{{ velero_bucket_name }}"
78-
credential:
79-
name: "{{ velero_s3_creds_secret_name }}"
80-
key: s3-creds
81-
config:
82-
s3Url: "{{ velero_s3_url }}"
83-
s3ForcePathStyle: true
84-
# Older Ceph doesn't implement checksums properly
85-
checksumAlgorithm: ""
86-
caCert: "{{ velero_trust_bundle }}"
100+
- "{{ velero_default_backup_storage_location }}"
87101
volumeSnapshotLocation: []
88102
initContainers:
89103
- name: velero-plugin-for-aws

0 commit comments

Comments
 (0)