diff --git a/charts/ipfs/1.0.1/charts/common-2101.0.0.tgz b/charts/ipfs/1.0.1/charts/common-2101.0.0.tgz deleted file mode 100644 index 3a22457ea6..0000000000 Binary files a/charts/ipfs/1.0.1/charts/common-2101.0.0.tgz and /dev/null differ diff --git a/charts/ipfs/1.0.1/.helmignore b/charts/ipfs/1.0.2/.helmignore similarity index 100% rename from charts/ipfs/1.0.1/.helmignore rename to charts/ipfs/1.0.2/.helmignore diff --git a/charts/ipfs/1.0.1/Chart.yaml b/charts/ipfs/1.0.2/Chart.yaml similarity index 92% rename from charts/ipfs/1.0.1/Chart.yaml rename to charts/ipfs/1.0.2/Chart.yaml index 867b84777b..db7566b469 100644 --- a/charts/ipfs/1.0.1/Chart.yaml +++ b/charts/ipfs/1.0.2/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Global, Versioned, peer-to-peer filesystem. name: ipfs -version: 1.0.1 -appVersion: master +version: 1.0.2 +appVersion: v0.8.0 keywords: - storage - p2p diff --git a/charts/ipfs/1.0.1/README.md b/charts/ipfs/1.0.2/README.md similarity index 100% rename from charts/ipfs/1.0.1/README.md rename to charts/ipfs/1.0.2/README.md diff --git a/charts/ipfs/1.0.1/app-readme.md b/charts/ipfs/1.0.2/app-readme.md similarity index 100% rename from charts/ipfs/1.0.1/app-readme.md rename to charts/ipfs/1.0.2/app-readme.md diff --git a/charts/ipfs/1.0.2/charts/common-2101.0.0.tgz b/charts/ipfs/1.0.2/charts/common-2101.0.0.tgz new file mode 100644 index 0000000000..91e9592a56 Binary files /dev/null and b/charts/ipfs/1.0.2/charts/common-2101.0.0.tgz differ diff --git a/charts/ipfs/1.0.1/default_values.yaml b/charts/ipfs/1.0.2/default_values.yaml similarity index 100% rename from charts/ipfs/1.0.1/default_values.yaml rename to charts/ipfs/1.0.2/default_values.yaml diff --git a/charts/ipfs/1.0.2/ix_values.yaml b/charts/ipfs/1.0.2/ix_values.yaml new file mode 100644 index 0000000000..a41f18a171 --- /dev/null +++ b/charts/ipfs/1.0.2/ix_values.yaml @@ -0,0 +1,4 @@ +image: + repository: ipfs/go-ipfs + tag: v0.8.0 + pullPolicy: IfNotPresent diff --git a/charts/ipfs/1.0.1/questions.yaml b/charts/ipfs/1.0.2/questions.yaml similarity index 81% rename from charts/ipfs/1.0.1/questions.yaml rename to charts/ipfs/1.0.2/questions.yaml index b6fe95c464..7e3346a820 100644 --- a/charts/ipfs/1.0.1/questions.yaml +++ b/charts/ipfs/1.0.2/questions.yaml @@ -19,42 +19,6 @@ portals: path: "/webui" questions: - # Image related - - variable: image - description: "Docker Image Details" - label: "Docker Image" - group: "Container Images" - schema: - type: dict - required: true - attrs: - - variable: repository - description: "Docker image repository" - label: "Image repository" - schema: - type: string - default: "ipfs/go-ipfs" - required: true - - variable: tag - description: "Tag to use for specified image" - label: "Image Tag" - schema: - type: string - default: "v0.8.0-rc1" - - variable: pullPolicy - description: "Docker Image Pull Policy" - label: "Image Pull Policy" - schema: - type: string - default: "IfNotPresent" - enum: - - value: "IfNotPresent" - description: "Only pull image if not present on host" - - value: "Always" - description: "Always pull image even if present on host" - - value: "Never" - description: "Never pull image even if it's not present on host" - - variable: updateStrategy label: "IPFS update strategy" group: "Workload Configuration" diff --git a/charts/ipfs/1.0.1/requirements.lock b/charts/ipfs/1.0.2/requirements.lock similarity index 100% rename from charts/ipfs/1.0.1/requirements.lock rename to charts/ipfs/1.0.2/requirements.lock diff --git a/charts/ipfs/1.0.1/templates/NOTES.txt b/charts/ipfs/1.0.2/templates/NOTES.txt similarity index 100% rename from charts/ipfs/1.0.1/templates/NOTES.txt rename to charts/ipfs/1.0.2/templates/NOTES.txt diff --git a/charts/ipfs/1.0.1/templates/deployment.yaml b/charts/ipfs/1.0.2/templates/deployment.yaml similarity index 100% rename from charts/ipfs/1.0.1/templates/deployment.yaml rename to charts/ipfs/1.0.2/templates/deployment.yaml diff --git a/charts/ipfs/1.0.1/templates/service.yaml b/charts/ipfs/1.0.2/templates/service.yaml similarity index 100% rename from charts/ipfs/1.0.1/templates/service.yaml rename to charts/ipfs/1.0.2/templates/service.yaml diff --git a/charts/ipfs/1.0.1/templates/serviceaccount.yaml b/charts/ipfs/1.0.2/templates/serviceaccount.yaml similarity index 100% rename from charts/ipfs/1.0.1/templates/serviceaccount.yaml rename to charts/ipfs/1.0.2/templates/serviceaccount.yaml diff --git a/charts/ipfs/1.0.1/test_values.yaml b/charts/ipfs/1.0.2/test_values.yaml similarity index 96% rename from charts/ipfs/1.0.1/test_values.yaml rename to charts/ipfs/1.0.2/test_values.yaml index 65b840021f..a0ada7d3dd 100644 --- a/charts/ipfs/1.0.1/test_values.yaml +++ b/charts/ipfs/1.0.2/test_values.yaml @@ -2,7 +2,7 @@ ## image: repository: ipfs/go-ipfs - tag: v0.8.0-rc1 + tag: v0.8.0 pullPolicy: IfNotPresent ## Additional arguments to pass to minio binary diff --git a/charts/ipfs/1.0.1/values.yaml b/charts/ipfs/1.0.2/values.yaml similarity index 100% rename from charts/ipfs/1.0.1/values.yaml rename to charts/ipfs/1.0.2/values.yaml diff --git a/charts/ix-chart/2102.0.0/charts/common-2101.0.0.tgz b/charts/ix-chart/2102.0.0/charts/common-2101.0.0.tgz deleted file mode 100644 index 3a22457ea6..0000000000 Binary files a/charts/ix-chart/2102.0.0/charts/common-2101.0.0.tgz and /dev/null differ diff --git a/charts/ix-chart/2102.0.0/.helmignore b/charts/ix-chart/2104.0.0/.helmignore similarity index 100% rename from charts/ix-chart/2102.0.0/.helmignore rename to charts/ix-chart/2104.0.0/.helmignore diff --git a/charts/ix-chart/2102.0.0/Chart.lock b/charts/ix-chart/2104.0.0/Chart.lock similarity index 100% rename from charts/ix-chart/2102.0.0/Chart.lock rename to charts/ix-chart/2104.0.0/Chart.lock diff --git a/charts/ix-chart/2102.0.0/Chart.yaml b/charts/ix-chart/2104.0.0/Chart.yaml similarity index 98% rename from charts/ix-chart/2102.0.0/Chart.yaml rename to charts/ix-chart/2104.0.0/Chart.yaml index 5d8814b01a..ea93b17843 100644 --- a/charts/ix-chart/2102.0.0/Chart.yaml +++ b/charts/ix-chart/2104.0.0/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2102.0.0 +version: 2104.0.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/ix-chart/2102.0.0/README.md b/charts/ix-chart/2104.0.0/README.md similarity index 100% rename from charts/ix-chart/2102.0.0/README.md rename to charts/ix-chart/2104.0.0/README.md diff --git a/charts/ix-chart/2102.0.0/app-readme.md b/charts/ix-chart/2104.0.0/app-readme.md similarity index 100% rename from charts/ix-chart/2102.0.0/app-readme.md rename to charts/ix-chart/2104.0.0/app-readme.md diff --git a/charts/ix-chart/2104.0.0/charts/common-2101.0.0.tgz b/charts/ix-chart/2104.0.0/charts/common-2101.0.0.tgz new file mode 100644 index 0000000000..91e9592a56 Binary files /dev/null and b/charts/ix-chart/2104.0.0/charts/common-2101.0.0.tgz differ diff --git a/charts/ix-chart/2102.0.0/default_values.yaml b/charts/ix-chart/2104.0.0/default_values.yaml similarity index 100% rename from charts/ix-chart/2102.0.0/default_values.yaml rename to charts/ix-chart/2104.0.0/default_values.yaml diff --git a/charts/ix-chart/2102.0.0/questions.yaml b/charts/ix-chart/2104.0.0/questions.yaml similarity index 96% rename from charts/ix-chart/2102.0.0/questions.yaml rename to charts/ix-chart/2104.0.0/questions.yaml index 8ab54de480..93027242a9 100644 --- a/charts/ix-chart/2102.0.0/questions.yaml +++ b/charts/ix-chart/2104.0.0/questions.yaml @@ -447,3 +447,16 @@ questions: $ref: - "definitions/gpuConfiguration" attrs: [] + + - variable: securityContext + label: "Security Context" + group: "Workload Details" + schema: + type: dict + attrs: + - variable: privileged + label: "Privileged Mode" + description: "Determines if any container in a pod can enable privileged mode. By default a container is not allowed to access any devices on the host, but a 'privileged' container is given access to all devices on the host. This allows the container nearly all the same access as processes running on the host." + schema: + type: boolean + default: false diff --git a/charts/ix-chart/2102.0.0/templates/NOTES.txt b/charts/ix-chart/2104.0.0/templates/NOTES.txt similarity index 100% rename from charts/ix-chart/2102.0.0/templates/NOTES.txt rename to charts/ix-chart/2104.0.0/templates/NOTES.txt diff --git a/charts/ix-chart/2102.0.0/templates/_containers.tpl b/charts/ix-chart/2104.0.0/templates/_containers.tpl similarity index 100% rename from charts/ix-chart/2102.0.0/templates/_containers.tpl rename to charts/ix-chart/2104.0.0/templates/_containers.tpl diff --git a/charts/ix-chart/2102.0.0/templates/_helpers.tpl b/charts/ix-chart/2104.0.0/templates/_helpers.tpl similarity index 100% rename from charts/ix-chart/2102.0.0/templates/_helpers.tpl rename to charts/ix-chart/2104.0.0/templates/_helpers.tpl diff --git a/charts/ix-chart/2102.0.0/templates/_networking.tpl b/charts/ix-chart/2104.0.0/templates/_networking.tpl similarity index 100% rename from charts/ix-chart/2102.0.0/templates/_networking.tpl rename to charts/ix-chart/2104.0.0/templates/_networking.tpl diff --git a/charts/ix-chart/2102.0.0/templates/_volumes.tpl b/charts/ix-chart/2104.0.0/templates/_volumes.tpl similarity index 100% rename from charts/ix-chart/2102.0.0/templates/_volumes.tpl rename to charts/ix-chart/2104.0.0/templates/_volumes.tpl diff --git a/charts/ix-chart/2102.0.0/templates/_workload.tpl b/charts/ix-chart/2104.0.0/templates/_workload.tpl similarity index 100% rename from charts/ix-chart/2102.0.0/templates/_workload.tpl rename to charts/ix-chart/2104.0.0/templates/_workload.tpl diff --git a/charts/ix-chart/2102.0.0/templates/external-interfaces.yaml b/charts/ix-chart/2104.0.0/templates/external-interfaces.yaml similarity index 100% rename from charts/ix-chart/2102.0.0/templates/external-interfaces.yaml rename to charts/ix-chart/2104.0.0/templates/external-interfaces.yaml diff --git a/charts/ix-chart/2102.0.0/templates/service.yaml b/charts/ix-chart/2104.0.0/templates/service.yaml similarity index 100% rename from charts/ix-chart/2102.0.0/templates/service.yaml rename to charts/ix-chart/2104.0.0/templates/service.yaml diff --git a/charts/ix-chart/2102.0.0/templates/tests/deployment-check.yaml b/charts/ix-chart/2104.0.0/templates/tests/deployment-check.yaml similarity index 100% rename from charts/ix-chart/2102.0.0/templates/tests/deployment-check.yaml rename to charts/ix-chart/2104.0.0/templates/tests/deployment-check.yaml diff --git a/charts/ix-chart/2102.0.0/templates/workload.yaml b/charts/ix-chart/2104.0.0/templates/workload.yaml similarity index 100% rename from charts/ix-chart/2102.0.0/templates/workload.yaml rename to charts/ix-chart/2104.0.0/templates/workload.yaml diff --git a/charts/ix-chart/2102.0.0/test_values.yaml b/charts/ix-chart/2104.0.0/test_values.yaml similarity index 100% rename from charts/ix-chart/2102.0.0/test_values.yaml rename to charts/ix-chart/2104.0.0/test_values.yaml diff --git a/charts/ix-chart/2102.0.0/values.yaml b/charts/ix-chart/2104.0.0/values.yaml similarity index 100% rename from charts/ix-chart/2102.0.0/values.yaml rename to charts/ix-chart/2104.0.0/values.yaml diff --git a/charts/minio/1.1.0/charts/common-2101.0.0.tgz b/charts/minio/1.1.0/charts/common-2101.0.0.tgz deleted file mode 100644 index 3a22457ea6..0000000000 Binary files a/charts/minio/1.1.0/charts/common-2101.0.0.tgz and /dev/null differ diff --git a/charts/minio/1.1.0/templates/_helpers.tpl b/charts/minio/1.1.0/templates/_helpers.tpl deleted file mode 100644 index c769c2fb2a..0000000000 --- a/charts/minio/1.1.0/templates/_helpers.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{/* -Determine secret name. -*/}} -{{- define "minio.secretName" -}} -{{- include "common.names.fullname" . -}} -{{- end -}} diff --git a/charts/minio/1.1.0/.helmignore b/charts/minio/1.2.1/.helmignore similarity index 100% rename from charts/minio/1.1.0/.helmignore rename to charts/minio/1.2.1/.helmignore diff --git a/charts/minio/1.2.1/CHANGELOG.md b/charts/minio/1.2.1/CHANGELOG.md new file mode 100644 index 0000000000..cdcbb90a82 --- /dev/null +++ b/charts/minio/1.2.1/CHANGELOG.md @@ -0,0 +1 @@ +* TLS Support added for Minio application. This lets users to use TrueNAS certificates with Minio Application. \ No newline at end of file diff --git a/charts/minio/1.1.0/Chart.yaml b/charts/minio/1.2.1/Chart.yaml similarity index 88% rename from charts/minio/1.1.0/Chart.yaml rename to charts/minio/1.2.1/Chart.yaml index 52ba59d832..81b6b146ff 100644 --- a/charts/minio/1.1.0/Chart.yaml +++ b/charts/minio/1.2.1/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: High Performance, Kubernetes Native Object Storage name: minio -version: 1.1.0 -appVersion: master +version: 1.2.1 +appVersion: RELEASE.2021-04-06T23-11-00Z keywords: - storage - object-storage diff --git a/charts/minio/1.1.0/README.md b/charts/minio/1.2.1/README.md similarity index 100% rename from charts/minio/1.1.0/README.md rename to charts/minio/1.2.1/README.md diff --git a/charts/minio/1.1.0/app-readme.md b/charts/minio/1.2.1/app-readme.md similarity index 100% rename from charts/minio/1.1.0/app-readme.md rename to charts/minio/1.2.1/app-readme.md diff --git a/charts/minio/1.2.1/charts/common-2101.0.0.tgz b/charts/minio/1.2.1/charts/common-2101.0.0.tgz new file mode 100644 index 0000000000..91e9592a56 Binary files /dev/null and b/charts/minio/1.2.1/charts/common-2101.0.0.tgz differ diff --git a/charts/minio/1.1.0/default_values.yaml b/charts/minio/1.2.1/default_values.yaml similarity index 100% rename from charts/minio/1.1.0/default_values.yaml rename to charts/minio/1.2.1/default_values.yaml diff --git a/charts/minio/1.2.1/ix_values.yaml b/charts/minio/1.2.1/ix_values.yaml new file mode 100644 index 0000000000..73d0241dd1 --- /dev/null +++ b/charts/minio/1.2.1/ix_values.yaml @@ -0,0 +1,4 @@ +image: + repository: minio/minio + tag: RELEASE.2021-04-06T23-11-00Z + pullPolicy: IfNotPresent diff --git a/charts/minio/1.1.0/migrations/migrate b/charts/minio/1.2.1/migrations/migrate_from_1.0.0 similarity index 90% rename from charts/minio/1.1.0/migrations/migrate rename to charts/minio/1.2.1/migrations/migrate_from_1.0.0 index f65d82b628..d9772faa1d 100755 --- a/charts/minio/1.1.0/migrations/migrate +++ b/charts/minio/1.2.1/migrations/migrate_from_1.0.0 @@ -5,6 +5,9 @@ import sys def migrate(values): + if values.get('appVolumeMounts'): + return values + values.update({ 'appVolumeMounts': { 'export': { diff --git a/charts/minio/1.1.0/questions.yaml b/charts/minio/1.2.1/questions.yaml similarity index 77% rename from charts/minio/1.1.0/questions.yaml rename to charts/minio/1.2.1/questions.yaml index e4753328ae..19fd540b8d 100644 --- a/charts/minio/1.1.0/questions.yaml +++ b/charts/minio/1.2.1/questions.yaml @@ -11,49 +11,13 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_minio-config_protocol" host: - "$node_ip" ports: - "$variable-service.nodePort" questions: - # Image related - - variable: image - description: "Docker Image Details" - label: "Docker Image" - group: "Container Images" - schema: - type: dict - required: true - attrs: - - variable: repository - description: "Docker image repository" - label: "Image repository" - schema: - type: string - default: "minio/minio" - required: true - - variable: tag - description: "Tag to use for specified image" - label: "Image Tag" - schema: - type: string - default: "RELEASE.2020-11-19T23-48-16Z" - - variable: pullPolicy - description: "Docker Image Pull Policy" - label: "Image Pull Policy" - schema: - type: string - default: "IfNotPresent" - enum: - - value: "IfNotPresent" - description: "Only pull image if not present on host" - - value: "Always" - description: "Always pull image even if present on host" - - value: "Never" - description: "Never pull image even if it's not present on host" - - variable: updateStrategy label: "Minio update strategy" group: "Workload Configuration" @@ -138,6 +102,15 @@ questions: default: 9000 required: true + - variable: certificate + description: "Minio Certificate" + label: "Minio Certificate" + group: "Minio Configuration" + schema: + type: int + $ref: + - "definitions/certificate" + - variable: appVolumeMounts label: "Minio Storage" group: "Storage" diff --git a/charts/minio/1.1.0/requirements.lock b/charts/minio/1.2.1/requirements.lock similarity index 100% rename from charts/minio/1.1.0/requirements.lock rename to charts/minio/1.2.1/requirements.lock diff --git a/charts/minio/1.1.0/templates/NOTES.txt b/charts/minio/1.2.1/templates/NOTES.txt similarity index 100% rename from charts/minio/1.1.0/templates/NOTES.txt rename to charts/minio/1.2.1/templates/NOTES.txt diff --git a/charts/minio/1.2.1/templates/_cert.tpl b/charts/minio/1.2.1/templates/_cert.tpl new file mode 100644 index 0000000000..f34777f65a --- /dev/null +++ b/charts/minio/1.2.1/templates/_cert.tpl @@ -0,0 +1,33 @@ +{{/* +Formats volumeMount for Minio tls keys and trusted certs +*/}} +{{- define "minio.tlsKeysVolumeMount" -}} +{{- if eq (include "minio.certAvailable" .) "true" -}} +- name: cert-secret-volume + mountPath: "/etc/minio/certs" +- name: trusted-cert-secret-volume + mountPath: "/etc/minio/certs/CAs" +{{- end }} +{{- end -}} + +{{/* +Formats volume for Minio tls keys and trusted certs +*/}} +{{- define "minio.tlsKeysVolume" -}} +{{- if eq (include "minio.certAvailable" .) "true" -}} +- name: cert-secret-volume + secret: + secretName: {{ include "minio.secretName" . }} + items: + - key: certPublicKey + path: public.crt + - key: certPrivateKey + path: private.key +- name: trusted-cert-secret-volume + secret: + secretName: {{ include "minio.secretName" . }} + items: + - key: certPublicKey + path: public.crt +{{- end }} +{{- end -}} diff --git a/charts/minio/1.2.1/templates/_helpers.tpl b/charts/minio/1.2.1/templates/_helpers.tpl new file mode 100644 index 0000000000..f4d59c96f8 --- /dev/null +++ b/charts/minio/1.2.1/templates/_helpers.tpl @@ -0,0 +1,40 @@ +{{/* +Determine secret name. +*/}} +{{- define "minio.secretName" -}} +{{- include "common.names.fullname" . -}} +{{- end -}} + + +{{/* +Retrieve true/false if minio certificate is configured +*/}} +{{- define "minio.certAvailable" -}} +{{- if .Values.certificate -}} +{{- $values := (. | mustDeepCopy) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} +{{- template "common.resources.cert_present" $values -}} +{{- else -}} +{{- false -}} +{{- end -}} +{{- end -}} + + +{{/* +Retrieve public key of minio certificate +*/}} +{{- define "minio.cert.publicKey" -}} +{{- $values := (. | mustDeepCopy) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate "publicKey" true) -}} +{{ include "common.resources.cert" $values }} +{{- end -}} + + +{{/* +Retrieve private key of minio certificate +*/}} +{{- define "minio.cert.privateKey" -}} +{{- $values := (. | mustDeepCopy) -}} +{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} +{{ include "common.resources.cert" $values }} +{{- end -}} diff --git a/charts/minio/1.2.1/templates/configmap.yaml b/charts/minio/1.2.1/templates/configmap.yaml new file mode 100644 index 0000000000..0c9aeea644 --- /dev/null +++ b/charts/minio/1.2.1/templates/configmap.yaml @@ -0,0 +1,10 @@ +{{ $scheme := "http" }} +{{ if eq (include "minio.certAvailable" .) "true" }} +{{ $scheme = "https" }} +{{ end }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: minio-config +data: + protocol: {{ $scheme }} diff --git a/charts/minio/1.1.0/templates/deployment.yaml b/charts/minio/1.2.1/templates/deployment.yaml similarity index 82% rename from charts/minio/1.1.0/templates/deployment.yaml rename to charts/minio/1.2.1/templates/deployment.yaml index aed4ad032b..f6eb4c5c90 100644 --- a/charts/minio/1.1.0/templates/deployment.yaml +++ b/charts/minio/1.2.1/templates/deployment.yaml @@ -1,4 +1,3 @@ -{{ $scheme := "http" }} apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }} kind: Deployment metadata: @@ -29,13 +28,14 @@ spec: containers: - name: {{ .Chart.Name }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} - {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }} + volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} + {{- include "minio.tlsKeysVolumeMount" . | nindent 12 }} command: - "/bin/sh" - "-ce" - - "/usr/bin/docker-entrypoint.sh minio server /export {{ (.Values.extraArgs | default list) | join " " }}" + - "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server /export {{ (.Values.extraArgs | default list) | join " " }}" ports: - - name: {{ $scheme }} + - name: http containerPort: 9000 env: {{ $secretName := (include "minio.secretName" .) }} @@ -44,3 +44,4 @@ spec: {{ $envList = mustAppend $envList (dict "name" "MINIO_SECRET_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} {{ include "common.storage.allAppVolumes" .Values | nindent 6 }} +{{- include "minio.tlsKeysVolume" . | nindent 8 }} diff --git a/charts/minio/1.1.0/templates/secrets.yaml b/charts/minio/1.2.1/templates/secrets.yaml similarity index 65% rename from charts/minio/1.1.0/templates/secrets.yaml rename to charts/minio/1.2.1/templates/secrets.yaml index f44495e5e1..4085fd585b 100644 --- a/charts/minio/1.1.0/templates/secrets.yaml +++ b/charts/minio/1.2.1/templates/secrets.yaml @@ -7,3 +7,7 @@ type: Opaque data: accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }} secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }} + {{ if eq (include "minio.certAvailable" .) "true" }} + certPublicKey: {{ (include "minio.cert.publicKey" .) | toString | b64enc | quote }} + certPrivateKey: {{ (include "minio.cert.privateKey" .) | toString | b64enc | quote }} + {{ end }} diff --git a/charts/minio/1.1.0/templates/service.yaml b/charts/minio/1.2.1/templates/service.yaml similarity index 100% rename from charts/minio/1.1.0/templates/service.yaml rename to charts/minio/1.2.1/templates/service.yaml diff --git a/charts/minio/1.1.0/templates/serviceaccount.yaml b/charts/minio/1.2.1/templates/serviceaccount.yaml similarity index 100% rename from charts/minio/1.1.0/templates/serviceaccount.yaml rename to charts/minio/1.2.1/templates/serviceaccount.yaml diff --git a/charts/minio/1.1.0/test_values.yaml b/charts/minio/1.2.1/test_values.yaml similarity index 89% rename from charts/minio/1.1.0/test_values.yaml rename to charts/minio/1.2.1/test_values.yaml index 383d0bbdd5..ce8e11fdac 100644 --- a/charts/minio/1.1.0/test_values.yaml +++ b/charts/minio/1.2.1/test_values.yaml @@ -2,7 +2,7 @@ ## image: repository: minio/minio - tag: RELEASE.2020-11-19T23-48-16Z + tag: RELEASE.2021-02-19T04-38-02Z pullPolicy: IfNotPresent ## Additional arguments to pass to minio binary @@ -11,7 +11,7 @@ extraArgs: [] updateStrategy: RollingUpdate service: - nodePort: 32001 + nodePort: 32324 environmentVariables: [] ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html diff --git a/charts/minio/1.1.0/values.yaml b/charts/minio/1.2.1/values.yaml similarity index 100% rename from charts/minio/1.1.0/values.yaml rename to charts/minio/1.2.1/values.yaml diff --git a/charts/nextcloud/1.2.0/charts/common-2101.0.0.tgz b/charts/nextcloud/1.2.0/charts/common-2101.0.0.tgz deleted file mode 100644 index 3a22457ea6..0000000000 Binary files a/charts/nextcloud/1.2.0/charts/common-2101.0.0.tgz and /dev/null differ diff --git a/charts/nextcloud/1.2.0/.helmignore b/charts/nextcloud/1.2.1/.helmignore similarity index 100% rename from charts/nextcloud/1.2.0/.helmignore rename to charts/nextcloud/1.2.1/.helmignore diff --git a/charts/nextcloud/1.2.0/Chart.lock b/charts/nextcloud/1.2.1/Chart.lock similarity index 100% rename from charts/nextcloud/1.2.0/Chart.lock rename to charts/nextcloud/1.2.1/Chart.lock diff --git a/charts/nextcloud/1.2.0/Chart.yaml b/charts/nextcloud/1.2.1/Chart.yaml similarity index 94% rename from charts/nextcloud/1.2.0/Chart.yaml rename to charts/nextcloud/1.2.1/Chart.yaml index 4639feeae2..69af972c24 100644 --- a/charts/nextcloud/1.2.0/Chart.yaml +++ b/charts/nextcloud/1.2.1/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: nextcloud -version: 1.2.0 -appVersion: 19.0.3 +version: 1.2.1 +appVersion: 21.0.0 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: - nextcloud diff --git a/charts/nextcloud/1.2.0/README.md b/charts/nextcloud/1.2.1/README.md similarity index 100% rename from charts/nextcloud/1.2.0/README.md rename to charts/nextcloud/1.2.1/README.md diff --git a/charts/nextcloud/1.2.0/app-readme.md b/charts/nextcloud/1.2.1/app-readme.md similarity index 100% rename from charts/nextcloud/1.2.0/app-readme.md rename to charts/nextcloud/1.2.1/app-readme.md diff --git a/charts/nextcloud/1.2.1/charts/common-2101.0.0.tgz b/charts/nextcloud/1.2.1/charts/common-2101.0.0.tgz new file mode 100644 index 0000000000..91e9592a56 Binary files /dev/null and b/charts/nextcloud/1.2.1/charts/common-2101.0.0.tgz differ diff --git a/charts/nextcloud/1.2.0/default_values.yaml b/charts/nextcloud/1.2.1/default_values.yaml similarity index 100% rename from charts/nextcloud/1.2.0/default_values.yaml rename to charts/nextcloud/1.2.1/default_values.yaml diff --git a/charts/nextcloud/1.2.1/ix_values.yaml b/charts/nextcloud/1.2.1/ix_values.yaml new file mode 100644 index 0000000000..9311622fe5 --- /dev/null +++ b/charts/nextcloud/1.2.1/ix_values.yaml @@ -0,0 +1,4 @@ +image: + repository: nextcloud + tag: 21.0.0 + pullPolicy: IfNotPresent diff --git a/charts/nextcloud/1.2.0/migrations/migrate b/charts/nextcloud/1.2.1/migrations/migrate_from_1.1.0 similarity index 100% rename from charts/nextcloud/1.2.0/migrations/migrate rename to charts/nextcloud/1.2.1/migrations/migrate_from_1.1.0 diff --git a/charts/nextcloud/1.2.0/questions.yaml b/charts/nextcloud/1.2.1/questions.yaml similarity index 83% rename from charts/nextcloud/1.2.0/questions.yaml rename to charts/nextcloud/1.2.1/questions.yaml index e8e485abce..497b55490d 100644 --- a/charts/nextcloud/1.2.0/questions.yaml +++ b/charts/nextcloud/1.2.1/questions.yaml @@ -22,42 +22,6 @@ portals: - "$variable-service.nodePort" questions: - # Image related - - variable: image - description: "Docker Image Details" - label: "Docker Image" - group: "Container Images" - schema: - type: dict - required: true - attrs: - - variable: repository - description: "Docker image repository" - label: "Image repository" - schema: - type: string - default: "nextcloud" - required: true - - variable: tag - description: "Tag to use for specified image" - label: "Image Tag" - schema: - type: string - default: "latest" - - variable: pullPolicy - description: "Docker Image Pull Policy" - label: "Image Pull Policy" - schema: - type: string - default: "IfNotPresent" - enum: - - value: "IfNotPresent" - description: "Only pull image if not present on host" - - value: "Always" - description: "Always pull image even if present on host" - - value: "Never" - description: "Never pull image even if it's not present on host" - - variable: nextcloud description: "Nextcloud configuration details" label: "Nextcloud Configuration" diff --git a/charts/nextcloud/1.2.0/templates/NOTES.txt b/charts/nextcloud/1.2.1/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/1.2.0/templates/NOTES.txt rename to charts/nextcloud/1.2.1/templates/NOTES.txt diff --git a/charts/nextcloud/1.2.0/templates/_postgres.tpl b/charts/nextcloud/1.2.1/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/1.2.0/templates/_postgres.tpl rename to charts/nextcloud/1.2.1/templates/_postgres.tpl diff --git a/charts/nextcloud/1.2.0/templates/backup-postgres-config.yaml b/charts/nextcloud/1.2.1/templates/backup-postgres-config.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/backup-postgres-config.yaml rename to charts/nextcloud/1.2.1/templates/backup-postgres-config.yaml diff --git a/charts/nextcloud/1.2.0/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.2.1/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/backup-postgres-hook.yaml rename to charts/nextcloud/1.2.1/templates/backup-postgres-hook.yaml diff --git a/charts/nextcloud/1.2.0/templates/deployment.yaml b/charts/nextcloud/1.2.1/templates/deployment.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/deployment.yaml rename to charts/nextcloud/1.2.1/templates/deployment.yaml diff --git a/charts/nextcloud/1.2.0/templates/nuke-deployments-hook.yaml b/charts/nextcloud/1.2.1/templates/nuke-deployments-hook.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/nuke-deployments-hook.yaml rename to charts/nextcloud/1.2.1/templates/nuke-deployments-hook.yaml diff --git a/charts/nextcloud/1.2.0/templates/postgres-deployment.yaml b/charts/nextcloud/1.2.1/templates/postgres-deployment.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/postgres-deployment.yaml rename to charts/nextcloud/1.2.1/templates/postgres-deployment.yaml diff --git a/charts/nextcloud/1.2.0/templates/postgres-secret.yaml b/charts/nextcloud/1.2.1/templates/postgres-secret.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/postgres-secret.yaml rename to charts/nextcloud/1.2.1/templates/postgres-secret.yaml diff --git a/charts/nextcloud/1.2.0/templates/postgres-service.yaml b/charts/nextcloud/1.2.1/templates/postgres-service.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/postgres-service.yaml rename to charts/nextcloud/1.2.1/templates/postgres-service.yaml diff --git a/charts/nextcloud/1.2.0/templates/secrets.yaml b/charts/nextcloud/1.2.1/templates/secrets.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/secrets.yaml rename to charts/nextcloud/1.2.1/templates/secrets.yaml diff --git a/charts/nextcloud/1.2.0/templates/service.yaml b/charts/nextcloud/1.2.1/templates/service.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/service.yaml rename to charts/nextcloud/1.2.1/templates/service.yaml diff --git a/charts/nextcloud/1.2.0/templates/serviceaccount.yaml b/charts/nextcloud/1.2.1/templates/serviceaccount.yaml similarity index 100% rename from charts/nextcloud/1.2.0/templates/serviceaccount.yaml rename to charts/nextcloud/1.2.1/templates/serviceaccount.yaml diff --git a/charts/nextcloud/1.2.0/test_values.yaml b/charts/nextcloud/1.2.1/test_values.yaml similarity index 100% rename from charts/nextcloud/1.2.0/test_values.yaml rename to charts/nextcloud/1.2.1/test_values.yaml diff --git a/charts/nextcloud/1.2.0/values.yaml b/charts/nextcloud/1.2.1/values.yaml similarity index 100% rename from charts/nextcloud/1.2.0/values.yaml rename to charts/nextcloud/1.2.1/values.yaml diff --git a/charts/plex/1.1.0/charts/common-2101.0.0.tgz b/charts/plex/1.1.0/charts/common-2101.0.0.tgz deleted file mode 100644 index 3a22457ea6..0000000000 Binary files a/charts/plex/1.1.0/charts/common-2101.0.0.tgz and /dev/null differ diff --git a/charts/plex/1.1.0/.helmignore b/charts/plex/1.3.0/.helmignore similarity index 100% rename from charts/plex/1.1.0/.helmignore rename to charts/plex/1.3.0/.helmignore diff --git a/charts/plex/1.3.0/CHANGELOG.md b/charts/plex/1.3.0/CHANGELOG.md new file mode 100644 index 0000000000..463b0e6a81 --- /dev/null +++ b/charts/plex/1.3.0/CHANGELOG.md @@ -0,0 +1,5 @@ +* Application liveness / readiness probes were updated addressing a bug where TrueNAS failed +to consider plex application as `Active` if it was configured to only use `HTTPS`. + +* Nvidia GPU support was properly added which ensures users having NVIDIA gpu can now consume it +for hardware acceleration. diff --git a/charts/plex/1.1.0/Chart.lock b/charts/plex/1.3.0/Chart.lock similarity index 100% rename from charts/plex/1.1.0/Chart.lock rename to charts/plex/1.3.0/Chart.lock diff --git a/charts/plex/1.1.0/Chart.yaml b/charts/plex/1.3.0/Chart.yaml similarity index 91% rename from charts/plex/1.1.0/Chart.yaml rename to charts/plex/1.3.0/Chart.yaml index 2d82d67bc3..00dbe37d8b 100644 --- a/charts/plex/1.1.0/Chart.yaml +++ b/charts/plex/1.3.0/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 1.20.2.3402 +appVersion: 1.22.2.4282 description: Plex Media Server name: plex -version: 1.1.0 +version: 1.3.0 keywords: - plex home: https://plex.tv/ diff --git a/charts/plex/1.1.0/README.md b/charts/plex/1.3.0/README.md similarity index 100% rename from charts/plex/1.1.0/README.md rename to charts/plex/1.3.0/README.md diff --git a/charts/plex/1.1.0/app-readme.md b/charts/plex/1.3.0/app-readme.md similarity index 100% rename from charts/plex/1.1.0/app-readme.md rename to charts/plex/1.3.0/app-readme.md diff --git a/charts/plex/1.3.0/charts/common-2101.0.0.tgz b/charts/plex/1.3.0/charts/common-2101.0.0.tgz new file mode 100644 index 0000000000..91e9592a56 Binary files /dev/null and b/charts/plex/1.3.0/charts/common-2101.0.0.tgz differ diff --git a/charts/plex/1.1.0/default_values.yaml b/charts/plex/1.3.0/default_values.yaml similarity index 100% rename from charts/plex/1.1.0/default_values.yaml rename to charts/plex/1.3.0/default_values.yaml diff --git a/charts/plex/1.3.0/ix_values.yaml b/charts/plex/1.3.0/ix_values.yaml new file mode 100644 index 0000000000..8e8eb6ccd8 --- /dev/null +++ b/charts/plex/1.3.0/ix_values.yaml @@ -0,0 +1,4 @@ +image: + repository: plexinc/pms-docker + tag: 1.22.2.4282-a97b03fad + pullPolicy: IfNotPresent diff --git a/charts/plex/1.1.0/migrations/migrate b/charts/plex/1.3.0/migrations/migrate_from_1.0.0 similarity index 100% rename from charts/plex/1.1.0/migrations/migrate rename to charts/plex/1.3.0/migrations/migrate_from_1.0.0 diff --git a/charts/plex/1.1.0/questions.yaml b/charts/plex/1.3.0/questions.yaml similarity index 88% rename from charts/plex/1.1.0/questions.yaml rename to charts/plex/1.3.0/questions.yaml index 540c330710..b29a5392c9 100644 --- a/charts/plex/1.1.0/questions.yaml +++ b/charts/plex/1.3.0/questions.yaml @@ -31,42 +31,6 @@ portals: path: "/web" questions: - # Image related - - variable: image - description: "Docker Image Details" - label: "Docker Image" - group: "Container Images" - schema: - type: dict - required: true - attrs: - - variable: repository - description: "Docker image repository" - label: "Image repository" - schema: - type: string - required: true - default: "plexinc/pms-docker" - - variable: tag - description: "Tag to use for specified image" - label: "Image Tag" - schema: - type: string - default: "1.20.2.3402-0fec14d92" - - variable: pullPolicy - description: "Docker Image Pull Policy" - label: "Image Pull Policy" - schema: - type: string - default: "IfNotPresent" - enum: - - value: "IfNotPresent" - description: "Only pull image if not present on host" - - value: "Always" - description: "Always pull image even if present on host" - - value: "Never" - description: "Never pull image even if it's not present on host" - - variable: claimToken label: "Plex Claim Token" group: "Plex Configuration" diff --git a/charts/plex/1.1.0/templates/NOTES.txt b/charts/plex/1.3.0/templates/NOTES.txt similarity index 100% rename from charts/plex/1.1.0/templates/NOTES.txt rename to charts/plex/1.3.0/templates/NOTES.txt diff --git a/charts/plex/1.1.0/templates/deployment.yaml b/charts/plex/1.3.0/templates/deployment.yaml similarity index 68% rename from charts/plex/1.1.0/templates/deployment.yaml rename to charts/plex/1.3.0/templates/deployment.yaml index 6f3283aa64..778a1db7ed 100644 --- a/charts/plex/1.1.0/templates/deployment.yaml +++ b/charts/plex/1.3.0/templates/deployment.yaml @@ -9,8 +9,12 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} containers: - name: {{ .Chart.Name }} {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} - {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }} {{ include "common.containers.gpuConfiguration" .Values | nindent 10 }} + volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} + - name: plex-probe-check + mountPath: /bin/plex_probe_check.sh + readOnly: true + subPath: entrypoint.sh ports: - name: pms protocol: TCP @@ -41,29 +45,40 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} valueFrom: fieldRef: fieldPath: metadata.namespace + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP {{ $envList := (default list .Values.environmentVariables) }} + {{ if and .Values.gpuConfiguration (hasKey .Values.gpuConfiguration "nvidia.com/gpu") (gt (get .Values.gpuConfiguration "nvidia.com/gpu" | toDecimal) 0) }} + {{ $envList = mustAppend $envList (dict "name" "NVIDIA_DRIVER_CAPABILITIES" "value" "all") }} + {{ end }} {{ $envList = mustAppend $envList (dict "name" "TZ" "value" .Values.timezone) }} {{ $envList = mustAppend $envList (dict "name" "PLEX_CLAIM" "value" .Values.claimToken) }} {{ $envList = mustAppend $envList (dict "name" "PMS_INTERNAL_ADDRESS" "value" (printf "http://%s:32400" (include "common.names.fullname" .))) }} {{ $envList = mustAppend $envList (dict "name" "PMS_IMAGE" "value" (printf "%s:%s" .Values.image.repository .Values.image.tag))}} {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} readinessProbe: - httpGet: - path: /identity - port: 32400 + exec: + command: + - /bin/plex_probe_check.sh failureThreshold: 5 periodSeconds: 15 livenessProbe: - httpGet: - path: /identity - port: 32400 + exec: + command: + - /bin/plex_probe_check.sh failureThreshold: 5 periodSeconds: 15 startupProbe: - httpGet: - path: /identity - port: 32400 + exec: + command: + - /bin/plex_probe_check.sh initialDelaySeconds: 5 failureThreshold: 40 periodSeconds: 15 -{{ include "common.storage.allAppVolumes" .Values | nindent 6 }} + volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }} + - name: plex-probe-check + configMap: + defaultMode: 0700 + name: "plex-probe-check" diff --git a/charts/plex/1.3.0/templates/probe_config.yaml b/charts/plex/1.3.0/templates/probe_config.yaml new file mode 100644 index 0000000000..736ee8cf47 --- /dev/null +++ b/charts/plex/1.3.0/templates/probe_config.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: "plex-probe-check" +data: + entrypoint.sh: |- + #!/bin/sh + curl -ksf http://$POD_IP:32400/identity -o /dev/null || curl -ksf https://$POD_IP:32400/identity -o /dev/null diff --git a/charts/plex/1.1.0/templates/service-tcp.yaml b/charts/plex/1.3.0/templates/service-tcp.yaml similarity index 100% rename from charts/plex/1.1.0/templates/service-tcp.yaml rename to charts/plex/1.3.0/templates/service-tcp.yaml diff --git a/charts/plex/1.1.0/templates/service-udp.yaml b/charts/plex/1.3.0/templates/service-udp.yaml similarity index 100% rename from charts/plex/1.1.0/templates/service-udp.yaml rename to charts/plex/1.3.0/templates/service-udp.yaml diff --git a/charts/plex/1.1.0/test_values.yaml b/charts/plex/1.3.0/test_values.yaml similarity index 100% rename from charts/plex/1.1.0/test_values.yaml rename to charts/plex/1.3.0/test_values.yaml diff --git a/charts/plex/1.1.0/values.yaml b/charts/plex/1.3.0/values.yaml similarity index 100% rename from charts/plex/1.1.0/values.yaml rename to charts/plex/1.3.0/values.yaml