diff --git a/charts/collabora/2.0.11/.helmignore b/charts/collabora/2.0.12/.helmignore similarity index 100% rename from charts/collabora/2.0.11/.helmignore rename to charts/collabora/2.0.12/.helmignore diff --git a/charts/collabora/2.0.11/Chart.lock b/charts/collabora/2.0.12/Chart.lock similarity index 100% rename from charts/collabora/2.0.11/Chart.lock rename to charts/collabora/2.0.12/Chart.lock diff --git a/charts/collabora/2.0.11/Chart.yaml b/charts/collabora/2.0.12/Chart.yaml similarity index 97% rename from charts/collabora/2.0.11/Chart.yaml rename to charts/collabora/2.0.12/Chart.yaml index 754ad505b0..9fb1637cc4 100644 --- a/charts/collabora/2.0.11/Chart.yaml +++ b/charts/collabora/2.0.12/Chart.yaml @@ -4,7 +4,7 @@ description: Collabora is a collaborative online office suite based on LibreOffi annotations: title: Collabora type: application -version: 2.0.11 +version: 2.0.12 apiVersion: v2 appVersion: 23.05.10.1.1 kubeVersion: '>=1.16.0-0' diff --git a/charts/collabora/2.0.11/README.md b/charts/collabora/2.0.12/README.md similarity index 100% rename from charts/collabora/2.0.11/README.md rename to charts/collabora/2.0.12/README.md diff --git a/charts/collabora/2.0.11/app-readme.md b/charts/collabora/2.0.12/app-readme.md similarity index 100% rename from charts/collabora/2.0.11/app-readme.md rename to charts/collabora/2.0.12/app-readme.md diff --git a/charts/collabora/2.0.11/charts/common-1.2.9.tgz b/charts/collabora/2.0.12/charts/common-1.2.9.tgz similarity index 100% rename from charts/collabora/2.0.11/charts/common-1.2.9.tgz rename to charts/collabora/2.0.12/charts/common-1.2.9.tgz diff --git a/charts/collabora/2.0.11/ci/basic-values.yaml b/charts/collabora/2.0.12/ci/basic-values.yaml similarity index 100% rename from charts/collabora/2.0.11/ci/basic-values.yaml rename to charts/collabora/2.0.12/ci/basic-values.yaml diff --git a/charts/collabora/2.0.11/ci/https-values.yaml b/charts/collabora/2.0.12/ci/https-values.yaml similarity index 100% rename from charts/collabora/2.0.11/ci/https-values.yaml rename to charts/collabora/2.0.12/ci/https-values.yaml diff --git a/charts/collabora/2.0.11/ci/noauth-values.yaml b/charts/collabora/2.0.12/ci/noauth-values.yaml similarity index 100% rename from charts/collabora/2.0.11/ci/noauth-values.yaml rename to charts/collabora/2.0.12/ci/noauth-values.yaml diff --git a/charts/collabora/2.0.11/ix_values.yaml b/charts/collabora/2.0.12/ix_values.yaml similarity index 100% rename from charts/collabora/2.0.11/ix_values.yaml rename to charts/collabora/2.0.12/ix_values.yaml diff --git a/charts/collabora/2.0.11/metadata.yaml b/charts/collabora/2.0.12/metadata.yaml similarity index 100% rename from charts/collabora/2.0.11/metadata.yaml rename to charts/collabora/2.0.12/metadata.yaml diff --git a/charts/collabora/2.0.11/migrations/migrate b/charts/collabora/2.0.12/migrations/migrate similarity index 100% rename from charts/collabora/2.0.11/migrations/migrate rename to charts/collabora/2.0.12/migrations/migrate diff --git a/charts/collabora/2.0.11/questions.yaml b/charts/collabora/2.0.12/questions.yaml similarity index 100% rename from charts/collabora/2.0.11/questions.yaml rename to charts/collabora/2.0.12/questions.yaml diff --git a/charts/collabora/2.0.11/templates/NOTES.txt b/charts/collabora/2.0.12/templates/NOTES.txt similarity index 100% rename from charts/collabora/2.0.11/templates/NOTES.txt rename to charts/collabora/2.0.12/templates/NOTES.txt diff --git a/charts/collabora/2.0.11/templates/_collabora.tpl b/charts/collabora/2.0.12/templates/_collabora.tpl similarity index 100% rename from charts/collabora/2.0.11/templates/_collabora.tpl rename to charts/collabora/2.0.12/templates/_collabora.tpl diff --git a/charts/collabora/2.0.11/templates/_configuration.tpl b/charts/collabora/2.0.12/templates/_configuration.tpl similarity index 100% rename from charts/collabora/2.0.11/templates/_configuration.tpl rename to charts/collabora/2.0.12/templates/_configuration.tpl diff --git a/charts/collabora/2.0.11/templates/_migration.tpl b/charts/collabora/2.0.12/templates/_migration.tpl similarity index 100% rename from charts/collabora/2.0.11/templates/_migration.tpl rename to charts/collabora/2.0.12/templates/_migration.tpl diff --git a/charts/collabora/2.0.11/templates/_nginx.tpl b/charts/collabora/2.0.12/templates/_nginx.tpl similarity index 100% rename from charts/collabora/2.0.11/templates/_nginx.tpl rename to charts/collabora/2.0.12/templates/_nginx.tpl diff --git a/charts/collabora/2.0.11/templates/_persistance.tpl b/charts/collabora/2.0.12/templates/_persistance.tpl similarity index 91% rename from charts/collabora/2.0.11/templates/_persistance.tpl rename to charts/collabora/2.0.12/templates/_persistance.tpl index 2dd480e4f9..3c906c887e 100644 --- a/charts/collabora/2.0.11/templates/_persistance.tpl +++ b/charts/collabora/2.0.12/templates/_persistance.tpl @@ -17,6 +17,13 @@ persistence: nginx: nginx: mountPath: /var/cache/nginx + varrun: + enabled: true + type: emptyDir + targetSelector: + nginx: + nginx: + mountPath: /var/run {{- if .Values.collaboraNetwork.certificateID }} nginx-conf: enabled: true diff --git a/charts/collabora/2.0.11/templates/_portal.tpl b/charts/collabora/2.0.12/templates/_portal.tpl similarity index 100% rename from charts/collabora/2.0.11/templates/_portal.tpl rename to charts/collabora/2.0.12/templates/_portal.tpl diff --git a/charts/collabora/2.0.11/templates/_service.tpl b/charts/collabora/2.0.12/templates/_service.tpl similarity index 100% rename from charts/collabora/2.0.11/templates/_service.tpl rename to charts/collabora/2.0.12/templates/_service.tpl diff --git a/charts/collabora/2.0.11/templates/common.yaml b/charts/collabora/2.0.12/templates/common.yaml similarity index 100% rename from charts/collabora/2.0.11/templates/common.yaml rename to charts/collabora/2.0.12/templates/common.yaml diff --git a/charts/collabora/2.0.11/to_keep_versions.md b/charts/collabora/2.0.12/to_keep_versions.md similarity index 100% rename from charts/collabora/2.0.11/to_keep_versions.md rename to charts/collabora/2.0.12/to_keep_versions.md diff --git a/charts/plex/2.0.3/.helmignore b/charts/plex/2.0.4/.helmignore similarity index 100% rename from charts/plex/2.0.3/.helmignore rename to charts/plex/2.0.4/.helmignore diff --git a/charts/plex/2.0.3/Chart.lock b/charts/plex/2.0.4/Chart.lock similarity index 100% rename from charts/plex/2.0.3/Chart.lock rename to charts/plex/2.0.4/Chart.lock diff --git a/charts/plex/2.0.3/Chart.yaml b/charts/plex/2.0.4/Chart.yaml similarity index 97% rename from charts/plex/2.0.3/Chart.yaml rename to charts/plex/2.0.4/Chart.yaml index f459abf3ae..69e8d096e1 100644 --- a/charts/plex/2.0.3/Chart.yaml +++ b/charts/plex/2.0.4/Chart.yaml @@ -4,7 +4,7 @@ description: Plex is a media server that allows you to stream your media to any annotations: title: Plex type: application -version: 2.0.3 +version: 2.0.4 apiVersion: v2 appVersion: 1.40.1.8227 kubeVersion: '>=1.16.0-0' diff --git a/charts/plex/2.0.3/README.md b/charts/plex/2.0.4/README.md similarity index 100% rename from charts/plex/2.0.3/README.md rename to charts/plex/2.0.4/README.md diff --git a/charts/plex/2.0.3/app-readme.md b/charts/plex/2.0.4/app-readme.md similarity index 100% rename from charts/plex/2.0.3/app-readme.md rename to charts/plex/2.0.4/app-readme.md diff --git a/charts/plex/2.0.3/charts/common-1.2.9.tgz b/charts/plex/2.0.4/charts/common-1.2.9.tgz similarity index 100% rename from charts/plex/2.0.3/charts/common-1.2.9.tgz rename to charts/plex/2.0.4/charts/common-1.2.9.tgz diff --git a/charts/plex/2.0.3/ci/basic-values.yaml b/charts/plex/2.0.4/ci/basic-values.yaml similarity index 72% rename from charts/plex/2.0.3/ci/basic-values.yaml rename to charts/plex/2.0.4/ci/basic-values.yaml index 53103a7ba6..b87e3f89f6 100644 --- a/charts/plex/2.0.3/ci/basic-values.yaml +++ b/charts/plex/2.0.4/ci/basic-values.yaml @@ -10,6 +10,11 @@ plexStorage: type: pvc config: type: pvc + logs: + type: emptyDir + emptyDirConfig: + medium: "" + size: "" transcode: type: emptyDir emptyDirConfig: diff --git a/charts/plex/2.0.3/ci/extra-values.yaml b/charts/plex/2.0.4/ci/extra-values.yaml similarity index 52% rename from charts/plex/2.0.3/ci/extra-values.yaml rename to charts/plex/2.0.4/ci/extra-values.yaml index 0b3e14f5a5..de62ad3655 100644 --- a/charts/plex/2.0.3/ci/extra-values.yaml +++ b/charts/plex/2.0.4/ci/extra-values.yaml @@ -6,13 +6,18 @@ plexStorage: type: pvc config: type: pvc + logs: + type: emptyDir + emptyDirConfig: + medium: "" + size: "" transcode: type: emptyDir emptyDirConfig: medium: "" size: "" additionalStorages: - - type: pvc - mountPath: /action_movies - - type: pvc - mountPath: /adventure_movies + - type: pvc + mountPath: /action_movies + - type: pvc + mountPath: /adventure_movies diff --git a/charts/plex/2.0.3/ci/hostNet-values.yaml b/charts/plex/2.0.4/ci/hostNet-values.yaml similarity index 71% rename from charts/plex/2.0.3/ci/hostNet-values.yaml rename to charts/plex/2.0.4/ci/hostNet-values.yaml index 1ca12c20e4..0198049b03 100644 --- a/charts/plex/2.0.3/ci/hostNet-values.yaml +++ b/charts/plex/2.0.4/ci/hostNet-values.yaml @@ -7,6 +7,11 @@ plexStorage: type: pvc config: type: pvc + logs: + type: emptyDir + emptyDirConfig: + medium: "" + size: "" transcode: type: emptyDir emptyDirConfig: diff --git a/charts/plex/2.0.3/ix_values.yaml b/charts/plex/2.0.4/ix_values.yaml similarity index 90% rename from charts/plex/2.0.3/ix_values.yaml rename to charts/plex/2.0.4/ix_values.yaml index 6cd7298cb8..63d4f4b1e6 100644 --- a/charts/plex/2.0.3/ix_values.yaml +++ b/charts/plex/2.0.4/ix_values.yaml @@ -34,6 +34,10 @@ plexStorage: type: ixVolume ixVolumeConfig: datasetName: config + logs: + type: ixVolume + ixVolumeConfig: + datasetName: logs transcode: type: ixVolume ixVolumeConfig: diff --git a/charts/plex/2.0.3/metadata.yaml b/charts/plex/2.0.4/metadata.yaml similarity index 100% rename from charts/plex/2.0.3/metadata.yaml rename to charts/plex/2.0.4/metadata.yaml diff --git a/charts/plex/2.0.3/migrations/migrate b/charts/plex/2.0.4/migrations/migrate similarity index 100% rename from charts/plex/2.0.3/migrations/migrate rename to charts/plex/2.0.4/migrations/migrate diff --git a/charts/plex/2.0.3/questions.yaml b/charts/plex/2.0.4/questions.yaml similarity index 83% rename from charts/plex/2.0.3/questions.yaml rename to charts/plex/2.0.4/questions.yaml index 2a775a2f94..bdf6b84993 100644 --- a/charts/plex/2.0.3/questions.yaml +++ b/charts/plex/2.0.4/questions.yaml @@ -327,6 +327,115 @@ questions: type: hostpath show_if: [["aclEnable", "=", false]] required: true + - variable: logs + label: Plex Logs Storage + description: The path to store Plex Logs. + schema: + type: dict + attrs: + - variable: type + label: Type + description: | + ixVolume: Is dataset created automatically by the system.
+ Host Path: Is a path that already exists on the system.
+ emptyDir: Is a temporary directory that will be created on the disk or in memory. + schema: + type: string + required: true + immutable: true + default: "emptyDir" + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - value: "emptyDir" + description: emptyDir (Temporary directory that will be created on the disk or in memory) + - variable: ixVolumeConfig + label: ixVolume Configuration + description: The configuration for the ixVolume dataset. + schema: + type: dict + show_if: [["type", "=", "ixVolume"]] + $ref: + - "normalize/ixVolume" + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: datasetName + label: Dataset Name + description: The name of the dataset to use for storage. + schema: + type: string + required: true + immutable: true + hidden: true + default: "logs" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: emptyDirConfig + label: emptyDir Configuration + schema: + type: dict + show_if: [["type", "=", "emptyDir"]] + attrs: + - variable: medium + label: emptyDir Medium + description: | + Disk: Creates a temporary directory on the disk.
+ Memory: Creates a temporary directory in memory. + schema: + type: string + default: "" + enum: + - value: "" + description: Disk (Temporary directory created on the disk) + - value: "Memory" + description: Memory (Temporary directory created in memory) + - variable: size + label: emptyDir Size Limit (in Gi) + description: | + The maximum size (in Gi) of the temporary directory.
+ For example: 2 + schema: + type: int + "null": true + default: 2 + - variable: hostPathConfig + label: Host Path Configuration + schema: + type: dict + show_if: [["type", "=", "hostPath"]] + attrs: + - variable: aclEnable + label: Enable ACL + description: Enable ACL for the dataset. + schema: + type: boolean + default: false + - variable: acl + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + $ref: + - "normalize/acl" + - variable: hostPath + label: Host Path + description: The host path to use for storage. + schema: + type: hostpath + show_if: [["aclEnable", "=", false]] + required: true - variable: transcode label: Plex Transcode Storage description: The path to store Plex Transcode. diff --git a/charts/plex/2.0.3/templates/NOTES.txt b/charts/plex/2.0.4/templates/NOTES.txt similarity index 100% rename from charts/plex/2.0.3/templates/NOTES.txt rename to charts/plex/2.0.4/templates/NOTES.txt diff --git a/charts/plex/2.0.3/templates/_migration.tpl b/charts/plex/2.0.4/templates/_migration.tpl similarity index 100% rename from charts/plex/2.0.3/templates/_migration.tpl rename to charts/plex/2.0.4/templates/_migration.tpl diff --git a/charts/plex/2.0.3/templates/_persistence.tpl b/charts/plex/2.0.4/templates/_persistence.tpl similarity index 83% rename from charts/plex/2.0.3/templates/_persistence.tpl rename to charts/plex/2.0.4/templates/_persistence.tpl index 9fdff66dd5..a317111720 100644 --- a/charts/plex/2.0.3/templates/_persistence.tpl +++ b/charts/plex/2.0.4/templates/_persistence.tpl @@ -30,7 +30,10 @@ persistence: mountPath: /shared logs: enabled: true - type: emptyDir + {{- if not .Values.plexStorage.logs -}} + {{- $_ := set .Values.plexStorage "logs" (dict "type" "emptyDir" "emptyDirConfig" (dict "medium" "" "size" "")) -}} + {{- end }} + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.plexStorage.logs) | nindent 4 }} targetSelector: plex: plex: diff --git a/charts/plex/2.0.3/templates/_plex.tpl b/charts/plex/2.0.4/templates/_plex.tpl similarity index 100% rename from charts/plex/2.0.3/templates/_plex.tpl rename to charts/plex/2.0.4/templates/_plex.tpl diff --git a/charts/plex/2.0.3/templates/_portal.tpl b/charts/plex/2.0.4/templates/_portal.tpl similarity index 100% rename from charts/plex/2.0.3/templates/_portal.tpl rename to charts/plex/2.0.4/templates/_portal.tpl diff --git a/charts/plex/2.0.3/templates/_service.tpl b/charts/plex/2.0.4/templates/_service.tpl similarity index 100% rename from charts/plex/2.0.3/templates/_service.tpl rename to charts/plex/2.0.4/templates/_service.tpl diff --git a/charts/plex/2.0.3/templates/common.yaml b/charts/plex/2.0.4/templates/common.yaml similarity index 100% rename from charts/plex/2.0.3/templates/common.yaml rename to charts/plex/2.0.4/templates/common.yaml diff --git a/charts/plex/2.0.3/to_keep_versions.md b/charts/plex/2.0.4/to_keep_versions.md similarity index 100% rename from charts/plex/2.0.3/to_keep_versions.md rename to charts/plex/2.0.4/to_keep_versions.md