diff --git a/community/homarr/1.1.3/README.md b/community/homarr/1.1.3/README.md deleted file mode 100644 index c7d12681db..0000000000 --- a/community/homarr/1.1.3/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Homarr - -[Homarr](https://github.com/ajnart/homarr) is a sleek, modern dashboard that puts all of your apps and services at your fingertips. - -> When application is installed, a container will be launched with **root** privileges. -> This is required in order to apply the correct permissions to the `Homarr` directories. -> Afterward, the `Homarr` container will run as a **non**-root user (Default: `568`). -> All mounted storage(s) will be `chown`ed only if the parent directory does not match the configured user. diff --git a/community/homarr/1.1.3/app-readme.md b/community/homarr/1.1.3/app-readme.md deleted file mode 100644 index c7d12681db..0000000000 --- a/community/homarr/1.1.3/app-readme.md +++ /dev/null @@ -1,8 +0,0 @@ -# Homarr - -[Homarr](https://github.com/ajnart/homarr) is a sleek, modern dashboard that puts all of your apps and services at your fingertips. - -> When application is installed, a container will be launched with **root** privileges. -> This is required in order to apply the correct permissions to the `Homarr` directories. -> Afterward, the `Homarr` container will run as a **non**-root user (Default: `568`). -> All mounted storage(s) will be `chown`ed only if the parent directory does not match the configured user. diff --git a/community/homarr/1.1.3/ci/basic-values.yaml b/community/homarr/1.1.3/ci/basic-values.yaml deleted file mode 100644 index 4a600280d8..0000000000 --- a/community/homarr/1.1.3/ci/basic-values.yaml +++ /dev/null @@ -1,14 +0,0 @@ -homarrNetwork: - webPort: 31000 - -homarrRunAs: - user: 1000 - group: 1000 - -homarrStorage: - configs: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/configs - icons: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/icons diff --git a/community/homarr/1.1.3/ci/extra-values.yaml b/community/homarr/1.1.3/ci/extra-values.yaml deleted file mode 100644 index e2d978dd86..0000000000 --- a/community/homarr/1.1.3/ci/extra-values.yaml +++ /dev/null @@ -1,23 +0,0 @@ -homarrConfig: - password: secret - additionalEnvs: - - name: DISABLE_EDIT_MODE - value: true - -homarrNetwork: - webPort: 31000 - -homarrStorage: - configs: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/configs - icons: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/icons - additionalStorages: - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data1 - mountPath: /data1 - - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/data2 - mountPath: /data2 diff --git a/community/homarr/1.1.3/ci/hostNet-values.yaml b/community/homarr/1.1.3/ci/hostNet-values.yaml deleted file mode 100644 index 7aba0604f9..0000000000 --- a/community/homarr/1.1.3/ci/hostNet-values.yaml +++ /dev/null @@ -1,11 +0,0 @@ -homarrNetwork: - webPort: 30000 - hostNetwork: true - -homarrStorage: - configs: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/configs - icons: - type: hostPath - hostPath: /mnt/{{ .Release.Namespace }}/icons diff --git a/community/homarr/1.1.3/questions.yaml b/community/homarr/1.1.3/questions.yaml deleted file mode 100644 index 7ccdb82856..0000000000 --- a/community/homarr/1.1.3/questions.yaml +++ /dev/null @@ -1,338 +0,0 @@ -groups: - - name: Homarr Configuration - description: Configure Homarr - - name: User and Group Configuration - description: Configure User and Group for Homarr - - name: Network Configuration - description: Configure Network for Homarr - - name: Storage Configuration - description: Configure Storage for Homarr - - name: Resources Configuration - description: Configure Resources for Homarr - -portals: - web_portal: - protocols: - - "$kubernetes-resource_configmap_portal_protocol" - host: - - "$kubernetes-resource_configmap_portal_host" - ports: - - "$kubernetes-resource_configmap_portal_port" - path: "$kubernetes-resource_configmap_portal_path" - -questions: - - variable: TZ - group: Homarr Configuration - label: Timezone - schema: - type: string - default: Etc/UTC - required: true - $ref: - - definitions/timezone - - - variable: homarrConfig - label: "" - group: Homarr Configuration - schema: - type: dict - attrs: - - variable: password - label: Password (Optional) - description: Password for Homarr. - schema: - type: string - default: "" - private: true - - variable: additionalEnvs - label: Additional Environment Variables - description: Configure additional environment variables for Homarr. - schema: - type: list - default: [] - items: - - variable: env - label: Environment Variable - schema: - type: dict - attrs: - - variable: name - label: Name - schema: - type: string - required: true - - variable: value - label: Value - schema: - type: string - required: true - - - variable: homarrRunAs - label: "" - group: User and Group Configuration - schema: - type: dict - attrs: - - variable: user - label: User ID - description: The user id that Homarr will run as. - schema: - type: int - min: 2 - default: 568 - required: true - - variable: group - label: Group ID - description: The group id that Homarr will run as. - schema: - type: int - min: 2 - default: 568 - required: true - - - variable: homarrNetwork - label: "" - group: Network Configuration - schema: - type: dict - attrs: - - variable: webPort - label: Web Port - description: The port for the Homarr Web UI. - schema: - type: int - default: 30052 - min: 9000 - max: 65535 - required: true - - variable: hostNetwork - label: Host Network - description: | - Bind to the host network. It's recommended to keep this disabled.
- schema: - type: boolean - default: false - - - variable: homarrStorage - label: "" - group: Storage Configuration - schema: - type: dict - attrs: - - variable: configs - label: Homarr Config Storage - description: The path to store Homarr Configuration. - 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. - schema: - type: string - required: true - immutable: true - default: "ixVolume" - enum: - - value: "hostPath" - description: Host Path (Path that already exists on the system) - - value: "ixVolume" - description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "configs" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - variable: icons - label: Homarr Icon Storage - description: The path to store Homarr Icons. - 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. - schema: - type: string - required: true - immutable: true - default: "ixVolume" - enum: - - value: "hostPath" - description: Host Path (Path that already exists on the system) - - value: "ixVolume" - description: ixVolume (Dataset created automatically by the system) - - variable: datasetName - label: Dataset Name - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - hidden: true - immutable: true - default: "icons" - $ref: - - "normalize/ixVolume" - - variable: hostPath - label: Host Path - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - immutable: true - required: true - - variable: additionalStorages - label: Additional Storage - description: Additional storage for Homarr. - schema: - type: list - default: [] - items: - - variable: storageEntry - label: Storage Entry - 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.
- SMB Share: Is a SMB share that is mounted to a persistent volume claim. - schema: - type: string - required: true - default: "ixVolume" - immutable: true - enum: - - value: "hostPath" - description: Host Path (Path that already exists on the system) - - value: "ixVolume" - description: ixVolume (Dataset created automatically by the system) - - value: "smb-pv-pvc" - description: SMB Share (Mounts a persistent volume claim to a SMB share) - - variable: mountPath - label: Mount Path - description: The path inside the container to mount the storage. - schema: - type: path - required: true - - variable: hostPath - label: Host Path - description: The host path to use for storage. - schema: - type: hostpath - show_if: [["type", "=", "hostPath"]] - required: true - - variable: datasetName - label: Dataset Name - description: The name of the dataset to use for storage. - schema: - type: string - show_if: [["type", "=", "ixVolume"]] - required: true - immutable: true - default: "storage_entry" - $ref: - - "normalize/ixVolume" - - variable: server - label: Server - description: The server for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - - variable: share - label: Share - description: The share name for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - - variable: domain - label: Domain (Optional) - description: The domain for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - - variable: username - label: Username - description: The username for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - - variable: password - label: Password - description: The password for the SMB share. - schema: - type: string - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - private: true - - variable: size - label: Size (in Gi) - description: The size of the volume quota. - schema: - type: int - show_if: [["type", "=", "smb-pv-pvc"]] - required: true - min: 1 - default: 1 - - - variable: resources - group: Resources Configuration - label: "" - schema: - type: dict - attrs: - - variable: limits - label: Limits - schema: - type: dict - attrs: - - variable: cpu - label: CPU - description: CPU limit for Homarr. - schema: - type: string - max_length: 6 - valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$' - valid_chars_error: | - Valid CPU limit formats are
- - Plain Integer - eg. 1
- - Float - eg. 0.5
- - Milicpu - eg. 500m - default: "4000m" - required: true - - variable: memory - label: Memory - description: Memory limit for Homarr. - schema: - type: string - max_length: 12 - valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$' - valid_chars_error: | - Valid Memory limit formats are
- - Suffixed with E/P/T/G/M/K - eg. 1G
- - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi
- - Plain Integer in bytes - eg. 1024
- - Exponent - eg. 134e6 - default: "8Gi" - required: true diff --git a/community/homarr/1.1.3/templates/_persistence.tpl b/community/homarr/1.1.3/templates/_persistence.tpl deleted file mode 100644 index 5e0bcc8ced..0000000000 --- a/community/homarr/1.1.3/templates/_persistence.tpl +++ /dev/null @@ -1,59 +0,0 @@ -{{- define "homarr.persistence" -}} -persistence: - configs: - enabled: true - type: {{ .Values.homarrStorage.configs.type }} - datasetName: {{ .Values.homarrStorage.configs.datasetName | default "" }} - hostPath: {{ .Values.homarrStorage.configs.hostPath | default "" }} - targetSelector: - homarr: - homarr: - mountPath: /app/data/configs - 01-permissions: - mountPath: /mnt/directories/configs - icons: - enabled: true - type: {{ .Values.homarrStorage.icons.type }} - datasetName: {{ .Values.homarrStorage.icons.datasetName | default "" }} - hostPath: {{ .Values.homarrStorage.icons.hostPath | default "" }} - targetSelector: - homarr: - homarr: - mountPath: /app/data/icons - 01-permissions: - mountPath: /mnt/directories/icons - tmp: - enabled: true - type: emptyDir - targetSelector: - homarr: - homarr: - mountPath: /tmp - {{- range $idx, $storage := .Values.homarrStorage.additionalStorages }} - {{ printf "homarr-%v" (int $idx) }}: - {{- $size := "" -}} - {{- if $storage.size -}} - {{- $size = (printf "%vGi" $storage.size) -}} - {{- end }} - enabled: true - type: {{ $storage.type }} - datasetName: {{ $storage.datasetName | default "" }} - hostPath: {{ $storage.hostPath | default "" }} - server: {{ $storage.server | default "" }} - share: {{ $storage.share | default "" }} - domain: {{ $storage.domain | default "" }} - username: {{ $storage.username | default "" }} - password: {{ $storage.password | default "" }} - size: {{ $size }} - {{- if eq $storage.type "smb-pv-pvc" }} - mountOptions: - - key: noperm - {{- end }} - targetSelector: - homarr: - homarr: - mountPath: {{ $storage.mountPath }} - 01-permissions: - mountPath: /mnt/directories{{ $storage.mountPath }} - {{- end }} -{{- end -}} diff --git a/community/homarr/1.1.3/Chart.lock b/community/homarr/2.0.0/Chart.lock similarity index 100% rename from community/homarr/1.1.3/Chart.lock rename to community/homarr/2.0.0/Chart.lock diff --git a/community/homarr/1.1.3/Chart.yaml b/community/homarr/2.0.0/Chart.yaml similarity index 94% rename from community/homarr/1.1.3/Chart.yaml rename to community/homarr/2.0.0/Chart.yaml index 1084a162bd..2414f2ca78 100644 --- a/community/homarr/1.1.3/Chart.yaml +++ b/community/homarr/2.0.0/Chart.yaml @@ -3,9 +3,9 @@ description: Homarr is a sleek, modern dashboard that puts all of your apps and annotations: title: Homarr type: application -version: 1.1.3 +version: 2.0.0 apiVersion: v2 -appVersion: 0.13.4 +appVersion: 0.14.2 kubeVersion: '>=1.16.0-0' maintainers: - name: truenas diff --git a/community/homarr/2.0.0/README.md b/community/homarr/2.0.0/README.md new file mode 100644 index 0000000000..56cfec9765 --- /dev/null +++ b/community/homarr/2.0.0/README.md @@ -0,0 +1,9 @@ +# Homarr + +[Homarr](https://github.com/ajnart/homarr) is a sleek, modern dashboard that puts all of your apps and services at your fingertips. + +## Upgrade to 2.0.0 + +Direct upgrade to 2.x.x is not possible, due to major upstream changes. +The changes require new storage configuration that cannot be assumed, nor configured +during the upgrade. Please re-install in order to configure this new storage. diff --git a/community/homarr/2.0.0/app-readme.md b/community/homarr/2.0.0/app-readme.md new file mode 100644 index 0000000000..56cfec9765 --- /dev/null +++ b/community/homarr/2.0.0/app-readme.md @@ -0,0 +1,9 @@ +# Homarr + +[Homarr](https://github.com/ajnart/homarr) is a sleek, modern dashboard that puts all of your apps and services at your fingertips. + +## Upgrade to 2.0.0 + +Direct upgrade to 2.x.x is not possible, due to major upstream changes. +The changes require new storage configuration that cannot be assumed, nor configured +during the upgrade. Please re-install in order to configure this new storage. diff --git a/community/homarr/1.1.3/charts/common-1.2.3.tgz b/community/homarr/2.0.0/charts/common-1.2.3.tgz similarity index 100% rename from community/homarr/1.1.3/charts/common-1.2.3.tgz rename to community/homarr/2.0.0/charts/common-1.2.3.tgz diff --git a/community/homarr/2.0.0/ci/basic-values.yaml b/community/homarr/2.0.0/ci/basic-values.yaml new file mode 100644 index 0000000000..bf97e9b36b --- /dev/null +++ b/community/homarr/2.0.0/ci/basic-values.yaml @@ -0,0 +1,14 @@ +homarrNetwork: + webPort: 31000 + +homarrRunAs: + user: 1000 + group: 1000 + +homarrStorage: + configs: + type: pvc + data: + type: pvc + icons: + type: pvc diff --git a/community/homarr/2.0.0/ci/extra-values.yaml b/community/homarr/2.0.0/ci/extra-values.yaml new file mode 100644 index 0000000000..7cc06f818d --- /dev/null +++ b/community/homarr/2.0.0/ci/extra-values.yaml @@ -0,0 +1,21 @@ +homarrConfig: + password: secret + additionalEnvs: + - name: DISABLE_EDIT_MODE + value: true + +homarrNetwork: + webPort: 31000 + +homarrStorage: + configs: + type: pvc + data: + type: pvc + icons: + type: pvc + additionalStorages: + - type: pvc + mountPath: /data1 + - type: pvc + mountPath: /data2 diff --git a/community/homarr/2.0.0/ci/hostNet-values.yaml b/community/homarr/2.0.0/ci/hostNet-values.yaml new file mode 100644 index 0000000000..e8b33a2361 --- /dev/null +++ b/community/homarr/2.0.0/ci/hostNet-values.yaml @@ -0,0 +1,11 @@ +homarrNetwork: + webPort: 30000 + hostNetwork: true + +homarrStorage: + configs: + type: pvc + data: + type: pvc + icons: + type: pvc diff --git a/community/homarr/1.1.3/ix_values.yaml b/community/homarr/2.0.0/ix_values.yaml similarity index 67% rename from community/homarr/1.1.3/ix_values.yaml rename to community/homarr/2.0.0/ix_values.yaml index c9a0678ea4..8200085297 100644 --- a/community/homarr/1.1.3/ix_values.yaml +++ b/community/homarr/2.0.0/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/ajnart/homarr pullPolicy: IfNotPresent - tag: 0.13.4 + tag: 0.14.2 resources: limits: @@ -23,8 +23,14 @@ homarrRunAs: homarrStorage: configs: type: ixVolume - datasetName: configs + ixVolumeConfig: + datasetName: configs + data: + type: ixVolume + ixVolumeConfig: + datasetName: data icons: type: ixVolume - datasetName: icons + ixVolumeConfig: + datasetName: icons additionalStorages: [] diff --git a/community/homarr/1.1.3/metadata.yaml b/community/homarr/2.0.0/metadata.yaml similarity index 100% rename from community/homarr/1.1.3/metadata.yaml rename to community/homarr/2.0.0/metadata.yaml diff --git a/community/homarr/2.0.0/questions.yaml b/community/homarr/2.0.0/questions.yaml new file mode 100644 index 0000000000..2b6ca4a1f9 --- /dev/null +++ b/community/homarr/2.0.0/questions.yaml @@ -0,0 +1,539 @@ +groups: + - name: Homarr Configuration + description: Configure Homarr + - name: User and Group Configuration + description: Configure User and Group for Homarr + - name: Network Configuration + description: Configure Network for Homarr + - name: Storage Configuration + description: Configure Storage for Homarr + - name: Resources Configuration + description: Configure Resources for Homarr + +portals: + web_portal: + protocols: + - "$kubernetes-resource_configmap_portal_protocol" + host: + - "$kubernetes-resource_configmap_portal_host" + ports: + - "$kubernetes-resource_configmap_portal_port" + path: "$kubernetes-resource_configmap_portal_path" + +questions: + - variable: TZ + group: Homarr Configuration + label: Timezone + schema: + type: string + default: Etc/UTC + required: true + $ref: + - definitions/timezone + + - variable: homarrConfig + label: "" + group: Homarr Configuration + schema: + type: dict + attrs: + - variable: additionalEnvs + label: Additional Environment Variables + description: Configure additional environment variables for Homarr. + schema: + type: list + default: [] + items: + - variable: env + label: Environment Variable + schema: + type: dict + attrs: + - variable: name + label: Name + schema: + type: string + required: true + - variable: value + label: Value + schema: + type: string + required: true + + - variable: homarrRunAs + label: "" + group: User and Group Configuration + schema: + type: dict + attrs: + - variable: user + label: User ID + description: The user id that Homarr will run as. + schema: + type: int + min: 2 + default: 568 + required: true + - variable: group + label: Group ID + description: The group id that Homarr will run as. + schema: + type: int + min: 2 + default: 568 + required: true + + - variable: homarrNetwork + label: "" + group: Network Configuration + schema: + type: dict + attrs: + - variable: webPort + label: Web Port + description: The port for the Homarr Web UI. + schema: + type: int + default: 30052 + min: 9000 + max: 65535 + required: true + - variable: hostNetwork + label: Host Network + description: | + Bind to the host network. It's recommended to keep this disabled.
+ schema: + type: boolean + default: false + + - variable: homarrStorage + label: "" + group: Storage Configuration + schema: + type: dict + attrs: + - variable: configs + label: Homarr Config Storage + description: The path to store Homarr Configuration. + 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. + schema: + type: string + required: true + immutable: true + default: "ixVolume" + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - 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: "configs" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - 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]] + immutable: true + required: true + + - variable: data + label: Homarr Data Storage + description: The path to store Homarr Data. + 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. + schema: + type: string + required: true + immutable: true + default: "ixVolume" + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - 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: "data" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - 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]] + immutable: true + required: true + + - variable: icons + label: Homarr Icon Storage + description: The path to store Homarr Icons. + 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. + schema: + type: string + required: true + immutable: true + default: "ixVolume" + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - 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: "icons" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - 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]] + immutable: true + required: true + + - variable: additionalStorages + label: Additional Storage + description: Additional storage for Homarr. + schema: + type: list + default: [] + items: + - variable: storageEntry + label: Storage Entry + 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.
+ SMB Share: Is a SMB share that is mounted to a persistent volume claim. + schema: + type: string + required: true + default: "ixVolume" + immutable: true + enum: + - value: "hostPath" + description: Host Path (Path that already exists on the system) + - value: "ixVolume" + description: ixVolume (Dataset created automatically by the system) + - value: "smb-pv-pvc" + description: SMB Share (Mounts a persistent volume claim to a SMB share) + - variable: readOnly + label: Read Only + description: Mount the volume as read only. + schema: + type: boolean + default: false + - variable: mountPath + label: Mount Path + description: The path inside the container to mount the storage. + schema: + type: path + required: true + - 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]] + immutable: true + required: true + - 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 + default: "storage_entry" + - variable: aclEntries + label: ACL Configuration + schema: + type: dict + show_if: [["aclEnable", "=", true]] + attrs: [] + - variable: smbConfig + label: SMB Share Configuration + description: The configuration for the SMB Share. + schema: + type: dict + show_if: [["type", "=", "smb-pv-pvc"]] + attrs: + - variable: server + label: Server + description: The server for the SMB share. + schema: + type: string + required: true + - variable: share + label: Share + description: The share name for the SMB share. + schema: + type: string + required: true + - variable: domain + label: Domain (Optional) + description: The domain for the SMB share. + schema: + type: string + - variable: username + label: Username + description: The username for the SMB share. + schema: + type: string + required: true + - variable: password + label: Password + description: The password for the SMB share. + schema: + type: string + required: true + private: true + - variable: size + label: Size (in Gi) + description: The size of the volume quota. + schema: + type: int + required: true + min: 1 + default: 1 + + - variable: resources + group: Resources Configuration + label: "" + schema: + type: dict + attrs: + - variable: limits + label: Limits + schema: + type: dict + attrs: + - variable: cpu + label: CPU + description: CPU limit for Homarr. + schema: + type: string + max_length: 6 + valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$' + valid_chars_error: | + Valid CPU limit formats are
+ - Plain Integer - eg. 1
+ - Float - eg. 0.5
+ - Milicpu - eg. 500m + default: "4000m" + required: true + - variable: memory + label: Memory + description: Memory limit for Homarr. + schema: + type: string + max_length: 12 + valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$' + valid_chars_error: | + Valid Memory limit formats are
+ - Suffixed with E/P/T/G/M/K - eg. 1G
+ - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi
+ - Plain Integer in bytes - eg. 1024
+ - Exponent - eg. 134e6 + default: "8Gi" + required: true diff --git a/community/homarr/1.1.3/templates/NOTES.txt b/community/homarr/2.0.0/templates/NOTES.txt similarity index 100% rename from community/homarr/1.1.3/templates/NOTES.txt rename to community/homarr/2.0.0/templates/NOTES.txt diff --git a/community/homarr/2.0.0/templates/_configuration.tpl b/community/homarr/2.0.0/templates/_configuration.tpl new file mode 100644 index 0000000000..71a58fe574 --- /dev/null +++ b/community/homarr/2.0.0/templates/_configuration.tpl @@ -0,0 +1,14 @@ +{{- define "homarr.configuration" -}} + {{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}} + + {{- $secretKey := randAlphaNum 32 -}} + {{- with (lookup "v1" "Secret" .Release.Namespace (printf "%s-homarr-creds" $fullname)) -}} + {{- $secretKey = ((index .data "NEXTAUTH_SECRET") | b64dec) -}} + {{- end }} + +secret: + homarr-creds: + enabled: true + data: + NEXTAUTH_SECRET: {{ $secretKey }} +{{- end -}} diff --git a/community/homarr/1.1.3/templates/_homarr.tpl b/community/homarr/2.0.0/templates/_homarr.tpl similarity index 54% rename from community/homarr/1.1.3/templates/_homarr.tpl rename to community/homarr/2.0.0/templates/_homarr.tpl index fe9d3b7b8b..c484e3f9ac 100644 --- a/community/homarr/1.1.3/templates/_homarr.tpl +++ b/community/homarr/2.0.0/templates/_homarr.tpl @@ -16,9 +16,9 @@ workload: runAsGroup: {{ .Values.homarrRunAs.group }} env: PORT: {{ .Values.homarrNetwork.webPort }} - {{ with .Values.homarrConfig.password }} - PASSWORD: {{ . }} - {{ end }} + envFrom: + - secretRef: + name: homarr-creds {{ with .Values.homarrConfig.additionalEnvs }} envList: {{ range $env := . }} @@ -30,22 +30,16 @@ workload: liveness: enabled: true type: http - port: "{{ .Values.homarrNetwork.webPort }}" - path: /api/configs + port: {{ .Values.homarrNetwork.webPort }} + path: / readiness: enabled: true type: http - port: "{{ .Values.homarrNetwork.webPort }}" - path: /api/configs + port: {{ .Values.homarrNetwork.webPort }} + path: / startup: enabled: true type: http - port: "{{ .Values.homarrNetwork.webPort }}" - path: /api/configs - initContainers: - {{- include "ix.v1.common.app.permissions" (dict "containerName" "01-permissions" - "UID" .Values.homarrRunAs.user - "GID" .Values.homarrRunAs.group - "mode" "check" - "type" "init") | nindent 8 }} + port: {{ .Values.homarrNetwork.webPort }} + path: / {{- end -}} diff --git a/community/homarr/2.0.0/templates/_persistence.tpl b/community/homarr/2.0.0/templates/_persistence.tpl new file mode 100644 index 0000000000..5c7e91c056 --- /dev/null +++ b/community/homarr/2.0.0/templates/_persistence.tpl @@ -0,0 +1,40 @@ +{{- define "homarr.persistence" -}} +persistence: + configs: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.homarrStorage.configs) | nindent 4 }} + targetSelector: + homarr: + homarr: + mountPath: /app/data/configs + data: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.homarrStorage.data) | nindent 4 }} + targetSelector: + homarr: + homarr: + mountPath: /data + icons: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.homarrStorage.icons) | nindent 4 }} + targetSelector: + homarr: + homarr: + mountPath: /app/data/icons + tmp: + enabled: true + type: emptyDir + targetSelector: + homarr: + homarr: + mountPath: /tmp + {{- range $idx, $storage := .Values.homarrStorage.additionalStorages }} + {{ printf "homarr-%v" (int $idx) }}: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + homarr: + homarr: + mountPath: {{ $storage.mountPath }} + {{- end }} +{{- end -}} diff --git a/community/homarr/1.1.3/templates/_portal.tpl b/community/homarr/2.0.0/templates/_portal.tpl similarity index 100% rename from community/homarr/1.1.3/templates/_portal.tpl rename to community/homarr/2.0.0/templates/_portal.tpl diff --git a/community/homarr/1.1.3/templates/_service.tpl b/community/homarr/2.0.0/templates/_service.tpl similarity index 100% rename from community/homarr/1.1.3/templates/_service.tpl rename to community/homarr/2.0.0/templates/_service.tpl diff --git a/community/homarr/1.1.3/templates/common.yaml b/community/homarr/2.0.0/templates/common.yaml similarity index 84% rename from community/homarr/1.1.3/templates/common.yaml rename to community/homarr/2.0.0/templates/common.yaml index db1e93103b..a5cd991f56 100644 --- a/community/homarr/1.1.3/templates/common.yaml +++ b/community/homarr/2.0.0/templates/common.yaml @@ -1,6 +1,7 @@ {{- include "ix.v1.common.loader.init" . -}} {{/* Merge the templates with Values */}} +{{- $_ := mustMergeOverwrite .Values (include "homarr.configuration" $ | fromYaml) -}} {{- $_ := mustMergeOverwrite .Values (include "homarr.workload" $ | fromYaml) -}} {{- $_ := mustMergeOverwrite .Values (include "homarr.persistence" $ | fromYaml) -}} {{- $_ := mustMergeOverwrite .Values (include "homarr.service" $ | fromYaml) -}}