diff --git a/helm-releases/minio-3.4.1.tgz b/helm-releases/minio-3.4.1.tgz new file mode 100644 index 000000000..18dff8648 Binary files /dev/null and b/helm-releases/minio-3.4.1.tgz differ diff --git a/helm/minio/Chart.yaml b/helm/minio/Chart.yaml index 34242cc7c..7c83149b3 100644 --- a/helm/minio/Chart.yaml +++ b/helm/minio/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Multi-Cloud Object Storage name: minio -version: 3.4.0 -appVersion: RELEASE.2021-12-18T04-42-33Z +version: 3.4.1 +appVersion: RELEASE.2021-12-10T23-03-39Z keywords: - minio - storage diff --git a/helm/minio/templates/deployment.yaml b/helm/minio/templates/deployment.yaml index fec9e304a..8258ffb59 100644 --- a/helm/minio/templates/deployment.yaml +++ b/helm/minio/templates/deployment.yaml @@ -99,6 +99,26 @@ spec: - name: MINIO_PROMETHEUS_AUTH_TYPE value: "public" {{- end}} + {{- if .Values.etcd.endpoints }} + - name: MINIO_ETCD_ENDPOINTS + value: {{ join "," .Values.etcd.endpoints | quote }} + {{- if .Values.etcd.clientCert }} + - name: MINIO_ETCD_CLIENT_CERT + value: "/etc/credentials/etcd_client_cert.pem" + {{- end }} + {{- if .Values.etcd.clientCertKey }} + - name: MINIO_ETCD_CLIENT_CERT_KEY + value: "/etc/credentials/etcd_client_cert_key.pem" + {{- end }} + {{- if .Values.etcd.pathPrefix }} + - name: MINIO_ETCD_PATH_PREFIX + value: {{ .Values.etcd.pathPrefix }} + {{- end }} + {{- if .Values.etcd.corednsPathPrefix }} + - name: MINIO_ETCD_COREDNS_PATH + value: {{ .Values.etcd.corednsPathPrefix }} + {{- end }} + {{- end }} {{- range $key, $val := .Values.environment }} - name: {{ $key }} value: {{ $val | quote }} diff --git a/helm/minio/templates/gateway-deployment.yaml b/helm/minio/templates/gateway-deployment.yaml index b1457ebc4..44d31510a 100644 --- a/helm/minio/templates/gateway-deployment.yaml +++ b/helm/minio/templates/gateway-deployment.yaml @@ -107,12 +107,32 @@ spec: key: rootPassword {{- if eq .Values.gateway.type "gcs" }} - name: GOOGLE_APPLICATION_CREDENTIALS - value: "/tmp/gcs-credentials/service-account-file.json"" + value: "/tmp/gcs-credentials/service-account-file.json" {{- end }} {{- if .Values.metrics.serviceMonitor.public }} - name: MINIO_PROMETHEUS_AUTH_TYPE value: "public" {{- end}} + {{- if .Values.etcd.endpoints }} + - name: MINIO_ETCD_ENDPOINTS + value: {{ join "," .Values.etcd.endpoints | quote }} + {{- if .Values.etcd.clientCert }} + - name: MINIO_ETCD_CLIENT_CERT + value: "/etc/credentials/etcd_client_cert.pem" + {{- end }} + {{- if .Values.etcd.clientCertKey }} + - name: MINIO_ETCD_CLIENT_CERT_KEY + value: "/etc/credentials/etcd_client_cert_key.pem" + {{- end }} + {{- if .Values.etcd.pathPrefix }} + - name: MINIO_ETCD_PATH_PREFIX + value: {{ .Values.etcd.pathPrefix }} + {{- end }} + {{- if .Values.etcd.corednsPathPrefix }} + - name: MINIO_ETCD_COREDNS_PATH + value: {{ .Values.etcd.corednsPathPrefix }} + {{- end }} + {{- end }} {{- range $key, $val := .Values.environment }} - name: {{ $key }} value: {{ $val | quote }} diff --git a/helm/minio/templates/secrets.yaml b/helm/minio/templates/secrets.yaml index 994429146..661887596 100644 --- a/helm/minio/templates/secrets.yaml +++ b/helm/minio/templates/secrets.yaml @@ -14,6 +14,8 @@ data: rootUser: {{ if .Values.rootUser }}{{ .Values.rootUser | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }} rootPassword: {{ if .Values.rootPassword }}{{ .Values.rootPassword | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }} {{- if eq .Values.gateway.type "gcs" }} + {{- if .Values.gateway.gcs.serviceAccountFile }} service-account-file.json: {{ .Values.gateway.gcs.serviceAccountFile | b64enc }} {{- end }} + {{- end }} {{- end }} diff --git a/helm/minio/templates/servicemonitor.yaml b/helm/minio/templates/servicemonitor.yaml index cdf71b048..809848f16 100644 --- a/helm/minio/templates/servicemonitor.yaml +++ b/helm/minio/templates/servicemonitor.yaml @@ -31,6 +31,9 @@ spec: {{- end }} {{- if .Values.metrics.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.relabelConfigs }} +{{ toYaml .Values.metrics.serviceMonitor.relabelConfigs | indent 6 }} {{- end }} {{- if not .Values.metrics.serviceMonitor.public }} bearerTokenSecret: diff --git a/helm/minio/values.yaml b/helm/minio/values.yaml index e64f16e10..6bf6c685f 100644 --- a/helm/minio/values.yaml +++ b/helm/minio/values.yaml @@ -14,7 +14,7 @@ clusterDomain: cluster.local ## image: repository: quay.io/minio/minio - tag: RELEASE.2021-11-24T23-19-33Z + tag: RELEASE.2021-12-10T23-03-39Z pullPolicy: IfNotPresent imagePullSecrets: [] @@ -25,16 +25,11 @@ imagePullSecrets: [] ## mcImage: repository: quay.io/minio/mc - tag: RELEASE.2021-11-16T20-37-36Z + tag: RELEASE.2021-12-16T23-38-39Z pullPolicy: IfNotPresent -## minio mode, i.e. standalone or distributed or gateway (nas,gcs) -## Distributed MinIO ref: https://docs.minio.io/docs/distributed-minio-quickstart-guide -## NAS Gateway MinIO ref: https://docs.min.io/docs/minio-gateway-for-nas.html -## GCS Gateway MinIO ref: https://docs.min.io/docs/minio-gateway-for-gcs.html -mode: distributed - -## NOTE: currently only "nas,gcs" gateways are supported. +## minio mode, i.e. standalone or distributed or gateway. +mode: distributed ## other supported values are "standalone", "gateway" ## Additional labels to include with deployment or statefulset additionalLabels: [] @@ -342,8 +337,18 @@ serviceAccount: metrics: serviceMonitor: enabled: false - additionalLabels: {} public: true + additionalLabels: {} + relabelConfigs: {} # namespace: monitoring # interval: 30s # scrapeTimeout: 10s + +## ETCD settings: https://github.com/minio/minio/blob/master/docs/sts/etcd.md +## Define endpoints to enable this section. +etcd: + endpoints: [] + pathPrefix: "" + corednsPathPrefix: "" + clientCert: "" + clientCertKey: "" diff --git a/index.yaml b/index.yaml index 8f471bd88..cad4dacfe 100644 --- a/index.yaml +++ b/index.yaml @@ -1,9 +1,31 @@ apiVersion: v1 entries: minio: + - apiVersion: v1 + appVersion: RELEASE.2021-12-10T23-03-39Z + created: "2021-12-20T13:11:21.805850376-08:00" + description: Multi-Cloud Object Storage + digest: 2fb822c87216ba3fc2ae51a54a0a3e239aa560d86542991504a841cc2a2b9a37 + home: https://min.io + icon: https://min.io/resources/img/logo/MINIO_wordmark.png + keywords: + - minio + - storage + - object-storage + - s3 + - cluster + maintainers: + - email: dev@minio.io + name: MinIO, Inc + name: minio + sources: + - https://github.com/minio/minio + urls: + - https://charts.min.io/helm-releases/minio-3.4.1.tgz + version: 3.4.1 - apiVersion: v1 appVersion: RELEASE.2021-12-18T04-42-33Z - created: "2021-12-19T14:32:39.014758401-08:00" + created: "2021-12-20T13:11:21.803553457-08:00" description: Multi-Cloud Object Storage digest: fa8ba1aeb1a15316c6be8403416a5e6b5e6139b7166592087e7bddc9e6db5453 home: https://min.io @@ -25,7 +47,7 @@ entries: version: 3.4.0 - apiVersion: v1 appVersion: RELEASE.2021-12-10T23-03-39Z - created: "2021-12-19T14:32:39.012538599-08:00" + created: "2021-12-20T13:11:21.801185087-08:00" description: Multi-Cloud Object Storage digest: b9b0af9ca50b8d00868e1f1b989dca275829d9110af6de91bb9b3a398341e894 home: https://min.io @@ -47,7 +69,7 @@ entries: version: 3.3.4 - apiVersion: v1 appVersion: RELEASE.2021-12-10T23-03-39Z - created: "2021-12-19T14:32:39.008044762-08:00" + created: "2021-12-20T13:11:21.798994584-08:00" description: Multi-Cloud Object Storage digest: f8b22a5b8fe95a7ddf61b825e17d11c9345fb10e4c126b0d78381608aa300a08 home: https://min.io @@ -69,7 +91,7 @@ entries: version: 3.3.3 - apiVersion: v1 appVersion: RELEASE.2021-12-10T23-03-39Z - created: "2021-12-19T14:32:39.004826352-08:00" + created: "2021-12-20T13:11:21.796635725-08:00" description: Multi-Cloud Object Storage digest: c48d474f269427abe5ab446f00687d0625b3d1adfc5c73bdb4b21ca9e42853fb home: https://min.io @@ -91,7 +113,7 @@ entries: version: 3.3.2 - apiVersion: v1 appVersion: RELEASE.2021-11-24T23-19-33Z - created: "2021-12-19T14:32:39.002011921-08:00" + created: "2021-12-20T13:11:21.793902719-08:00" description: Multi-Cloud Object Storage digest: 7c3da39d9b0090cbf5efedf0cc163a1e2df05becc5152c3add8e837384690bc4 home: https://min.io @@ -113,7 +135,7 @@ entries: version: 3.3.1 - apiVersion: v1 appVersion: RELEASE.2021-11-24T23-19-33Z - created: "2021-12-19T14:32:38.998779651-08:00" + created: "2021-12-20T13:11:21.791041735-08:00" description: Multi-Cloud Object Storage digest: 50d6590b4cc779c40f81cc13b1586fbe508aa7f3230036c760bfc5f4154fbce4 home: https://min.io @@ -135,7 +157,7 @@ entries: version: 3.3.0 - apiVersion: v1 appVersion: RELEASE.2021-10-13T00-23-17Z - created: "2021-12-19T14:32:38.995776774-08:00" + created: "2021-12-20T13:11:21.788803319-08:00" description: Multi-Cloud Object Storage digest: 5b797b7208cd904c11a76cd72938c8652160cb5fcd7f09fa41e4e703e6d64054 home: https://min.io @@ -157,7 +179,7 @@ entries: version: 3.2.0 - apiVersion: v1 appVersion: RELEASE.2021-10-10T16-53-30Z - created: "2021-12-19T14:32:38.992918507-08:00" + created: "2021-12-20T13:11:21.786482393-08:00" description: Multi-Cloud Object Storage digest: e084ac4bb095f071e59f8f08bd092e4ab2404c1ddadacfdce7dbe248f1bafff8 home: https://min.io @@ -179,7 +201,7 @@ entries: version: 3.1.9 - apiVersion: v1 appVersion: RELEASE.2021-10-06T23-36-31Z - created: "2021-12-19T14:32:38.990058302-08:00" + created: "2021-12-20T13:11:21.783932388-08:00" description: Multi-Cloud Object Storage digest: 2890430a8d9487d1fa5508c26776e4881d0086b2c052aa6bdc65c0e4423b9159 home: https://min.io @@ -201,7 +223,7 @@ entries: version: 3.1.8 - apiVersion: v1 appVersion: RELEASE.2021-10-02T16-31-05Z - created: "2021-12-19T14:32:38.986746986-08:00" + created: "2021-12-20T13:11:21.781558891-08:00" description: Multi-Cloud Object Storage digest: 01a92196af6c47e3a01e1c68d7cf693a8bc487cba810c2cecff155071e4d6a11 home: https://min.io @@ -223,7 +245,7 @@ entries: version: 3.1.7 - apiVersion: v1 appVersion: RELEASE.2021-09-18T18-09-59Z - created: "2021-12-19T14:32:38.98159982-08:00" + created: "2021-12-20T13:11:21.779232568-08:00" description: Multi-Cloud Object Storage digest: e779d73f80b75f33b9c9d995ab10fa455c9c57ee575ebc54e06725a64cd04310 home: https://min.io @@ -245,7 +267,7 @@ entries: version: 3.1.6 - apiVersion: v1 appVersion: RELEASE.2021-09-18T18-09-59Z - created: "2021-12-19T14:32:38.978934023-08:00" + created: "2021-12-20T13:11:21.77564867-08:00" description: Multi-Cloud Object Storage digest: 19de4bbc8a400f0c2a94c5e85fc25c9bfc666e773fb3e368dd621d5a57dd1c2a home: https://min.io @@ -267,7 +289,7 @@ entries: version: 3.1.5 - apiVersion: v1 appVersion: RELEASE.2021-09-18T18-09-59Z - created: "2021-12-19T14:32:38.976770532-08:00" + created: "2021-12-20T13:11:21.773359819-08:00" description: Multi-Cloud Object Storage digest: f789d93a171296dd01af0105a5ce067c663597afbb2432faeda293b752b355c0 home: https://min.io @@ -289,7 +311,7 @@ entries: version: 3.1.4 - apiVersion: v1 appVersion: RELEASE.2021-09-09T21-37-07Z - created: "2021-12-19T14:32:38.974328561-08:00" + created: "2021-12-20T13:11:21.77142276-08:00" description: Multi-Cloud Object Storage digest: e2eb34d31560b012ef6581f0ff6004ea4376c968cbe0daed2d8f3a614a892afb home: https://min.io @@ -311,7 +333,7 @@ entries: version: 3.1.3 - apiVersion: v1 appVersion: RELEASE.2021-09-09T21-37-07Z - created: "2021-12-19T14:32:38.971056764-08:00" + created: "2021-12-20T13:11:21.769783078-08:00" description: Multi-Cloud Object Storage digest: 8d7e0cc46b3583abd71b97dc0c071f98321101f90eca17348f1e9e0831be64cd home: https://min.io @@ -333,7 +355,7 @@ entries: version: 3.1.2 - apiVersion: v1 appVersion: RELEASE.2021-09-09T21-37-07Z - created: "2021-12-19T14:32:38.968078558-08:00" + created: "2021-12-20T13:11:21.768110975-08:00" description: Multi-Cloud Object Storage digest: 50dcbf366b1b21f4a6fc429d0b884c0c7ff481d0fb95c5e9b3ae157c348dd124 home: https://min.io @@ -355,7 +377,7 @@ entries: version: 3.1.1 - apiVersion: v1 appVersion: RELEASE.2021-09-09T21-37-07Z - created: "2021-12-19T14:32:38.964937263-08:00" + created: "2021-12-20T13:11:21.766380879-08:00" description: Multi-Cloud Object Storage digest: 6c01af55d2e2e5f716eabf6fef3a92a8464d0674529e9bacab292e5478a73b7a home: https://min.io @@ -377,7 +399,7 @@ entries: version: 3.1.0 - apiVersion: v1 appVersion: RELEASE.2021-09-03T03-56-13Z - created: "2021-12-19T14:32:38.95788452-08:00" + created: "2021-12-20T13:11:21.764505448-08:00" description: Multi-Cloud Object Storage digest: 18e10be4d0458bc590ca9abf753227e0c70f60511495387b8d4fb15a4daf932e home: https://min.io @@ -399,7 +421,7 @@ entries: version: 3.0.2 - apiVersion: v1 appVersion: RELEASE.2021-08-31T05-46-54Z - created: "2021-12-19T14:32:38.955701276-08:00" + created: "2021-12-20T13:11:21.761722954-08:00" description: Multi-Cloud Object Storage digest: f5b6e7f6272a9e71aef3b75555f6f756a39eef65cb78873f26451dba79b19906 home: https://min.io @@ -421,7 +443,7 @@ entries: version: 3.0.1 - apiVersion: v1 appVersion: RELEASE.2021-08-31T05-46-54Z - created: "2021-12-19T14:32:38.953517071-08:00" + created: "2021-12-20T13:11:21.759957883-08:00" description: Multi-Cloud Object Storage digest: 6d2ee1336c412affaaf209fdb80215be2a6ebb23ab2443adbaffef9e7df13fab home: https://min.io @@ -443,7 +465,7 @@ entries: version: 3.0.0 - apiVersion: v1 appVersion: RELEASE.2021-08-31T05-46-54Z - created: "2021-12-19T14:32:38.951097838-08:00" + created: "2021-12-20T13:11:21.758112896-08:00" description: Multi-Cloud Object Storage digest: 0a004aaf5bb61deed6a5c88256d1695ebe2f9ff1553874a93e4acfd75e8d339b home: https://min.io @@ -463,7 +485,7 @@ entries: version: 2.0.1 - apiVersion: v1 appVersion: RELEASE.2021-08-25T00-41-18Z - created: "2021-12-19T14:32:38.948705877-08:00" + created: "2021-12-20T13:11:21.75607997-08:00" description: Multi-Cloud Object Storage digest: fcd944e837ee481307de6aa3d387ea18c234f995a84c15abb211aab4a4054afc home: https://min.io @@ -483,7 +505,7 @@ entries: version: 2.0.0 - apiVersion: v1 appVersion: RELEASE.2021-08-25T00-41-18Z - created: "2021-12-19T14:32:38.946563903-08:00" + created: "2021-12-20T13:11:21.754018981-08:00" description: Multi-Cloud Object Storage digest: 7b6c033d43a856479eb493ab8ca05b230f77c3e42e209e8f298fac6af1a9796f home: https://min.io @@ -503,7 +525,7 @@ entries: version: 1.0.5 - apiVersion: v1 appVersion: RELEASE.2021-08-25T00-41-18Z - created: "2021-12-19T14:32:38.944367454-08:00" + created: "2021-12-20T13:11:21.752215169-08:00" description: Multi-Cloud Object Storage digest: abd221245ace16c8e0c6c851cf262d1474a5219dcbf25c4b2e7b77142f9c59ed home: https://min.io @@ -523,7 +545,7 @@ entries: version: 1.0.4 - apiVersion: v1 appVersion: RELEASE.2021-08-20T18-32-01Z - created: "2021-12-19T14:32:38.940785155-08:00" + created: "2021-12-20T13:11:21.750956721-08:00" description: Multi-Cloud Object Storage digest: 922a333f5413d1042f7aa81929f43767f6ffca9b260c46713f04ce1dda86d57d home: https://min.io @@ -543,7 +565,7 @@ entries: version: 1.0.3 - apiVersion: v1 appVersion: RELEASE.2021-08-20T18-32-01Z - created: "2021-12-19T14:32:38.93772422-08:00" + created: "2021-12-20T13:11:21.749163024-08:00" description: High Performance, Kubernetes Native Object Storage digest: 10e22773506bbfb1c66442937956534cf4057b94f06a977db78b8cd223588388 home: https://min.io @@ -563,7 +585,7 @@ entries: version: 1.0.2 - apiVersion: v1 appVersion: RELEASE.2021-08-20T18-32-01Z - created: "2021-12-19T14:32:38.935751827-08:00" + created: "2021-12-20T13:11:21.748011218-08:00" description: High Performance, Kubernetes Native Object Storage digest: ef86ab6df23d6942705da9ef70991b649638c51bc310587d37a425268ba4a06c home: https://min.io @@ -583,7 +605,7 @@ entries: version: 1.0.1 - apiVersion: v1 appVersion: RELEASE.2021-08-17T20-53-08Z - created: "2021-12-19T14:32:38.93326741-08:00" + created: "2021-12-20T13:11:21.746821107-08:00" description: High Performance, Kubernetes Native Object Storage digest: 1add7608692cbf39aaf9b1252530e566f7b2f306a14e390b0f49b97a20f2b188 home: https://min.io @@ -601,4 +623,4 @@ entries: urls: - https://charts.min.io/helm-releases/minio-1.0.0.tgz version: 1.0.0 -generated: "2021-12-19T14:32:38.929796506-08:00" +generated: "2021-12-20T13:11:21.745489875-08:00"