diff --git a/stable/minio/Chart.yaml b/stable/minio/Chart.yaml index f3e919eae3..7bbb223b00 100755 --- a/stable/minio/Chart.yaml +++ b/stable/minio/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Minio is a high performance distributed object storage server, designed for large-scale private cloud infrastructure. name: minio -version: 2.4.8 -appVersion: RELEASE.2019-02-12T21-58-47Z +version: 2.4.9 +appVersion: RELEASE.2019-03-13T21-59-47Z keywords: - storage - object-storage diff --git a/stable/minio/README.md b/stable/minio/README.md index cc79a8759f..7dfcba9f83 100755 --- a/stable/minio/README.md +++ b/stable/minio/README.md @@ -93,10 +93,10 @@ 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.2019-02-12T21-58-47Z`| +| `image.tag` | Minio image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/).| `RELEASE.2019-03-13T21-59-47Z`| | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `mcImage.repository` | Client image repository | `minio/mc` | -| `mcImage.tag` | mc image tag. Possible values listed [here](https://hub.docker.com/r/minio/mc/tags/).| `RELEASE.2019-02-13T19-48-27Z`| +| `mcImage.tag` | mc image tag. Possible values listed [here](https://hub.docker.com/r/minio/mc/tags/).| `RELEASE.2019-03-13T21-05-06Z`| | `mcImage.pullPolicy` | mc Image pull policy | `IfNotPresent` | | `ingress.enabled` | Enables Ingress | `false` | | `ingress.annotations` | Ingress annotations | `{}` | diff --git a/stable/minio/templates/service.yaml b/stable/minio/templates/service.yaml index e641549994..3df046847c 100644 --- a/stable/minio/templates/service.yaml +++ b/stable/minio/templates/service.yaml @@ -13,11 +13,7 @@ metadata: {{- end }} spec: {{- if (or (eq .Values.service.type "ClusterIP" "") (empty .Values.service.type)) }} - {{- if eq .Values.mode "distributed" }} - clusterIP: None - {{- else }} type: ClusterIP - {{- end }} {{- if not (empty .Values.service.clusterIP) }} clusterIP: {{ .Values.service.clusterIP }} {{end}} @@ -30,10 +26,11 @@ spec: ports: - name: service port: {{ .Values.service.port }} - targetPort: 9000 protocol: TCP {{- if (and (eq .Values.service.type "NodePort") ( .Values.service.nodePort)) }} nodePort: {{ .Values.service.nodePort }} +{{- else }} + targetPort: 9000 {{- end}} {{- if .Values.service.externalIPs }} externalIPs: diff --git a/stable/minio/templates/statefulset.yaml b/stable/minio/templates/statefulset.yaml index 447b671db3..4db88bdd51 100644 --- a/stable/minio/templates/statefulset.yaml +++ b/stable/minio/templates/statefulset.yaml @@ -1,5 +1,23 @@ {{- if eq .Values.mode "distributed" }} {{ $nodeCount := .Values.replicas | int }} +apiVersion: v1 +kind: Service +metadata: + name: {{ template "minio.fullname" . }}-svc + labels: + app: {{ template "minio.name" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + clusterIP: None + ports: + - name: service + port: {{ .Values.service.port }} + protocol: TCP + selector: + app: {{ template "minio.name" . }} +--- apiVersion: apps/v1beta1 kind: StatefulSet metadata: @@ -12,7 +30,7 @@ metadata: spec: updateStrategy: type: {{ .Values.StatefulSetUpdate.updateStrategy }} - serviceName: {{ template "minio.fullname" . }} + serviceName: {{ template "minio.fullname" . }}-svc replicas: {{ .Values.replicas }} selector: matchLabels: @@ -41,22 +59,24 @@ spec: "-ce", "/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} server {{- range $i := until $nodeCount }} - https://{{ template `minio.fullname` $ }}-{{ $i }}.{{ template `minio.fullname` $ }}.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}{{ $.Values.mountPath }} + https://{{ template `minio.fullname` $ }}-{{ $i }}.{{ template `minio.fullname` $ }}-svc.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}{{ $.Values.mountPath }} {{- end }}" ] {{ else }} command: [ "/bin/sh", "-ce", "/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} server {{- range $i := until $nodeCount }} - http://{{ template `minio.fullname` $ }}-{{ $i }}.{{ template `minio.fullname` $ }}.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}{{ $.Values.mountPath }} + http://{{ template `minio.fullname` $ }}-{{ $i }}.{{ template `minio.fullname` $ }}-svc.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}{{ $.Values.mountPath }} {{- end }}" ] {{ end }} volumeMounts: + {{- if .Values.persistence.enabled }} - name: export mountPath: {{ .Values.mountPath }} {{- if and .Values.persistence.enabled .Values.persistence.subPath }} subPath: "{{ .Values.persistence.subPath }}" {{- end }} + {{ end }} - name: minio-config-dir mountPath: {{ .Values.configPath }} {{- if .Values.tls.enabled }} @@ -127,6 +147,7 @@ spec: - key: {{ .Values.tls.publicCrt }} path: CAs/public.crt {{ end }} +{{- if .Values.persistence.enabled }} volumeClaimTemplates: - metadata: name: export @@ -138,4 +159,5 @@ spec: resources: requests: storage: {{ .Values.persistence.size }} +{{ end }} {{- end }} diff --git a/stable/minio/values.yaml b/stable/minio/values.yaml index 488569cbe6..90cf957241 100755 --- a/stable/minio/values.yaml +++ b/stable/minio/values.yaml @@ -6,7 +6,7 @@ clusterDomain: cluster.local ## image: repository: minio/minio - tag: RELEASE.2019-02-12T21-58-47Z + tag: RELEASE.2019-03-13T21-59-47Z pullPolicy: IfNotPresent ## Set default image, imageTag, and imagePullPolicy for the `mc` (the minio @@ -14,7 +14,7 @@ image: ## mcImage: repository: minio/mc - tag: RELEASE.2019-02-13T19-48-27Z + tag: RELEASE.2019-03-13T21-05-06Z pullPolicy: IfNotPresent ## minio server mode, i.e. standalone or distributed. @@ -95,7 +95,7 @@ service: type: ClusterIP clusterIP: ~ port: 9000 - # nodePort: 31311 + nodePort: 31311 # externalIPs: # - externalIp1 annotations: {} @@ -237,96 +237,6 @@ environment: # 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 -## https://docs.minio.io/docs/minio-bucket-notification-guide -## https://github.com/minio/minio/blob/master/docs/config -minioConfig: - region: "us-east-1" - browser: "on" - domain: "" - worm: "off" - storageClass: - standardStorageClass: "" - reducedRedundancyStorageClass: "" - cache: - drives: [] - expiry: 90 - maxuse: 80 - exclude: [] - aqmp: - enable: false - url: "" - exchange: "" - routingKey: "" - exchangeType: "" - deliveryMode: 0 - mandatory: false - immediate: false - durable: false - internal: false - noWait: false - autoDeleted: false - nats: - enable: false - address: "" - subject: "" - username: "" - password: "" - token: "" - secure: false - pingInterval: 0 - enableStreaming: false - clusterID: "" - clientID: "" - async: false - maxPubAcksInflight: 0 - elasticsearch: - enable: false - format: "namespace" - url: "" - index: "" - redis: - enable: false - format: "namespace" - address: "" - password: "" - key: "" - postgresql: - enable: false - format: "namespace" - connectionString: "" - table: "" - host: "" - port: "" - user: "" - password: "" - database: "" - kafka: - enable: false - brokers: "null" - topic: "" - webhook: - enable: false - endpoint: "" - mysql: - enable: false - format: "namespace" - dsnString: "" - table: "" - host: "" - port: "" - user: "" - password: "" - database: "" - mqtt: - enable: false - broker: "" - topic: "" - qos: 0 - clientId: "" - username: "" - password: "" - reconnectInterval: 0 - keepAliveInterval: 0 networkPolicy: enabled: false allowExternal: true