feat(joplin-server): Migrate to new common (#9564)

**Description**
Migrate joplin-server to new common based on the changes in
https://github.com/truecharts/charts/pull/7913/files
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [x] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**


**📃 Notes:**

**✔️ Checklist:**

- [x] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [x] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning

** App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com>
Co-authored-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Co-authored-by: Stavros kois <s.kois@outlook.com>
This commit is contained in:
Andy
2023-07-22 15:14:27 +03:00
committed by GitHub
co-authored by StevenMcElligott Xstar97TheNoob Stavros Kois Stavros kois
parent 9eb2ff1ed9
commit 5f21f72b36
5 changed files with 65 additions and 52 deletions
+2 -7
View File
@@ -3,11 +3,7 @@ appVersion: "2.10.10"
dependencies: dependencies:
- name: common - name: common
repository: https://library-charts.truecharts.org repository: https://library-charts.truecharts.org
version: 11.1.2 version: 13.2.0
- condition: postgresql.enabled
name: postgresql
repository: https://deps.truecharts.org/
version: 11.0.31
deprecated: false deprecated: false
description: Allows you to sync any Joplin client. description: Allows you to sync any Joplin client.
home: https://truecharts.org/charts/incubator/joplin-server home: https://truecharts.org/charts/incubator/joplin-server
@@ -26,9 +22,8 @@ sources:
- https://github.com/laurent22/joplin/tree/dev/packages/server - https://github.com/laurent22/joplin/tree/dev/packages/server
- https://github.com/laurent22/joplin - https://github.com/laurent22/joplin
type: application type: application
version: 12.0.0 version: 13.0.0
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- media - media
truecharts.org/SCALE-support: "true" truecharts.org/SCALE-support: "true"
truecharts.org/grade: U
@@ -0,0 +1,7 @@
workload:
main:
podSpec:
containers:
main:
env:
APP_BASE_URL: "http://localhost:{{ .Values.service.main.ports.main.port }}"
@@ -0,0 +1 @@
{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1 +1 @@
{{ include "tc.common.loader.all" . }} {{ include "tc.v1.common.loader.all" . }}
+34 -24
View File
@@ -4,28 +4,46 @@ image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
securityContext: securityContext:
container:
readOnlyRootFilesystem: false readOnlyRootFilesystem: false
runAsNonRoot: false runAsNonRoot: false
podSecurityContext:
runAsUser: 0 runAsUser: 0
runAsGroup: 0 runAsGroup: 0
env: workload:
APP_BASE_URL: http://localhost:22300 main:
APP_PORT: 22300 podSpec:
containers:
main:
probes:
liveness:
path: "/api/ping"
port: "{{ .Values.service.main.ports.main.port }}"
httpHeaders:
Host: '{{ tpl .Values.workload.main.podSpec.containers.main.env.APP_BASE_URL $ | replace "https://" "" | replace "http://" "" }}'
readiness:
path: "/api/ping"
port: "{{ .Values.service.main.ports.main.port }}"
httpHeaders:
Host: '{{ tpl .Values.workload.main.podSpec.containers.main.env.APP_BASE_URL $ | replace "https://" "" | replace "http://" "" }}'
startup:
type: tcp
port: "{{ .Values.service.main.ports.main.port }}"
env:
APP_BASE_URL: ""
APP_PORT: "{{ .Values.service.main.ports.main.port }}"
DB_CLIENT: "pg" DB_CLIENT: "pg"
POSTGRES_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}" POSTGRES_DATABASE: "{{ .Values.cnpg.main.database }}"
POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}" POSTGRES_USER: "{{ .Values.cnpg.main.user }}"
POSTGRES_PORT: "5432" POSTGRES_PORT: "5432"
POSTGRES_PASSWORD: POSTGRES_PASSWORD:
secretKeyRef: secretKeyRef:
name: dbcreds name: cnpg-main-user
key: postgresql-password key: password
POSTGRES_HOST: POSTGRES_HOST:
secretKeyRef: secretKeyRef:
name: dbcreds name: cnpg-main-urls
key: plainhost key: host
MAILER_ENABLED: 0 MAILER_ENABLED: 0
MAILER_HOST: "" MAILER_HOST: ""
MAILER_PORT: 465 MAILER_PORT: 465
@@ -35,31 +53,23 @@ env:
MAILER_NOREPLY_NAME: "" MAILER_NOREPLY_NAME: ""
MAILER_NOREPLY_EMAIL: "" MAILER_NOREPLY_EMAIL: ""
probes:
liveness:
path: "/api/ping"
readiness:
path: "/api/ping"
startup:
path: "/api/ping"
service: service:
main: main:
ports: ports:
main: main:
port: 22300 port: 22300
targetPort: 22300
persistence: persistence:
config: config:
enabled: true enabled: true
mountPath: "/config" mountPath: "/config"
postgresql: cnpg:
main:
enabled: true enabled: true
existingSecret: "dbcreds" user: joplin
postgresqlUsername: joplin database: joplin
postgresqlDatabase: joplin
portal: portal:
open:
enabled: true enabled: true