diff --git a/charts/stable/ubooquity/Chart.yaml b/charts/stable/ubooquity/Chart.yaml index 450d6d0da40..cbff9e2beb2 100644 --- a/charts/stable/ubooquity/Chart.yaml +++ b/charts/stable/ubooquity/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ubooquity -version: 0.0.22 +version: 1.0.0 appVersion: "2.1.2" description: Ubooquity is a free, lightweight and easy-to-use home server for your comics and ebooks. type: application diff --git a/charts/stable/ubooquity/questions.yaml b/charts/stable/ubooquity/questions.yaml index 05f39e54a76..942dd3122aa 100644 --- a/charts/stable/ubooquity/questions.yaml +++ b/charts/stable/ubooquity/questions.yaml @@ -7,6 +7,15 @@ portals: - "$kubernetes-resource_configmap_portal_host" ports: - "$kubernetes-resource_configmap_portal_port" + path: "/ubooquity" + admin: + protocols: + - "$kubernetes-resource_configmap_portal_protocol" + host: + - "$kubernetes-resource_configmap_portal_host" + ports: + - "$variable-service.admin.ports.admin.port" + path: "/admin" questions: - variable: portal group: "Container Image" @@ -84,7 +93,12 @@ questions: type: dict attrs: # Include{fixedEnv} - + - variable: MAXMEM + label: "MAXMEM" + description: "Set the maximum memory in MB" + schema: + type: int + default: 512 # Include{containerConfig} - variable: service @@ -154,7 +168,66 @@ questions: schema: type: int default: 2202 - + - variable: admin + label: "Admin Service" + description: "Admin Service" + schema: + additional_attrs: true + type: dict + attrs: +# Include{serviceSelector} + - variable: admin + label: "Admin 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: 2203 + 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: 2203 - variable: serviceexpert group: "Networking and Services" label: "Show Expert Config" @@ -225,6 +298,136 @@ questions: - value: "Memory" description: "Memory" # Include{persistenceAdvanced} + - variable: books + label: "App Books Storage" + description: "Stores the Application Books." + schema: + additional_attrs: true + type: dict + attrs: + - 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} + - variable: comics + label: "App Comics Storage" + description: "Stores the Application Comics." + schema: + additional_attrs: true + type: dict + attrs: + - 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} + - variable: files + label: "App Raw Files Storage" + description: "Stores the Application Raw Files." + schema: + additional_attrs: true + type: dict + attrs: + - 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 diff --git a/charts/stable/ubooquity/values.yaml b/charts/stable/ubooquity/values.yaml index 1d5dfed15dd..59d1b21bf61 100644 --- a/charts/stable/ubooquity/values.yaml +++ b/charts/stable/ubooquity/values.yaml @@ -12,6 +12,7 @@ podSecurityContext: env: PUID: 568 + MAXMEM: 512 service: main: @@ -19,6 +20,11 @@ service: main: targetPort: 2202 port: 2202 + admin: + ports: + admin: + targetPort: 2203 + port: 2203 persistence: varrun: @@ -26,3 +32,12 @@ persistence: config: enabled: true mountPath: "/config" + books: + enabled: true + mountPath: "/books" + comics: + enabled: true + mountPath: "/comics" + files: + enabled: true + mountPath: "/files" diff --git a/docs/manual/default-ports.md b/docs/manual/default-ports.md index b8d6653e62f..7487627d4cf 100644 --- a/docs/manual/default-ports.md +++ b/docs/manual/default-ports.md @@ -52,6 +52,7 @@ These defaults can of course be changed, but as we guarantee "sane, working defa | owncast | rtmp | rtmp | 1935 | TCP | Potential conflict with frigate | | frigate | rtmp | rtmp | 1935 | TCP | Potential conflict with owncast | | ubooquity | main | main | 2202 | TCP | | +| ubooquity | admin | admin | 2203 | TCP | | | gitea | ssh | ssh | 2222 | TCP | | | photoprism | main | main | 2342 | TCP | | | valheim | valheim | valheim-1 | 2456 | UDP | |