velero-minio: merge upstream changes (#498)

* velero-minio: merge upstream changes Merge upstream changes. We need the following fix for a problem we discovered in e2e: minio/minio#8884 minio/minio#8964 Merged the following upstream chart changes: helm/charts#21315 helm/charts#21318 Killed one patch as the fix has been upstreamed. * velero: bump minio dependency Bump the minio dependency to 5.0.14.
mesosphere · Mar 11, 2020 · 5327e6a · 5327e6a
1 parent 4f85149
commit 5327e6a
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 39 deletions.
diff --git a/staging/velero/Chart.yaml b/staging/velero/Chart.yaml
@@ -16,4 +16,4 @@ name: velero
 sources:
 - https://github.com/heptio/velero
 tillerVersion: '>=2.10.0'
-version: 3.0.0
+version: 3.0.1
diff --git a/staging/velero/charts/minio/Chart.yaml b/staging/velero/charts/minio/Chart.yaml
@@ -16,4 +16,4 @@ maintainers:
 name: minio
 sources:
 - https://github.com/minio/minio
-version: 5.0.12
+version: 5.0.14
diff --git a/staging/velero/charts/minio/patches/01-ingress-allow-empty-host-rule.patch b/staging/velero/charts/minio/patches/01-ingress-allow-empty-host-rule.patch
diff --git a/staging/velero/charts/minio/templates/deployment.yaml b/staging/velero/charts/minio/templates/deployment.yaml
@@ -49,6 +49,7 @@ spec:
 {{ toYaml .Values.podLabels | indent 8 }}
 {{- end }}
       annotations:
+        rollme: {{ randAlphaNum 5 | quote }}
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
 {{- if .Values.podAnnotations }}

diff --git a/staging/velero/charts/minio/templates/statefulset.yaml b/staging/velero/charts/minio/templates/statefulset.yaml
@@ -66,6 +66,7 @@ spec:
 {{ toYaml .Values.podLabels | indent 8 }}
 {{- end }}
       annotations:
+        rollme: {{ randAlphaNum 5 | quote }}
         checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
 {{- if .Values.podAnnotations }}

diff --git a/staging/velero/charts/minio/values.yaml b/staging/velero/charts/minio/values.yaml
@@ -14,15 +14,15 @@ clusterDomain: cluster.local
 ##
 image:
   repository: minio/minio
-  tag: RELEASE.2020-02-07T23-28-16Z
+  tag: RELEASE.2020-03-06T22-23-56Z
   pullPolicy: IfNotPresent
 
 ## Set default image, imageTag, and imagePullPolicy for the `mc` (the minio
 ## client used to create a default bucket).
 ##
 mcImage:
   repository: minio/mc
-  tag: RELEASE.2020-02-14T19-35-50Z
+  tag: RELEASE.2020-03-06T23-29-45Z
   pullPolicy: IfNotPresent
 
 ## minio server mode, i.e. standalone or distributed.
@@ -278,27 +278,7 @@ b2gateway:
 ## Use this field to add environment variables relevant to Minio server. These fields will be passed on to Minio container(s)
 ## when Chart is deployed
 environment:
-  ## To disable Minio Browser, set this value to off
-  MINIO_BROWSER: "on"
-  ## To enable virtual-host-style requests, set this value to Minio host domain name.
-  # MINIO_DOMAIN: ""
-  ## Minio Cache settings, refer: https://docs.minio.io/docs/minio-disk-cache-guide.html
-  # MINIO_CACHE_DRIVES: ""
-  # MINIO_CACHE_EXCLUDE: ""
-  # MINIO_CACHE_EXPIRY: ""
-  # MINIO_CACHE_MAXUSE: ""
-  ## Minio WORM setting, refer: https://docs.minio.io/docs/minio-server-configuration-guide.html
-  # MINIO_WORM: ""
-  ## Minio KMS settings, refer: https://docs.minio.io/docs/minio-kms-quickstart-guide.html
-  # MINIO_SSE_VAULT_ENDPOINT: ""
-  # MINIO_SSE_VAULT_APPROLE_ID: ""
-  # MINIO_SSE_VAULT_APPROLE_SECRET: ""
-  # MINIO_SSE_VAULT_KEY_NAME: ""
-  ## Minio Federation settings, refer: https://docs.minio.io/docs/minio-federation-quickstart-guide.html
-  # MINIO_ETCD_ENDPOINTS: ""
-  # MINIO_PUBLIC_IPS: ""
-  # MINIO_DOMAIN: ""
-  ## Add other environment variables relevant to Minio server here. These values will be added to the container(s) as this Chart is deployed
+  ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html
 
 networkPolicy:
   enabled: false

diff --git a/staging/velero/requirements.lock b/staging/velero/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: minio
   repository: ""
-  version: 5.0.12
-digest: sha256:45c042c822702c21da0db4b210f03a758eb4946c64020f111f1635284516dfbc
-generated: "2020-03-06T17:38:38.495806-08:00"
+  version: 5.0.14
+digest: sha256:7f285ca57cb5522f54ac2406de23e06c6c2633c07a91b3e199eb75d05842b4cf
+generated: "2020-03-10T20:39:35.787163-07:00"
diff --git a/staging/velero/requirements.yaml b/staging/velero/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
 - name: minio
-  version: 5.0.12
+  version: 5.0.14
   condition: minioBackend