From ed0eb865ece09756401df9043d272cb94a308813 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Wed, 3 Oct 2018 09:39:18 -0600 Subject: [PATCH] fix backup storage location example YAMLs Signed-off-by: Steve Kriss --- .../aws/05-ark-backupstoragelocation.yaml | 5 ++-- .../azure/05-ark-backupstoragelocation.yaml | 6 ++-- .../ibm/05-ark-backupstoragelocation.yaml | 8 ++--- .../minio/05-ark-backupstoragelocation.yaml | 30 +++++++++++++++++++ examples/minio/10-ark-config.yaml | 14 --------- 5 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 examples/minio/05-ark-backupstoragelocation.yaml diff --git a/examples/aws/05-ark-backupstoragelocation.yaml b/examples/aws/05-ark-backupstoragelocation.yaml index da3abe6df..4f0c4f89e 100644 --- a/examples/aws/05-ark-backupstoragelocation.yaml +++ b/examples/aws/05-ark-backupstoragelocation.yaml @@ -22,6 +22,5 @@ spec: provider: aws objectStorage: bucket: - config: - region: - + config: + region: diff --git a/examples/azure/05-ark-backupstoragelocation.yaml b/examples/azure/05-ark-backupstoragelocation.yaml index 6e06c495a..255cc2fac 100644 --- a/examples/azure/05-ark-backupstoragelocation.yaml +++ b/examples/azure/05-ark-backupstoragelocation.yaml @@ -22,6 +22,6 @@ spec: provider: azure objectStorage: bucket: - config: - resourceGroup: - storageAccount: + config: + resourceGroup: + storageAccount: diff --git a/examples/ibm/05-ark-backupstoragelocation.yaml b/examples/ibm/05-ark-backupstoragelocation.yaml index 21f89df2b..57cbeea75 100644 --- a/examples/ibm/05-ark-backupstoragelocation.yaml +++ b/examples/ibm/05-ark-backupstoragelocation.yaml @@ -22,7 +22,7 @@ spec: provider: aws objectStorage: bucket: - config: - s3ForcePathStyle: "true" - s3Url: - region: + config: + s3ForcePathStyle: "true" + s3Url: + region: diff --git a/examples/minio/05-ark-backupstoragelocation.yaml b/examples/minio/05-ark-backupstoragelocation.yaml new file mode 100644 index 000000000..24e9b047e --- /dev/null +++ b/examples/minio/05-ark-backupstoragelocation.yaml @@ -0,0 +1,30 @@ +# Copyright 2018 the Heptio Ark contributors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +apiVersion: ark.heptio.com/v1 +kind: BackupStorageLocation +metadata: + name: default + namespace: heptio-ark +spec: + provider: aws + objectStorage: + bucket: ark + config: + region: minio + s3ForcePathStyle: "true" + s3Url: http://minio.heptio-ark.svc:9000 + + diff --git a/examples/minio/10-ark-config.yaml b/examples/minio/10-ark-config.yaml index 19dca8b19..947c0adff 100644 --- a/examples/minio/10-ark-config.yaml +++ b/examples/minio/10-ark-config.yaml @@ -18,17 +18,3 @@ kind: Config metadata: namespace: heptio-ark name: default -backupStorageProvider: - name: aws - bucket: ark - # Uncomment the below line to enable restic integration. - # The format for resticLocation is [/], - # e.g. "my-restic-bucket" or "my-restic-bucket/repos". - # This MUST be a different bucket than the main Ark bucket - # specified just above. - # resticLocation: - config: - region: minio - s3ForcePathStyle: "true" - s3Url: http://minio.heptio-ark.svc:9000 -