diff --git a/charts/nextcloud/1.6.55/.helmignore b/charts/nextcloud/1.6.56/.helmignore similarity index 100% rename from charts/nextcloud/1.6.55/.helmignore rename to charts/nextcloud/1.6.56/.helmignore diff --git a/charts/nextcloud/1.6.55/Chart.lock b/charts/nextcloud/1.6.56/Chart.lock similarity index 100% rename from charts/nextcloud/1.6.55/Chart.lock rename to charts/nextcloud/1.6.56/Chart.lock diff --git a/charts/nextcloud/1.6.55/Chart.yaml b/charts/nextcloud/1.6.56/Chart.yaml similarity index 97% rename from charts/nextcloud/1.6.55/Chart.yaml rename to charts/nextcloud/1.6.56/Chart.yaml index 8b4a546f4c..4ae111cdef 100644 --- a/charts/nextcloud/1.6.55/Chart.yaml +++ b/charts/nextcloud/1.6.56/Chart.yaml @@ -4,7 +4,7 @@ description: A file sharing server that puts the control and security of your ow annotations: title: Nextcloud type: application -version: 1.6.55 +version: 1.6.56 apiVersion: v2 appVersion: 28.0.1 kubeVersion: '>=1.16.0-0' diff --git a/charts/nextcloud/1.6.55/README.md b/charts/nextcloud/1.6.56/README.md similarity index 100% rename from charts/nextcloud/1.6.55/README.md rename to charts/nextcloud/1.6.56/README.md diff --git a/charts/nextcloud/1.6.55/app-readme.md b/charts/nextcloud/1.6.56/app-readme.md similarity index 100% rename from charts/nextcloud/1.6.55/app-readme.md rename to charts/nextcloud/1.6.56/app-readme.md diff --git a/charts/nextcloud/1.6.55/charts/common-2304.0.1.tgz b/charts/nextcloud/1.6.56/charts/common-2304.0.1.tgz similarity index 100% rename from charts/nextcloud/1.6.55/charts/common-2304.0.1.tgz rename to charts/nextcloud/1.6.56/charts/common-2304.0.1.tgz diff --git a/charts/nextcloud/1.6.55/ci/test-values.yaml b/charts/nextcloud/1.6.56/ci/test-values.yaml similarity index 100% rename from charts/nextcloud/1.6.55/ci/test-values.yaml rename to charts/nextcloud/1.6.56/ci/test-values.yaml diff --git a/charts/nextcloud/1.6.55/ix_values.yaml b/charts/nextcloud/1.6.56/ix_values.yaml similarity index 100% rename from charts/nextcloud/1.6.55/ix_values.yaml rename to charts/nextcloud/1.6.56/ix_values.yaml diff --git a/charts/nextcloud/1.6.55/metadata.yaml b/charts/nextcloud/1.6.56/metadata.yaml similarity index 100% rename from charts/nextcloud/1.6.55/metadata.yaml rename to charts/nextcloud/1.6.56/metadata.yaml diff --git a/charts/nextcloud/1.6.55/migrations/migrate_from_1.1.0 b/charts/nextcloud/1.6.56/migrations/migrate_from_1.1.0 similarity index 100% rename from charts/nextcloud/1.6.55/migrations/migrate_from_1.1.0 rename to charts/nextcloud/1.6.56/migrations/migrate_from_1.1.0 diff --git a/charts/nextcloud/1.6.55/questions.yaml b/charts/nextcloud/1.6.56/questions.yaml similarity index 100% rename from charts/nextcloud/1.6.55/questions.yaml rename to charts/nextcloud/1.6.56/questions.yaml diff --git a/charts/nextcloud/1.6.55/templates/NOTES.txt b/charts/nextcloud/1.6.56/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/1.6.55/templates/NOTES.txt rename to charts/nextcloud/1.6.56/templates/NOTES.txt diff --git a/charts/nextcloud/1.6.55/templates/_nginx.tpl b/charts/nextcloud/1.6.56/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/1.6.55/templates/_nginx.tpl rename to charts/nextcloud/1.6.56/templates/_nginx.tpl diff --git a/charts/nextcloud/1.6.55/templates/_postgres.tpl b/charts/nextcloud/1.6.56/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/1.6.55/templates/_postgres.tpl rename to charts/nextcloud/1.6.56/templates/_postgres.tpl diff --git a/charts/nextcloud/1.6.55/templates/backup-postgres-config.yaml b/charts/nextcloud/1.6.56/templates/backup-postgres-config.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/backup-postgres-config.yaml rename to charts/nextcloud/1.6.56/templates/backup-postgres-config.yaml diff --git a/charts/nextcloud/1.6.55/templates/backup-postgres-hook.yaml b/charts/nextcloud/1.6.56/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/backup-postgres-hook.yaml rename to charts/nextcloud/1.6.56/templates/backup-postgres-hook.yaml diff --git a/charts/nextcloud/1.6.55/templates/cronjob.yaml b/charts/nextcloud/1.6.56/templates/cronjob.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/cronjob.yaml rename to charts/nextcloud/1.6.56/templates/cronjob.yaml diff --git a/charts/nextcloud/1.6.55/templates/deployment.yaml b/charts/nextcloud/1.6.56/templates/deployment.yaml similarity index 99% rename from charts/nextcloud/1.6.55/templates/deployment.yaml rename to charts/nextcloud/1.6.56/templates/deployment.yaml index 7cae2ea2c6..3a2c74d287 100644 --- a/charts/nextcloud/1.6.55/templates/deployment.yaml +++ b/charts/nextcloud/1.6.56/templates/deployment.yaml @@ -83,7 +83,7 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} {{ if eq (include "nginx.certAvailable" .) "true" }} {{ $envList = mustAppend $envList (dict "name" "APACHE_DISABLE_REWRITE_IP" "value" "1") }} {{ if and .Values.nextcloud.host .Values.service.nodePort }} - {{ if .Values.nginxConfig.use443 }} + {{ if .Values.nginxConfig.useDifferentAccessPort }} {{ $envList = mustAppend $envList (dict "name" "OVERWRITEHOST" "value" .Values.nextcloud.host) }} {{ else }} {{ $envList = mustAppend $envList (dict "name" "OVERWRITEHOST" "value" (printf "%v:%v" .Values.nextcloud.host .Values.service.nodePort)) }} diff --git a/charts/nextcloud/1.6.55/templates/nextcloud-configmap.yaml b/charts/nextcloud/1.6.56/templates/nextcloud-configmap.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/nextcloud-configmap.yaml rename to charts/nextcloud/1.6.56/templates/nextcloud-configmap.yaml diff --git a/charts/nextcloud/1.6.55/templates/nginx-configmap.yaml b/charts/nextcloud/1.6.56/templates/nginx-configmap.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/nginx-configmap.yaml rename to charts/nextcloud/1.6.56/templates/nginx-configmap.yaml diff --git a/charts/nextcloud/1.6.55/templates/nginx-secret.yaml b/charts/nextcloud/1.6.56/templates/nginx-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/nginx-secret.yaml rename to charts/nextcloud/1.6.56/templates/nginx-secret.yaml diff --git a/charts/nextcloud/1.6.55/templates/postgres-deployment.yaml b/charts/nextcloud/1.6.56/templates/postgres-deployment.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/postgres-deployment.yaml rename to charts/nextcloud/1.6.56/templates/postgres-deployment.yaml diff --git a/charts/nextcloud/1.6.55/templates/postgres-secret.yaml b/charts/nextcloud/1.6.56/templates/postgres-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/postgres-secret.yaml rename to charts/nextcloud/1.6.56/templates/postgres-secret.yaml diff --git a/charts/nextcloud/1.6.55/templates/postgres-service.yaml b/charts/nextcloud/1.6.56/templates/postgres-service.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/postgres-service.yaml rename to charts/nextcloud/1.6.56/templates/postgres-service.yaml diff --git a/charts/nextcloud/1.6.55/templates/secrets.yaml b/charts/nextcloud/1.6.56/templates/secrets.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/secrets.yaml rename to charts/nextcloud/1.6.56/templates/secrets.yaml diff --git a/charts/nextcloud/1.6.55/templates/service.yaml b/charts/nextcloud/1.6.56/templates/service.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/service.yaml rename to charts/nextcloud/1.6.56/templates/service.yaml diff --git a/charts/nextcloud/1.6.55/templates/serviceaccount.yaml b/charts/nextcloud/1.6.56/templates/serviceaccount.yaml similarity index 100% rename from charts/nextcloud/1.6.55/templates/serviceaccount.yaml rename to charts/nextcloud/1.6.56/templates/serviceaccount.yaml diff --git a/charts/nextcloud/1.6.55/to_keep_versions.md b/charts/nextcloud/1.6.56/to_keep_versions.md similarity index 100% rename from charts/nextcloud/1.6.55/to_keep_versions.md rename to charts/nextcloud/1.6.56/to_keep_versions.md diff --git a/community/organizr/1.0.0/Chart.yaml b/community/organizr/1.0.0/Chart.yaml new file mode 100644 index 0000000000..f4178ce7d0 --- /dev/null +++ b/community/organizr/1.0.0/Chart.yaml @@ -0,0 +1,26 @@ +name: organizr +description: Organizr is a HTPC/Homelab Services Organizer - Written in PHP +annotations: + title: Organizr +type: application +version: 1.0.0 +apiVersion: v2 +appVersion: latest +kubeVersion: '>=1.16.0-0' +maintainers: + - name: truenas + url: https://www.truenas.com/ + email: dev@ixsystems.com +dependencies: + - name: common + repository: file://../../../common + version: 1.2.8 +home: https://github.com/causefx/Organizr +icon: https://media.sys.truenas.net/apps/organizr/icons/icon.png +sources: + - https://hub.docker.com/r/organizr/organizr + - https://github.com/truenas/charts/tree/master/library/ix-dev/community/organizr + - https://github.com/causefx/Organizr +keywords: + - organizr + - dashboard diff --git a/community/organizr/1.0.0/README.md b/community/organizr/1.0.0/README.md new file mode 100644 index 0000000000..040b8e8daf --- /dev/null +++ b/community/organizr/1.0.0/README.md @@ -0,0 +1,3 @@ +# Organizr + +[Organizr](https://docs.organizr.app/) is a HTPC/Homelab Services Organizer - Written in PHP diff --git a/community/organizr/1.0.0/app-readme.md b/community/organizr/1.0.0/app-readme.md new file mode 100644 index 0000000000..040b8e8daf --- /dev/null +++ b/community/organizr/1.0.0/app-readme.md @@ -0,0 +1,3 @@ +# Organizr + +[Organizr](https://docs.organizr.app/) is a HTPC/Homelab Services Organizer - Written in PHP diff --git a/community/organizr/1.0.0/ci/basic-values.yaml b/community/organizr/1.0.0/ci/basic-values.yaml new file mode 100644 index 0000000000..b30ec20c10 --- /dev/null +++ b/community/organizr/1.0.0/ci/basic-values.yaml @@ -0,0 +1,7 @@ +organizrID: + user: 568 + group: 568 + +organizrStorage: + config: + type: pvc diff --git a/community/organizr/1.0.0/ci/extra-values.yaml b/community/organizr/1.0.0/ci/extra-values.yaml new file mode 100644 index 0000000000..ba47cbbde8 --- /dev/null +++ b/community/organizr/1.0.0/ci/extra-values.yaml @@ -0,0 +1,8 @@ +organizrStorage: + config: + type: pvc + additionalStorages: + - type: pvc + mountPath: /data1 + - type: pvc + mountPath: /data2 diff --git a/community/organizr/1.0.0/ix_values.yaml b/community/organizr/1.0.0/ix_values.yaml new file mode 100644 index 0000000000..be5a4f594e --- /dev/null +++ b/community/organizr/1.0.0/ix_values.yaml @@ -0,0 +1,26 @@ +image: + repository: organizr/organizr + pullPolicy: IfNotPresent + tag: latest + +resources: + limits: + cpu: 4000m + memory: 8Gi + +organizrConfig: + additionalEnvs: [] + +organizrNetwork: + webPort: 31013 + +organizrID: + user: 568 + group: 568 + +organizrStorage: + config: + type: ixVolume + ixVolumeConfig: + datasetName: config + additionalStorages: [] diff --git a/community/organizr/1.0.0/metadata.yaml b/community/organizr/1.0.0/metadata.yaml new file mode 100644 index 0000000000..6dd82637f2 --- /dev/null +++ b/community/organizr/1.0.0/metadata.yaml @@ -0,0 +1,18 @@ +runAsContext: + - userName: root + groupName: root + gid: 0 + uid: 0 + description: Organizr runs as root user. +capabilities: + - name: CHOWN + description: Organizr is able to chown files. + - name: FOWNER + description: Organizr is able to bypass file ownership checks for it's sub-processes. + - name: DAC_OVERRIDE + description: Organizr is able to bypass file permission checks for it's sub-processes. + - name: SETGID + description: Organizr is able to switch group for sub-processes. + - name: SETUID + description: Organizr is able to switch user for sub-processes. +hostMounts: [] diff --git a/community/organizr/1.0.0/questions.yaml b/community/organizr/1.0.0/questions.yaml new file mode 100644 index 0000000000..163268f8f4 --- /dev/null +++ b/community/organizr/1.0.0/questions.yaml @@ -0,0 +1,370 @@ +groups: + - name: Organizr Configuration + description: Configure Organizr + - name: User and Group Configuration + description: Configure User and Group for Organizr + - name: Network Configuration + description: Configure Network for Organizr + - name: Storage Configuration + description: Configure Storage for Organizr + - name: Resources Configuration + description: Configure Resources for Organizr + +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: Organizr Configuration + label: Timezone + schema: + type: string + default: Etc/UTC + required: true + $ref: + - definitions/timezone + + - variable: organizrConfig + label: "" + group: Organizr Configuration + schema: + type: dict + attrs: + - variable: additionalEnvs + label: Additional Environment Variables + description: Configure additional environment variables for Organizr. + 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: organizrNetwork + label: "" + group: Network Configuration + schema: + type: dict + attrs: + - variable: webPort + label: Web Port + description: The port for the Organizr Web UI. + schema: + type: int + default: 31013 + min: 9000 + max: 65535 + required: true + + - variable: organizrID + label: "" + group: User and Group Configuration + schema: + type: dict + attrs: + - variable: user + label: User ID + description: The user id that Organizr files will be owned by. + schema: + type: int + min: 568 + default: 568 + required: true + - variable: group + label: Group ID + description: The group id that Organizr files will be owned by. + schema: + type: int + min: 568 + default: 568 + required: true + + - variable: organizrStorage + label: "" + group: Storage Configuration + schema: + type: dict + attrs: + - variable: config + label: Organizr Config Storage + description: The path to store Organizr 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: "config" + - 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]] + required: true + + - variable: additionalStorages + label: Additional Storage + description: Additional storage for Organizr. + 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]] + 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 Organizr. + 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 Organizr. + 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/organizr/1.0.0/templates/NOTES.txt b/community/organizr/1.0.0/templates/NOTES.txt new file mode 100644 index 0000000000..ba4e01146c --- /dev/null +++ b/community/organizr/1.0.0/templates/NOTES.txt @@ -0,0 +1 @@ +{{ include "ix.v1.common.lib.chart.notes" $ }} diff --git a/community/organizr/1.0.0/templates/_organizr.tpl b/community/organizr/1.0.0/templates/_organizr.tpl new file mode 100644 index 0000000000..5cdaeed240 --- /dev/null +++ b/community/organizr/1.0.0/templates/_organizr.tpl @@ -0,0 +1,53 @@ +{{- define "organizr.workload" -}} +workload: + organizr: + enabled: true + primary: true + type: Deployment + podSpec: + hostNetwork: false + securityContext: + fsGroup: {{ .Values.organizrID.group }} + containers: + organizr: + enabled: true + primary: true + imageSelector: image + securityContext: + runAsUser: 0 + runAsGroup: 0 + runAsNonRoot: false + readOnlyRootFilesystem: false + capabilities: + add: + - CHOWN + - FOWNER + - DAC_OVERRIDE + - SETGID + - SETUID + fixedEnv: + PUID: {{ .Values.organizrID.user }} + {{ with .Values.organizrConfig.additionalEnvs }} + envList: + {{ range $env := . }} + - name: {{ $env.name }} + value: {{ $env.value }} + {{ end }} + {{ end }} + probes: + liveness: + enabled: true + type: http + port: 80 + path: /api/v2/ping + readiness: + enabled: true + type: http + port: 80 + path: /api/v2/ping + startup: + enabled: true + type: http + port: 80 + path: /api/v2/ping +{{- end -}} diff --git a/community/organizr/1.0.0/templates/_persistence.tpl b/community/organizr/1.0.0/templates/_persistence.tpl new file mode 100644 index 0000000000..170d6477b8 --- /dev/null +++ b/community/organizr/1.0.0/templates/_persistence.tpl @@ -0,0 +1,26 @@ +{{- define "organizr.persistence" -}} +persistence: + config: + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.organizrStorage.config) | nindent 4 }} + targetSelector: + organizr: + organizr: + mountPath: /config + varrun: + enabled: true + type: emptyDir + targetSelector: + organizr: + organizr: + mountPath: /var/run + {{- range $idx, $storage := .Values.organizrStorage.additionalStorages }} + {{ printf "organizr-%v:" (int $idx) }} + enabled: true + {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }} + targetSelector: + organizr: + organizr: + mountPath: {{ $storage.mountPath }} + {{- end }} +{{- end -}} diff --git a/community/organizr/1.0.0/templates/_portal.tpl b/community/organizr/1.0.0/templates/_portal.tpl new file mode 100644 index 0000000000..a17c16272e --- /dev/null +++ b/community/organizr/1.0.0/templates/_portal.tpl @@ -0,0 +1,12 @@ +{{- define "organizr.portal" -}} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: portal +data: + path: "/" + port: {{ .Values.organizrNetwork.webPort | quote }} + protocol: http + host: $node_ip +{{- end -}} diff --git a/community/organizr/1.0.0/templates/_service.tpl b/community/organizr/1.0.0/templates/_service.tpl new file mode 100644 index 0000000000..b3987571db --- /dev/null +++ b/community/organizr/1.0.0/templates/_service.tpl @@ -0,0 +1,16 @@ +{{- define "organizr.service" -}} +service: + organizr: + enabled: true + primary: true + type: NodePort + targetSelector: organizr + ports: + webui: + enabled: true + primary: true + port: {{ .Values.organizrNetwork.webPort }} + nodePort: {{ .Values.organizrNetwork.webPort }} + targetPort: 80 + targetSelector: organizr +{{- end -}} diff --git a/community/organizr/1.0.0/templates/common.yaml b/community/organizr/1.0.0/templates/common.yaml new file mode 100644 index 0000000000..7008058707 --- /dev/null +++ b/community/organizr/1.0.0/templates/common.yaml @@ -0,0 +1,11 @@ +{{- include "ix.v1.common.loader.init" . -}} + +{{/* Merge the templates with Values */}} +{{- $_ := mustMergeOverwrite .Values (include "organizr.workload" $ | fromYaml) -}} +{{- $_ := mustMergeOverwrite .Values (include "organizr.service" $ | fromYaml) -}} +{{- $_ := mustMergeOverwrite .Values (include "organizr.persistence" $ | fromYaml) -}} + +{{/* Create the configmap for portal manually*/}} +{{- include "organizr.portal" $ -}} + +{{- include "ix.v1.common.loader.apply" . -}} diff --git a/community/organizr/1.0.0/upgrade_strategy_disabled b/community/organizr/1.0.0/upgrade_strategy_disabled new file mode 100755 index 0000000000..7778ae42bd --- /dev/null +++ b/community/organizr/1.0.0/upgrade_strategy_disabled @@ -0,0 +1,31 @@ +#!/usr/bin/python3 +import json +import re +import sys + +from catalog_update.upgrade_strategy import semantic_versioning + + +RE_STABLE_VERSION = re.compile(r'v\d+\.\d+\.\d+(-beta-\d+)?') + + +def newer_mapping(image_tags): + key = list(image_tags.keys())[0] + tags = {t.strip('v').split('-')[0]: t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)} + version = semantic_versioning(list(tags)) + if not version: + return {} + + return { + 'tags': {key: tags[version]}, + 'app_version': version, + } + + +if __name__ == '__main__': + try: + versions_json = json.loads(sys.stdin.read()) + except ValueError: + raise ValueError('Invalid json specified') + + print(json.dumps(newer_mapping(versions_json))) diff --git a/community/organizr/item.yaml b/community/organizr/item.yaml new file mode 100644 index 0000000000..f0f27aa61a --- /dev/null +++ b/community/organizr/item.yaml @@ -0,0 +1,9 @@ +icon_url: https://media.sys.truenas.net/apps/organizr/icons/icon.png +categories: + - media +screenshots: + - https://media.sys.truenas.net/apps/organizr/screenshots/screenshot1.webp + - https://media.sys.truenas.net/apps/organizr/screenshots/screenshot2.webp +tags: + - dashboard + - organizr