Merge pull request #36 from truenas/NAS-109468

Change versioning for official apps

charts/ix-chart/2102.0.0/questions.yaml

@@ -446,3 +446,4 @@ questions:
       type: dict
       $ref:
         - "definitions/gpuConfiguration"
+      attrs: []

charts/plex/1.1.0/questions.yaml

@@ -149,6 +149,7 @@ questions:
       type: dict
       $ref:
         - "definitions/gpuConfiguration"
+      attrs: []
 
   - variable: appVolumeMounts
     label: "Plex Storage"

test/ipfs/1.0.1/Chart.yaml → test/ipfs/1.0.2/Chart.yaml

 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

test/ipfs/1.0.2/ix_values.yaml

+image:
+  repository: ipfs/go-ipfs
+  tag: v0.8.0
+  pullPolicy: IfNotPresent

test/ipfs/1.0.1/questions.yaml → test/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"

test/ipfs/1.0.1/test_values.yaml → test/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

test/ix-chart/2101.0.0/questions.yaml

@@ -446,3 +446,4 @@ questions:
       type: dict
       $ref:
         - "definitions/gpuConfiguration"
+      attrs: []

test/minio/1.1.0/migrations/migrate

-#!/usr/bin/python3
-import json
-import os
-import sys
-
-
-def migrate(values):
-    values.update({
-        'appVolumeMounts': {
-            'export': {
-                'hostPathEnabled': values['minioHostPathEnabled'],
-                **({'hostPath': values['minioHostPath']} if values.get('minioHostPath') else {})
-            },
-        },
-    })
-    return values
-
-
-if __name__ == '__main__':
-    if len(sys.argv) != 2:
-        exit(1)
-
-    if os.path.exists(sys.argv[1]):
-        with open(sys.argv[1], 'r') as f:
-            print(json.dumps(migrate(json.loads(f.read()))))

test/minio/1.1.0/questions.yaml

-groups:
-  - name: "Container Images"
-    description: "Image to be used for container"
-  - name: "Workload Configuration"
-    description: "Configure workload deployment"
-  - name: "Storage"
-    description: "Configure Storage for Nextcloud"
-  - name: "Minio Configuration"
-    description: "Configure Minio credentials"
-
-portals:
-  web_portal:
-    protocols:
-      - "http"
-    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"
-    schema:
-      type: string
-      default: "RollingUpdate"
-      enum:
-        - value: "RollingUpdate"
-          description: "Create new pods and then kill old ones"
-        - value: "Recreate"
-          description: "Kill existing pods before creating new ones"
-
-  - variable: extraArgs
-    label: "Minio Extra Arguments"
-    group: "Minio Configuration"
-    schema:
-      type: list
-      default: []
-      items:
-        - variable: arg
-          label: "Argument"
-          schema:
-            type: string
-
-  - variable: accessKey
-    label: "Access Key"
-    group: "Minio Configuration"
-    description: "Enter the S3 access ID"
-    schema:
-      type: string
-      private: true
-      required: true
-      min_length: 5
-      max_length: 20
-
-  - variable: secretKey
-    label: "Secret Key"
-    group: "Minio Configuration"
-    description: "Enter the S3 secret access key"
-    schema:
-      type: string
-      private: true
-      required: true
-      min_length: 8
-      max_length: 40
-
-  - variable: environmentVariables
-    label: "Minio image environment"
-    group: "Minio Configuration"
-    schema:
-      type: list
-      default: []
-      items:
-        - variable: environmentVariable
-          label: "Environment Variable"
-          schema:
-            type: dict
-            attrs:
-              - variable: name
-                label: "Name"
-                schema:
-                  type: string
-              - variable: value
-                label: "Value"
-                schema:
-                  type: string
-
-  - variable: service
-    description: "Minio Service Configuration"
-    label: "Minio Service Configuration"
-    group: "Minio Configuration"
-    schema:
-      type: dict
-      required: true
-      attrs:
-        - variable: nodePort
-          label: "Node Port to use for Minio"
-          schema:
-            type: int
-            min: 9000
-            max: 65535
-            default: 9000
-            required: true
-
-  - variable: appVolumeMounts
-    label: "Minio Storage"
-    group: "Storage"
-    schema:
-      type: dict
-      attrs:
-        - variable: export
-          label: "Data Volume"
-          schema:
-            type: dict
-            attrs:
-              - variable: datasetName
-                label: "Minio Data Volume Name"
-                schema:
-                  type: string
-                  hidden: true
-                  $ref:
-                    - "normalize/ixVolume"
-                  show_if: [["hostPathEnabled", "=", false]]
-                  default: "ix-minio"
-                  editable: false
-              - variable: mountPath
-                label: "Minio Data Mount Path"
-                description: "Path where the volume will be mounted inside the pod"
-                schema:
-                  type: path
-                  hidden: true
-                  editable: false
-                  default: "/export"
-              - variable: hostPathEnabled
-                label: "Enable Host Path for Minio Data Volume"
-                schema:
-                  type: boolean
-                  default: false
-                  show_subquestions_if: true
-                  subquestions:
-                    - variable: hostPath
-                      label: "Host Path for Minio Data Volume"
-                      schema:
-                        type: hostpath
-                        required: true

test/minio/1.1.0/templates/_helpers.tpl

-{{/*
-Determine secret name.
-*/}}
-{{- define "minio.secretName" -}}
-{{- include "common.names.fullname" . -}}
-{{- end -}}

test/minio/1.1.0/templates/deployment.yaml

-{{ $scheme := "http" }}
-apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }}
-kind: Deployment
-metadata:
-  name: {{ template "common.names.fullname" . }}
-  labels:
-    app: {{ template "common.names.name" . }}
-    chart: {{ template "common.names.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ (default 1 .Values.replicas) }}
-  strategy:
-    type: {{ (default "Recreate" .Values.updateStrategy ) }}
-  selector:
-    matchLabels:
-      app: {{ template "common.names.name" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      name: {{ template "common.names.fullname" . }}
-      labels:
-        app: {{ template "common.names.name" . }}
-        release: {{ .Release.Name }}
-        {{- include "common.labels.selectorLabels" . | nindent 8 }}
-      annotations: {{ include "common.annotations" . | nindent 8 }}
-    spec:
-      serviceAccountName: {{ include "common.names.serviceAccountName" . | quote }}
-      containers:
-        - name: {{ .Chart.Name }}
-          {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
-          {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }}
-          command:
-            - "/bin/sh"
-            - "-ce"
-            - "/usr/bin/docker-entrypoint.sh minio server /export {{ (.Values.extraArgs | default list) | join " " }}"
-          ports:
-            - name: {{ $scheme }}
-              containerPort: 9000
-          env:
-            {{ $secretName := (include "minio.secretName" .) }}
-            {{ $envList := (default list .Values.environment) }}
-            {{ $envList = mustAppend $envList (dict "name" "MINIO_ACCESS_KEY" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }}
-            {{ $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 }}

test/minio/1.1.0/templates/secrets.yaml

-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "minio.secretName" . }}
-  labels: {{ include "common.labels" . | nindent 4 }}
-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 }}

test/minio/1.1.0/test_values.yaml

-## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the
-##
-image:
-  repository: minio/minio
-  tag: RELEASE.2020-11-19T23-48-16Z
-  pullPolicy: IfNotPresent
-
-## Additional arguments to pass to minio binary
-extraArgs: []
-
-updateStrategy: RollingUpdate
-
-service:
-  nodePort: 32001
-
-environmentVariables: []
-  ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html
-
-emptyDirVolumes: true
-appVolumeMounts:
-  export:
-    emptyDir: true
-    mountPath: "/export"

test/minio/1.2.0/.helmignore

-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-# OWNERS file for Kubernetes
-OWNERS
\ No newline at end of file

test/minio/1.2.0/Chart.yaml

-apiVersion: v1
-description: High Performance, Kubernetes Native Object Storage
-name: minio
-version: 1.2.0
-appVersion: master
-keywords:
-- storage
-- object-storage
-- S3
-home: https://min.io
-icon: https://min.io/resources/img/logo/MINIO_wordmark.png
-sources:
-- https://github.com/minio/minio
-- https://github.com/minio/charts
-upstream_version: 8.0.5
-dependencies:
-  - name: common
-    repository: file://../../../library/common/2101.0.0
-    version: 2101.0.0

test/minio/1.2.0/README.md

-MinIO
-=====
-
-[MinIO](https://min.io) is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads.
-
-MinIO supports [distributed mode](https://docs.minio.io/docs/distributed-minio-quickstart-guide). In distributed mode, you can pool multiple drives (even on different machines) into a single object storage server.
-
-For more detailed documentation please visit [here](https://docs.minio.io/)
-
-Introduction
-------------
-
-This chart bootstraps MinIO deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
-
-
-Configuration
--------------
-
-The following table lists the configurable parameters of the MinIO chart and their default values.
-
-| 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.2020-11-06T23-17-07Z`   |
-| `image.pullPolicy`                               | Image pull policy                                                                                                                       | `IfNotPresent`                   |
-| `extraArgs`                                      | Additional command line arguments to pass to the MinIO server                                                                           | `[]`                             |
-| `accessKey`                                      | Default access key (5 to 20 characters)                                                                                                 | random 20 chars                  |
-| `secretKey`                                      | Default secret key (8 to 40 characters)                                                                                                 | random 40 chars                  |
-| `persistence.enabled`                            | Use persistent volume to store data                                                                                                     | `true`                           |
-| `persistence.size`                               | Size of persistent volume claim                                                                                                         | `500Gi`                          |
-| `persistence.existingClaim`                      | Use an existing PVC to persist data                                                                                                     | `nil`                            |
-| `persistence.storageClass`                       | Storage class name of PVC                                                                                                               | `nil`                            |
-| `persistence.accessMode`                         | ReadWriteOnce or ReadOnly                                                                                                               | `ReadWriteOnce`                  |
-| `persistence.subPath`                            | Mount a sub directory of the persistent volume if set                                                                                   | `""`                             |
-| `environment`                                    | Set MinIO server relevant environment variables in `values.yaml` file. MinIO containers will be passed these variables when they start. | `MINIO_STORAGE_CLASS_STANDARD: EC:4"` |
-
-Some parameters above map to the env variables defined in the [MinIO DockerHub image](https://hub.docker.com/r/minio/minio/).
-
-Pass environment variables to MinIO containers
-----------------------------------------------
-
-To pass environment variables to MinIO containers when deploying via Helm chart, use the below command line format
-
-```bash
-$ helm install --set environment.MINIO_BROWSER=on,environment.MINIO_DOMAIN=domain-name minio/minio
-```
-
-You can add as many environment variables as required, using the above format. Just add `environment.<VARIABLE_NAME>=<value>` under `set` flag.

test/minio/1.2.0/app-readme.md

-[MinIO](https://min.io) is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads.

test/minio/1.2.0/default_values.yaml

-## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the
-##
-image:
-  repository: minio/minio
-  tag: RELEASE.2020-11-19T23-48-16Z
-  pullPolicy: IfNotPresent
-
-## Additional arguments to pass to minio binary
-extraArgs: []
-
-updateStrategy: RollingUpdate
-
-service:
-  nodePort: 9000
-
-environment:
-  ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html
-
-appVolumeMounts:
-  export:
-    emptyDir: true
-    mountPath: "/export"

test/minio/1.2.0/requirements.lock

-dependencies:
-- name: common
-  repository: file://../../../library/common/2101.0.0
-  version: 2101.0.0
-digest: sha256:6ab46f958de11ae6a24d8f7e18417aa9852a8d968d5b0cc94ffa4700449931d6
-generated: "2021-02-04T01:15:55.416388+05:00"

test/minio/1.2.0/templates/NOTES.txt

-Minio can be accessed from the following URL:
-http://$node_ip:{{ .Values.service.nodePort }}/

test/minio/1.2.0/templates/service.yaml

-{{ $svc := .Values.service }}
-{{ $selectors := list }}
-{{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }}
-{{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }}
-{{ $ports := list }}
-{{ $ports = mustAppend $ports (dict "name" "http" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }}
-{{ $params := . }}
-{{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }}
-{{ $_1 := set .Values "extraSelectorLabels" $selectors }}
-{{ include "common.classes.service" $params }}

test/minio/1.2.0/templates/serviceaccount.yaml

-{{ include "common.serviceaccount" . }}

test/minio/1.1.0/Chart.yaml → test/minio/1.2.1/Chart.yaml

 apiVersion: v1
 description: High Performance, Kubernetes Native Object Storage
 name: minio
-version: 1.1.0
-appVersion: master
+version: 1.2.1
+appVersion: RELEASE.2021-02-19T04-38-02Z
 keywords:
 - storage
 - object-storage

test/minio/1.2.1/ix_values.yaml

+image:
+  repository: minio/minio
+  tag: RELEASE.2021-02-19T04-38-02Z
+  pullPolicy: IfNotPresent

test/minio/1.2.0/questions.yaml → test/minio/1.2.1/questions.yaml

@@ -18,42 +18,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: "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"

test/minio/1.2.0/test_values.yaml → test/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

test/nextcloud/1.2.0/Chart.yaml → test/nextcloud/1.2.1/Chart.yaml

 apiVersion: v2
 name: nextcloud
-version: 1.2.0
-appVersion: 19.0.3
+version: 1.2.1
+appVersion: 20.0.7
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
 - nextcloud

test/nextcloud/1.2.1/ix_values.yaml

+image:
+  repository: nextcloud
+  tag: 20.0.7
+  pullPolicy: IfNotPresent

test/nextcloud/1.2.0/questions.yaml → test/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"

test/plex/1.1.0/Chart.yaml → test/plex/1.1.1/Chart.yaml

 apiVersion: v2
-appVersion: 1.20.2.3402
+appVersion: 1.21.3.4046-3c1c83ba4
 description: Plex Media Server
 name: plex
-version: 1.1.0
+version: 1.1.1
 keywords:
   - plex
 home: https://plex.tv/

test/plex/1.1.1/ix_values.yaml

+image:
+  repository: plexinc/pms-docker
+  tag: 1.21.3.4046-3c1c83ba4
+  pullPolicy: IfNotPresent

test/plex/1.1.0/questions.yaml → test/plex/1.1.1/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"
@@ -149,6 +113,7 @@ questions:
       type: dict
       $ref:
         - "definitions/gpuConfiguration"
+      attrs: []
 
   - variable: appVolumeMounts
     label: "Plex Storage"