From f07feec389b6fdd9b9781145a5671828307e169a Mon Sep 17 00:00:00 2001 From: Jie Yu Date: Fri, 10 Apr 2020 09:13:43 -0700 Subject: [PATCH 1/2] velero: copy from previous revision Copy from previous revision. --- addons/velero/1.0.x/velero-5.yaml | 117 ++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 addons/velero/1.0.x/velero-5.yaml diff --git a/addons/velero/1.0.x/velero-5.yaml b/addons/velero/1.0.x/velero-5.yaml new file mode 100644 index 00000000..a7be426a --- /dev/null +++ b/addons/velero/1.0.x/velero-5.yaml @@ -0,0 +1,117 @@ +--- +# ------------------------------------------------------------------------------ +# Velero +# +# +# Velero is an open source backup and migration tool for Kubernetes. +# See more about Velero at: +# +# * https://velero.io/ +# * https://github.com/heptio/velero +# * https://github.com/helm/charts/tree/master/stable/velero +# +# +# Implementation +# +# +# Our implementation of Velero currently supports S3 backends for storage, and by default if no configuration overrides are +# provided to point it at a backend other than the default, we will create and manage a distributed Minio (https://min.io/) +# cluster which uses the default storage class for the cluster to maintain the backups. +# +# +# WARNING: using the default (fallback) backend is for testing purposes only and should not be used in production. +# ------------------------------------------------------------------------------ +apiVersion: kubeaddons.mesosphere.io/v1beta1 +kind: ClusterAddon +metadata: + name: velero + labels: + kubeaddons.mesosphere.io/name: velero + # TODO: we're temporarily supporting dependency on an existing default storage class + # on the cluster, this hack will trigger re-queue on Addons until one exists. + kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true" + annotations: + catalog.kubeaddons.mesosphere.io/addon-revision: "1.0.1-4" + values.chart.helm.kubeaddons.mesosphere.io/velero: "https://raw.githubusercontent.com/mesosphere/charts/5327e6a54fe70df550e894fd754541a4f71a9054/staging/velero/values.yaml" +spec: + namespace: velero + kubernetes: + minSupportedVersion: v1.15.6 + cloudProvider: + - name: aws + enabled: true + - name: azure + enabled: true + - name: gcp + enabled: true + - name: none + enabled: true + requires: + - matchLabels: + kubeaddons.mesosphere.io/provides: ingresscontroller + chartReference: + chart: velero + repo: https://mesosphere.github.io/charts/staging + version: 3.0.2 + values: | + --- + configuration: + provider: "aws" + backupStorageLocation: + name: "aws" + bucket: "velero" + config: + region: "fallback" # enables non-production fallback minio backend + s3ForcePathStyle: true # allows usage of fallback backend + s3Url: http://minio.velero.svc:9000 + volumeSnapshotLocation: + name: "aws" + config: + region: "fallback" + credentials: + secretContents: + cloud: "placeholder" + schedules: + default: + schedule: "0 0 * * *" + metrics: + enabled: true + service: + labels: + servicemonitor.kubeaddons.mesosphere.io/path: "metrics" + initContainers: + - name: initialize-velero + image: mesosphere/kubeaddons-addon-initializer:v0.2.5 + args: ["velero"] + env: + - name: "VELERO_MINIO_FALLBACK_SECRET_NAME" + value: "velero-kubeaddons" + minioBackend: true + minio: + mode: distributed + defaultBucket: + enabled: true + name: velero + bucketRoot: "/data" + mountPath: "/data" + existingSecret: minio-creds-secret + livenessProbe: + initialDelaySeconds: 120 + periodSeconds: 20 + resources: + requests: + memory: 256Mi + cpu: 250m + limits: + memory: 512Mi + cpu: 750m + persistence: + volumeTemplatePrefix: data + statefulSetNameOverride: minio + ingress: + enabled: true + hosts: + - "" + annotations: + kubernetes.io/ingress.class: traefik + traefik.ingress.kubernetes.io/frontend-entry-points: velero-minio From 85a7c74752e404fa6b28abdd8af3a4c30d601dc4 Mon Sep 17 00:00:00 2001 From: Jie Yu Date: Fri, 10 Apr 2020 09:24:09 -0700 Subject: [PATCH 2/2] velero: bump minio to include some fix We mainly need the following fix to fix some flakyness during initialization. https://github.com/minio/minio/issues/9277 https://github.com/minio/minio/pull/9278 --- addons/velero/1.0.x/velero-5.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/velero/1.0.x/velero-5.yaml b/addons/velero/1.0.x/velero-5.yaml index a7be426a..ea8decb4 100644 --- a/addons/velero/1.0.x/velero-5.yaml +++ b/addons/velero/1.0.x/velero-5.yaml @@ -31,7 +31,7 @@ metadata: # on the cluster, this hack will trigger re-queue on Addons until one exists. kubeaddons.mesosphere.io/hack-requires-defaultstorageclass: "true" annotations: - catalog.kubeaddons.mesosphere.io/addon-revision: "1.0.1-4" + catalog.kubeaddons.mesosphere.io/addon-revision: "1.0.1-5" values.chart.helm.kubeaddons.mesosphere.io/velero: "https://raw.githubusercontent.com/mesosphere/charts/5327e6a54fe70df550e894fd754541a4f71a9054/staging/velero/values.yaml" spec: namespace: velero @@ -52,7 +52,7 @@ spec: chartReference: chart: velero repo: https://mesosphere.github.io/charts/staging - version: 3.0.2 + version: 3.0.3 values: | --- configuration: @@ -108,6 +108,7 @@ spec: persistence: volumeTemplatePrefix: data statefulSetNameOverride: minio + statefulSetForceCleanup: true ingress: enabled: true hosts: