From 2654d0910c9cedbe66527d2e12a266f484d07c8a Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Thu, 3 May 2018 21:27:52 +0530 Subject: [PATCH] Update to latest release RELEASE.2018-04-27T23-33-52Z (#4277) * Update to latest release RELEASE.2018-04-27T23-33-52Z Also removed the downward API and ConfigMap support. This is done due to https://cloud.google.com/kubernetes-engine/release- notes#march-13-2018 We can bring back the configMap support later. * Update Chart.yaml --- stable/minio/Chart.yaml | 4 +- stable/minio/README.md | 2 +- stable/minio/templates/configmap.yaml | 131 ------------------ stable/minio/templates/deployment.yaml | 18 --- .../post-install-create-bucket-job.yaml | 2 - stable/minio/templates/statefulset.yaml | 18 --- stable/minio/values.yaml | 2 +- 7 files changed, 4 insertions(+), 173 deletions(-) delete mode 100644 stable/minio/templates/configmap.yaml diff --git a/stable/minio/Chart.yaml b/stable/minio/Chart.yaml index e5cdd73d9a..12e8ac2d65 100755 --- a/stable/minio/Chart.yaml +++ b/stable/minio/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Distributed object storage server built for cloud applications and devops. name: minio -version: 1.1.1 -appVersion: RELEASE.2018-03-16T22-52-12Z +version: 1.2.0 +appVersion: RELEASE.2018-04-27T23-33-52Z keywords: - storage - object-storage diff --git a/stable/minio/README.md b/stable/minio/README.md index 2eb452a156..258bef76e0 100644 --- a/stable/minio/README.md +++ b/stable/minio/README.md @@ -75,7 +75,7 @@ The following table lists the configurable parameters of the Minio chart and the | Parameter | Description | Default | |----------------------------|-------------------------------------|---------------------------------------------------------| | `image.repository` | Image repository | `minio/minio` | -| `image.tag` | Minio image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/).| `RELEASE.2018-03-12T21-25-28Z`| +| `image.tag` | Minio image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/).| `RELEASE.2018-04-27T23-33-52Z`| | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `ingress.enabled` | Enables Ingress | `false` | | `ingress.annotations` | Ingress annotations | `{}` | diff --git a/stable/minio/templates/configmap.yaml b/stable/minio/templates/configmap.yaml deleted file mode 100644 index e1467a8b6c..0000000000 --- a/stable/minio/templates/configmap.yaml +++ /dev/null @@ -1,131 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "minio.fullname" . }} - labels: - app: {{ template "minio.name" . }} - chart: {{ template "minio.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: - initialize: |- -{{ include (print $.Template.BasePath "/_helper_create_bucket.txt") . | indent 4 }} - config.json: |- - { - "version": "22", - "credential": { - "accessKey": {{ .Values.accessKey | quote }}, - "secretKey": {{ .Values.secretKey | quote }} - }, - "region": {{ .Values.minioConfig.region | quote }}, - "browser": {{ .Values.minioConfig.browser | quote }}, - "domain": {{ .Values.minioConfig.domain | quote }}, - "storageclass": { - "standard": {{ .Values.minioConfig.standardStorageClass | quote }}, - "rrs": {{ .Values.minioConfig.reducedRedundancyStorageClass | quote }} - }, - "notify": { - "amqp": { - "1": { - "enable": {{ .Values.minioConfig.aqmp.enable }}, - "url": {{ .Values.minioConfig.aqmp.url | quote }}, - "exchange": {{ .Values.minioConfig.aqmp.exchange | quote }}, - "routingKey": {{ .Values.minioConfig.aqmp.routingKey | quote }}, - "exchangeType": {{ .Values.minioConfig.aqmp.exchangeType | quote }}, - "deliveryMode": {{ .Values.minioConfig.aqmp.deliveryMode }}, - "mandatory": {{ .Values.minioConfig.aqmp.mandatory }}, - "immediate": {{ .Values.minioConfig.aqmp.immediate }}, - "durable": {{ .Values.minioConfig.aqmp.durable }}, - "internal": {{ .Values.minioConfig.aqmp.internal }}, - "noWait": {{ .Values.minioConfig.aqmp.noWait }}, - "autoDeleted": {{ .Values.minioConfig.aqmp.autoDeleted }} - } - }, - "nats": { - "1": { - "enable": {{ .Values.minioConfig.nats.enable }}, - "address": {{ .Values.minioConfig.nats.address | quote }}, - "subject": {{ .Values.minioConfig.nats.subject | quote }}, - "username": {{ .Values.minioConfig.nats.username | quote }}, - "password": {{ .Values.minioConfig.nats.password | quote }}, - "token": {{ .Values.minioConfig.nats.token | quote }}, - "secure": {{ .Values.minioConfig.nats.secure }}, - "pingInterval": {{ .Values.minioConfig.nats.pingInterval | int64 }}, - "streaming": { - "enable": {{ .Values.minioConfig.nats.enableStreaming }}, - "clusterID": {{ .Values.minioConfig.nats.clusterID | quote }}, - "clientID": {{ .Values.minioConfig.nats.clientID | quote }}, - "async": {{ .Values.minioConfig.nats.async }}, - "maxPubAcksInflight": {{ .Values.minioConfig.nats.maxPubAcksInflight | int }} - } - } - }, - "elasticsearch": { - "1": { - "enable": {{ .Values.minioConfig.elasticsearch.enable }}, - "format": {{ .Values.minioConfig.elasticsearch.format | quote }}, - "url": {{ .Values.minioConfig.elasticsearch.url | quote }}, - "index": {{ .Values.minioConfig.elasticsearch.index | quote }} - } - }, - "redis": { - "1": { - "enable": {{ .Values.minioConfig.redis.enable }}, - "format": {{ .Values.minioConfig.redis.format | quote }}, - "address": {{ .Values.minioConfig.redis.address | quote }}, - "password": {{ .Values.minioConfig.redis.password | quote }}, - "key": {{ .Values.minioConfig.redis.key | quote }} - } - }, - "postgresql": { - "1": { - "enable": {{ .Values.minioConfig.postgresql.enable }}, - "format": {{ .Values.minioConfig.postgresql.format | quote }}, - "connectionString": {{ .Values.minioConfig.postgresql.connectionString | quote }}, - "table": {{ .Values.minioConfig.postgresql.table | quote }}, - "host": {{ .Values.minioConfig.postgresql.host | quote }}, - "port": {{ .Values.minioConfig.postgresql.port | quote }}, - "user": {{ .Values.minioConfig.postgresql.user | quote }}, - "password": {{ .Values.minioConfig.postgresql.password | quote }}, - "database": {{ .Values.minioConfig.postgresql.database | quote }} - } - }, - "kafka": { - "1": { - "enable": {{ .Values.minioConfig.kafka.enable }}, - "brokers": {{ .Values.minioConfig.kafka.brokers }}, - "topic": {{ .Values.minioConfig.kafka.topic | quote }} - } - }, - "webhook": { - "1": { - "enable": {{ .Values.minioConfig.webhook.enable }}, - "endpoint": {{ .Values.minioConfig.webhook.endpoint | quote }} - } - }, - "mysql": { - "1": { - "enable": {{ .Values.minioConfig.mysql.enable }}, - "format": {{ .Values.minioConfig.mysql.format | quote }}, - "dsnString": {{ .Values.minioConfig.mysql.dsnString | quote }}, - "table": {{ .Values.minioConfig.mysql.table | quote }}, - "host": {{ .Values.minioConfig.mysql.host | quote }}, - "port": {{ .Values.minioConfig.mysql.port | quote }}, - "user": {{ .Values.minioConfig.mysql.user | quote }}, - "password": {{ .Values.minioConfig.mysql.password | quote }}, - "database": {{ .Values.minioConfig.mysql.database | quote }} - } - }, - "mqtt": { - "1": { - "enable": {{ .Values.minioConfig.mqtt.enable }}, - "broker": {{ .Values.minioConfig.mqtt.broker | quote }}, - "topic": {{ .Values.minioConfig.mqtt.topic | quote }}, - "qos": {{ .Values.minioConfig.mqtt.qos | int }}, - "clientId": {{ .Values.minioConfig.mqtt.clientId | quote }}, - "username": {{ .Values.minioConfig.mqtt.username | quote }}, - "password": {{ .Values.minioConfig.mqtt.password | quote }} - } - } - } - } diff --git a/stable/minio/templates/deployment.yaml b/stable/minio/templates/deployment.yaml index be29254143..3ab375c94c 100644 --- a/stable/minio/templates/deployment.yaml +++ b/stable/minio/templates/deployment.yaml @@ -46,15 +46,6 @@ spec: {{- if and .Values.persistence.enabled .Values.persistence.subPath }} subPath: "{{ .Values.persistence.subPath }}" {{- end }} - - name: minio-server-config - mountPath: {{ default "/root/.minio/config.json" .Values.configPath | quote }} - subPath: config.json - - name: minio-server-config - mountPath: /root/.minio/initialize - subPath: initialize - - name: podinfo - mountPath: /podinfo - readOnly: false {{- if .Values.gcsgateway.enabled }} - name: minio-user mountPath: "/etc/credentials" @@ -97,12 +88,6 @@ spec: {{ toYaml . | indent 8 }} {{- end }} volumes: - - name: podinfo - downwardAPI: - items: - - path: "labels" - fieldRef: - fieldPath: metadata.labels - name: export {{- if .Values.persistence.enabled }} persistentVolumeClaim: @@ -110,9 +95,6 @@ spec: {{- else }} emptyDir: {} {{- end }} - - name: minio-server-config - configMap: - name: {{ template "minio.fullname" . }} - name: minio-user secret: secretName: {{ template "minio.fullname" . }} diff --git a/stable/minio/templates/post-install-create-bucket-job.yaml b/stable/minio/templates/post-install-create-bucket-job.yaml index e1fc61859a..4f875eb138 100644 --- a/stable/minio/templates/post-install-create-bucket-job.yaml +++ b/stable/minio/templates/post-install-create-bucket-job.yaml @@ -27,8 +27,6 @@ spec: - name: minio-configuration projected: sources: - - configMap: - name: {{ template "minio.fullname" . }} - secret: name: {{ template "minio.fullname" . }} containers: diff --git a/stable/minio/templates/statefulset.yaml b/stable/minio/templates/statefulset.yaml index ba84c59a8d..85f0d39394 100644 --- a/stable/minio/templates/statefulset.yaml +++ b/stable/minio/templates/statefulset.yaml @@ -43,15 +43,6 @@ spec: {{- if and .Values.persistence.enabled .Values.persistence.subPath }} subPath: "{{ .Values.persistence.subPath }}" {{- end }} - - name: minio-server-config - mountPath: {{ default "/root/.minio/config.json" .Values.configPath | quote }} - subPath: config.json - - name: minio-server-config - mountPath: /root/.minio/initialize - subPath: initialize - - name: podinfo - mountPath: /podinfo - readOnly: false ports: - name: service containerPort: 9000 @@ -84,15 +75,6 @@ spec: - name: minio-user secret: secretName: {{ template "minio.fullname" . }} - - name: minio-server-config - configMap: - name: {{ template "minio.fullname" . }} - - name: podinfo - downwardAPI: - items: - - path: "labels" - fieldRef: - fieldPath: metadata.labels volumeClaimTemplates: - metadata: name: export diff --git a/stable/minio/values.yaml b/stable/minio/values.yaml index 840aee097b..aa3cfecbee 100644 --- a/stable/minio/values.yaml +++ b/stable/minio/values.yaml @@ -4,7 +4,7 @@ ## image: repository: minio/minio - tag: RELEASE.2018-03-16T22-52-12Z + tag: RELEASE.2018-04-27T23-33-52Z pullPolicy: IfNotPresent mode: standalone