From 9956737e0b407b9e6dd0dbfc57cc4c9a0fe2ff37 Mon Sep 17 00:00:00 2001
From: Sukarn <10946339+sukarn-m@users.noreply.github.com>
Date: Sat, 15 Jan 2022 16:02:14 +0530
Subject: [PATCH] feat(trillium-notes): Add Trilium Notes (#1715)

* Add Trilium Notes

* Update charts/incubator/trilium-notes/Chart.yaml

* Update charts/incubator/trilium-notes/values.yaml

* Updated with requested changes + additional fixes

* Update values.yaml

* Update values.yaml

* Update charts/incubator/trilium-notes/Chart.yaml

* Update charts/incubator/trilium-notes/values.yaml

* Update charts/incubator/trilium-notes/values.yaml

* Update values.yaml

* This port is now free

* Update values.yaml

* Update questions.yaml

* Update docs/apps/app-requests.md

Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
---
 charts/incubator/trilium-notes/.helmignore    |  26 ++
 charts/incubator/trilium-notes/Chart.yaml     |  31 ++
 charts/incubator/trilium-notes/questions.yaml | 315 ++++++++++++++++++
 .../trilium-notes/templates/common.yaml       |   1 +
 charts/incubator/trilium-notes/values.yaml    |  20 ++
 .../img/appicons/trilium-notes-icon.png       | Bin 0 -> 20024 bytes
 docs/apps/app-requests.md                     |   2 +-
 docs/manual/default-ports.md                  |   3 +-
 8 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 charts/incubator/trilium-notes/.helmignore
 create mode 100644 charts/incubator/trilium-notes/Chart.yaml
 create mode 100644 charts/incubator/trilium-notes/questions.yaml
 create mode 100644 charts/incubator/trilium-notes/templates/common.yaml
 create mode 100644 charts/incubator/trilium-notes/values.yaml
 create mode 100644 docs/_static/img/appicons/trilium-notes-icon.png

diff --git a/charts/incubator/trilium-notes/.helmignore b/charts/incubator/trilium-notes/.helmignore
new file mode 100644
index 00000000000..4379e2b3014
--- /dev/null
+++ b/charts/incubator/trilium-notes/.helmignore
@@ -0,0 +1,26 @@
+# 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
+.vscode/
+# OWNERS file for Kubernetes
+OWNERS
+# helm-docs templates
+*.gotmpl
diff --git a/charts/incubator/trilium-notes/Chart.yaml b/charts/incubator/trilium-notes/Chart.yaml
new file mode 100644
index 00000000000..5042ecd7862
--- /dev/null
+++ b/charts/incubator/trilium-notes/Chart.yaml
@@ -0,0 +1,31 @@
+apiVersion: v2
+appVersion: "0.49.4"
+dependencies:
+- name: common
+  repository: https://truecharts.org
+  version: 8.13.0
+deprecated: false
+description: Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.
+home: https://github.com/truecharts/apps/tree/master/charts/incubator/trilium-notes
+icon: https://truecharts.org/_static/img/appicons/trilium-notes-icon.png
+keywords:
+- trilium
+- notes
+- note
+- information
+kubeVersion: ">=1.16.0-0"
+maintainers:
+- email: info@truecharts.org
+  name: TrueCharts
+  url: https://truecharts.org
+name: trilium-notes
+sources:
+- https://hub.docker.com/r/zadam/trilium
+- https://github.com/zadam/trilium
+type: application
+version: 0.0.1
+annotations:
+  truecharts.org/catagories: |
+    - media
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
diff --git a/charts/incubator/trilium-notes/questions.yaml b/charts/incubator/trilium-notes/questions.yaml
new file mode 100644
index 00000000000..3b7765f3cda
--- /dev/null
+++ b/charts/incubator/trilium-notes/questions.yaml
@@ -0,0 +1,315 @@
+# Include{groups}
+portals:
+  web_portal:
+    protocols:
+      - "$kubernetes-resource_configmap_portal_protocol"
+    host:
+      - "$kubernetes-resource_configmap_portal_host"
+    ports:
+      - "$kubernetes-resource_configmap_portal_port"
+questions:
+  - variable: portal
+    group: "Container Image"
+    label: "Configure Portal Button"
+    schema:
+      type: dict
+      hidden: true
+      attrs:
+        - variable: enabled
+          label: "Enable"
+          description: "enable the portal button"
+          schema:
+            hidden: true
+            editable: false
+            type: boolean
+            default: true
+# Include{global}
+
+  - variable: controller
+    group: "Controller"
+    label: ""
+    schema:
+      type: dict
+      attrs:
+        - variable: advanced
+          label: "Show Advanced Controller Settings"
+          schema:
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: type
+                description: "Please specify type of workload to deploy"
+                label: "(Advanced) Controller Type"
+                schema:
+                  type: string
+                  default: "deployment"
+                  required: true
+                  enum:
+                    - value: "deployment"
+                      description: "Deployment"
+                    - value: "statefulset"
+                      description: "Statefulset"
+                    - value: "daemonset"
+                      description: "Daemonset"
+              - variable: replicas
+                description: "Number of desired pod replicas"
+                label: "Desired Replicas"
+                schema:
+                  type: int
+                  default: 1
+                  required: true
+              - variable: strategy
+                description: "Please specify type of workload to deploy"
+                label: "(Advanced) Update Strategy"
+                schema:
+                  type: string
+                  default: "Recreate"
+                  required: true
+                  enum:
+                    - value: "Recreate"
+                      description: "Recreate: Kill existing pods before creating new ones"
+                    - value: "RollingUpdate"
+                      description: "RollingUpdate: Create new pods and then kill old ones"
+                    - value: "OnDelete"
+                      description: "(Legacy) OnDelete: ignore .spec.template changes"
+# Include{controllerExpert}
+
+  - variable: env
+    group: "Container Configuration"
+    label: "Image Environment"
+    schema:
+      type: dict
+      attrs:
+# Include{fixedEnv}
+
+# Include{containerConfig}
+
+  - variable: service
+    group: "Networking and Services"
+    label: "Configure Service(s)"
+    schema:
+      type: dict
+      attrs:
+        - variable: main
+          label: "Main Service"
+          description: "The Primary service on which the healthcheck runs, often the webUI"
+          schema:
+            type: dict
+            attrs:
+# Include{serviceSelector}
+                    - variable: main
+                      label: "Main Service Port Configuration"
+                      schema:
+                        type: dict
+                        attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 10080
+                              required: true
+                          - variable: advanced
+                            label: "Show Advanced settings"
+                            schema:
+                              type: boolean
+                              default: false
+                              show_subquestions_if: true
+                              subquestions:
+                                - variable: enabled
+                                  label: "Enable the port"
+                                  schema:
+                                    type: boolean
+                                    default: true
+                                - variable: protocol
+                                  label: "Port Type"
+                                  schema:
+                                    type: string
+                                    default: "HTTP"
+                                    enum:
+                                      - value: HTTP
+                                        description: "HTTP"
+                                      - value: "HTTPS"
+                                        description: "HTTPS"
+                                      - value: TCP
+                                        description: "TCP"
+                                      - value: "UDP"
+                                        description: "UDP"
+                                - variable: nodePort
+                                  label: "Node Port (Optional)"
+                                  description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
+                                  schema:
+                                    type: int
+                                    min: 9000
+                                    max: 65535
+                                - variable: targetPort
+                                  label: "Target Port"
+                                  description: "The internal(!) port on the container the Application runs on"
+                                  schema:
+                                    type: int
+                                    default: 8080
+
+  - variable: serviceexpert
+    group: "Networking and Services"
+    label: "Show Expert Config"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: hostNetwork
+          group: "Networking and Services"
+          label: "Host-Networking (Complicated)"
+          schema:
+            type: boolean
+            default: false
+
+# Include{serviceExpert}
+
+# Include{serviceList}
+
+  - variable: persistence
+    label: "Integrated Persistent Storage"
+    description: "Integrated Persistent Storage"
+    group: "Storage and Persistence"
+    schema:
+      type: dict
+      attrs:
+        - variable: config
+          label: "App Config Storage"
+          description: "Stores the Application Configuration."
+          schema:
+            type: dict
+            attrs:
+              - variable: enabled
+                label: "Enable the storage"
+                schema:
+                  type: boolean
+                  default: true
+                  hidden: true
+              - variable: type
+                label: "Type of Storage"
+                description: "Sets the persistence type, Anything other than PVC could break rollback!"
+                schema:
+                  type: string
+                  default: "simplePVC"
+                  enum:
+                    - value: "simplePVC"
+                      description: "PVC (simple)"
+                    - value: "simpleHP"
+                      description: "HostPath (simple)"
+                    - value: "emptyDir"
+                      description: "emptyDir"
+                    - value: "pvc"
+                      description: "pvc"
+                    - value: "hostPath"
+                      description: "hostPath"
+# Include{persistenceBasic}
+              - variable: hostPath
+                label: "hostPath"
+                description: "Path inside the container the storage is mounted"
+                schema:
+                  show_if: [["type", "=", "hostPath"]]
+                  type: hostpath
+              - variable: medium
+                label: "EmptyDir Medium"
+                schema:
+                  show_if: [["type", "=", "emptyDir"]]
+                  type: string
+                  default: ""
+                  enum:
+                    - value: ""
+                      description: "Default"
+                    - value: "Memory"
+                      description: "Memory"
+# Include{persistenceAdvanced}
+# Include{persistenceList}
+
+  - variable: ingress
+    label: ""
+    group: "Ingress"
+    schema:
+      type: dict
+      attrs:
+        - variable: main
+          label: "Main Ingress"
+          schema:
+            type: dict
+            attrs:
+# Include{ingressDefault}
+
+# Include{ingressTLS}
+
+# Include{ingressTraefik}
+
+# Include{ingressExpert}
+
+# Include{ingressList}
+
+  - variable: advancedSecurity
+    label: "Show Advanced Security Settings"
+    group: "Security and Permissions"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: securityContext
+          label: "Security Context"
+          schema:
+            type: dict
+            attrs:
+              - variable: privileged
+                label: "Privileged mode"
+                schema:
+                  type: boolean
+                  default: false
+              - variable: readOnlyRootFilesystem
+                label: "ReadOnly Root Filesystem"
+                schema:
+                  type: boolean
+                  default: true
+              - variable: allowPrivilegeEscalation
+                label: "Allow Privilege Escalation"
+                schema:
+                  type: boolean
+                  default: false
+              - variable: runAsNonRoot
+                label: "runAsNonRoot"
+                schema:
+                  type: boolean
+                  default: true
+# Include{securityContextAdvanced}
+
+  - variable: podSecurityContext
+    group: "Security and Permissions"
+    label: "Pod Security Context"
+    schema:
+      type: dict
+      attrs:
+        - variable: runAsUser
+          label: "runAsUser"
+          description: "The UserID of the user running the application"
+          schema:
+            type: int
+            default: 568
+        - variable: runAsGroup
+          label: "runAsGroup"
+          description: The groupID this App of the user running the application"
+          schema:
+            type: int
+            default: 568
+        - variable: fsGroup
+          label: "fsGroup"
+          description: "The group that should own ALL storage."
+          schema:
+            type: int
+            default: 568
+# Include{podSecurityContextAdvanced}
+
+# Include{resources}
+
+# Include{advanced}
+
+# Include{addons}
diff --git a/charts/incubator/trilium-notes/templates/common.yaml b/charts/incubator/trilium-notes/templates/common.yaml
new file mode 100644
index 00000000000..a6613c2ce21
--- /dev/null
+++ b/charts/incubator/trilium-notes/templates/common.yaml
@@ -0,0 +1 @@
+{{ include "common.all" . }}
diff --git a/charts/incubator/trilium-notes/values.yaml b/charts/incubator/trilium-notes/values.yaml
new file mode 100644
index 00000000000..513ecaa1d11
--- /dev/null
+++ b/charts/incubator/trilium-notes/values.yaml
@@ -0,0 +1,20 @@
+image:
+  repository: tccr.io/truecharts/trilium-notes
+  pullPolicy: IfNotPresent
+  tag: v0.49.4@sha256:af932e6cd1e60f3b0c84f94c28a036c17e062d68c0d80491fc51836edad3b453
+
+service:
+  main:
+    ports:
+      main:
+        protocol: HTTP
+        targetPort: 8080
+        port: 10080
+
+env:
+  TRILIUM_DATA_DIR: "/trilium-data"
+
+persistence:
+  config:
+    enabled: true
+    mountPath: "/trilium-data"
diff --git a/docs/_static/img/appicons/trilium-notes-icon.png b/docs/_static/img/appicons/trilium-notes-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..591715a6f50f0e57849d089d08875486aa27c137
GIT binary patch
literal 20024
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
Kb6Mw<&;$US&U<VC

literal 0
HcmV?d00001

diff --git a/docs/apps/app-requests.md b/docs/apps/app-requests.md
index 63f27849ac3..0f7b71b5060 100644
--- a/docs/apps/app-requests.md
+++ b/docs/apps/app-requests.md
@@ -48,7 +48,6 @@ _This list is to track `App Requests` from one place._
 - [ ] LANraragi #1159
 - [ ] ArchiSteamFarm #1164
 - [ ] Docker Registry #1165
-- [ ] Trilium Notes #1261
 - [ ] Monero #1228
 - [ ] AriaNG #1224
 - [ ] FileBrowser #1278
@@ -514,3 +513,4 @@ _These Apps have specific requirements or need specific customisation and care_
 - [x] Requestrr #237
 - [x] DMS (Document Manage System) #810
 - [x] scrutiny ( Needs customised solution for direct disk access )
+- [x] Trilium Notes #1261
diff --git a/docs/manual/default-ports.md b/docs/manual/default-ports.md
index 870aa0cc8c3..ab19f3dc18a 100644
--- a/docs/manual/default-ports.md
+++ b/docs/manual/default-ports.md
@@ -227,6 +227,7 @@ These defaults can of course be changed, but as we guarantee "sane, working defa
 | static                     |      main       |      main       | 10077 |   TCP    |                                         |
 | twtxt                      |      main       |      main       | 10078 |   TCP    |                                         |
 | emby                       |      main       |      main       | 10079 |   TCP    |                                         |
+| trilium-notes              |      main       |      main       | 10080 |   HTTP   |                                         |
 | davos                      |      main       |      main       | 10081 |   TCP    |                                         |
 | fireflyiii                 |      main       |      main       | 10082 |   TCP    |                                         |
 | fossil                     |      main       |      main       | 10083 |   TCP    |                                         |
@@ -364,6 +365,6 @@ These defaults can of course be changed, but as we guarantee "sane, working defa
 | webui   |  80  |   HTTP   |      |
 | webui   | 443  |  HTTPS   |      |
 
-##### Note: TCP and UPD ports that are the same in some Apps, are not by mistake.
+##### Note: TCP and UDP ports that are the same in some Apps, are not by mistake.
 
 ##### If you notice a port conflict, please notify us so we can resolve it (when possible).