fix(obisidian): cleanup (#3387)

* fix(obisidian): cleanup

* adapt to new questions template

* Update charts/incubator/obsidian/Chart.yaml

* fix ui storage

* whoop

* update image

Co-authored-by: Kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>

charts/incubator/obsidian/Chart.yaml

@@ -1,8 +1,3 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - Productivity
-    - Tools-Utilities
 apiVersion: v2
 appVersion: "latest"
 dependencies:
@@ -10,13 +5,12 @@ dependencies:
     repository: https://library-charts.truecharts.org
     version: 10.4.9
 deprecated: false
-description: "DESCRIPTION\r\n"
+description: "A knowledge base that works on local Markdown files."
-home: https://truecharts.org/docs/charts/incubator/obsidian
+home: https://github.com/truecharts/charts/tree/master/charts/incubator/obsidian
-icon: https://truecharts.org/img/hotlink-ok/chart-icons/obsidian.png
+icon: https://truecharts.org/img/chart-icons/obsidian.png
 keywords:
   - obsidian
-  - Productivity
+  - productivity
-  - Tools-Utilities
 kubeVersion: ">=1.16.0-0"
 maintainers:
   - email: info@truecharts.org
@@ -28,4 +22,8 @@ sources:
   - https://github.com/sytone/obsidian-remote
   - https://github.com/sytone/obsidian-remote/pkgs/container/obsidian-remote
 type: application
-version: 0.0.16
+annotations:
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/catagories: |
+    - productivity
+version: 0.0.17

charts/incubator/obsidian/questions.yaml

@@ -32,22 +32,70 @@ questions:
                             description: "This port exposes the container port on the service"
                             schema:
                               type: int
-                              default: 8585
+                              default: 10292
                               required: true
-# Include{advancedPortTCP}
+# Include{advancedPortHTTP}
                                 - variable: targetPort
                                   label: "Target Port"
                                   description: "The internal(!) port on the container the Application runs on"
                                   schema:
                                     type: int
                                     default: 8080
+        - variable: api
+          label: "API Service"
+          description: "API Service"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+# Include{serviceSelector}
+                    - variable: http
+                      label: "http Service Port Configuration"
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 27123
+                              required: true
+# Include{advancedPortHTTP}
+                                - variable: targetPort
+                                  label: "Target Port"
+                                  description: "The internal(!) port on the container the Application runs on"
+                                  schema:
+                                    type: int
+                                    default: 27123
+                    - variable: https
+                      label: "https Service Port Configuration"
+                      schema:
+                        additional_attrs: true
+                        type: dict
+                        attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 27124
+                              required: true
+# Include{advancedPortHTTPS}
+                                - variable: targetPort
+                                  label: "Target Port"
+                                  description: "The internal(!) port on the container the Application runs on"
+                                  schema:
+                                    type: int
+                                    default: 27124
 # Include{serviceExpertRoot}
             default: false
 # Include{serviceExpert}
 # Include{serviceList}
 # Include{persistenceRoot}
-        - variable: storagevaults
+        - variable: vaults
-          label: "storagevaults Storage"
+          label: "vaults Storage"
           description: "This is the location for the users vaults."
           schema:
             additional_attrs: true
@@ -55,8 +103,8 @@ questions:
             attrs:
 # Include{persistenceBasic}
 # Include{persistenceAdvanced}
-        - variable: storageconfig
+        - variable: config
-          label: "storageconfig Storage"
+          label: "config Storage"
           description: "This is the location for the internal data."
           schema:
             additional_attrs: true

charts/incubator/obsidian/values.yaml

@@ -1,8 +1,35 @@
-env: {}
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/obsidian
-  tag: latest@sha256:a6abedd49187450e9bc9ce53d68024790abd89c176116dce7403eab74f1c08b8
+  tag: v0.1.0@sha256:a6abedd49187450e9bc9ce53d68024790abd89c176116dce7403eab74f1c08b8
+
+podSecurityContext:
+  runAsGroup: 0
+  runAsUser: 0
+
+securityContext:
+  readOnlyRootFilesystem: false
+  runAsNonRoot: false
+
+service:
+  main:
+    ports:
+      main:
+        port: 10292
+        protocol: HTTP
+        targetPort: 8080
+  api:
+    enabled: true
+    ports:
+      http:
+        enabled: true
+        port: 27123
+        targetPort: 27123
+      https:
+        enabled: true
+        port: 27124
+        targetPort: 27124
+
 persistence:
   storageconfig:
     enabled: true
@@ -10,21 +37,6 @@ persistence:
   storagevaults:
     enabled: true
     mountPath: /vaults
-podSecurityContext:
-  runAsGroup: 0
-  runAsUser: 0
-securityContext:
-  readOnlyRootFilesystem: false
-  runAsNonRoot: false
-service:
-  main:
-    enabled: true
-    ports:
-      main:
-        enabled: true
-        port: 8585
-        protocol: TCP
-        targetPort: 8080
 
 portal:
   enabled: true