migrate(midarr) migrate midarr to new common **BREAKING CHANGES** (#10382)

**Description**
- Migrated app to new common and updated to the latest available
version.
- Added basic installation notes.

⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

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

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [X] ⚖️ My code follows the style guidelines of this project
- [X] 👀 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
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [X] ⬆️ 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._
This commit is contained in:
Xstar97TheNoob
2023-07-14 10:51:58 +02:00
committed by GitHub
parent 36b5d9bfe3
commit d349af1a67
10 changed files with 144 additions and 125 deletions
+1 -1
View File
@@ -12,6 +12,7 @@ chart-dirs:
excluded-charts: excluded-charts:
- charts/dependency/subchart - charts/dependency/subchart
- charts/incubator/twingate-connector - charts/incubator/twingate-connector
- charts/incubator/midarr
- charts/incubator/orbital-sync - charts/incubator/orbital-sync
- charts/incubator/plex-meta-manager - charts/incubator/plex-meta-manager
- charts/incubator/tauticord - charts/incubator/tauticord
@@ -23,7 +24,6 @@ excluded-charts:
- charts/stable/discordgsm - charts/stable/discordgsm
- charts/stable/facebox - charts/stable/facebox
- charts/stable/foundryvtt - charts/stable/foundryvtt
- charts/stable/foundryvtt
- charts/stable/heimdall - charts/stable/heimdall
- charts/stable/mc-router - charts/stable/mc-router
- charts/stable/multus - charts/stable/multus
+4 -7
View File
@@ -1,18 +1,15 @@
apiVersion: v2 apiVersion: v2
appVersion: "1.16.1" appVersion: "3.1.0"
dependencies: dependencies:
- name: common - name: common
repository: https://library-charts.truecharts.org repository: https://library-charts.truecharts.org
version: 11.1.2 version: 12.14.6
- condition: postgresql.enabled
name: postgresql
repository: https://deps.truecharts.org/
version: 11.0.31
description: Midarr is a minimal lightweight media server for enjoying your media description: Midarr is a minimal lightweight media server for enjoying your media
home: https://truecharts.org/charts/incubator/midarr home: https://truecharts.org/charts/incubator/midarr
icon: https://truecharts.org/img/hotlink-ok/chart-icons/midarr.png icon: https://truecharts.org/img/hotlink-ok/chart-icons/midarr.png
keywords: keywords:
- midarr - midarr
- media
kubeVersion: ">=1.16.0-0" kubeVersion: ">=1.16.0-0"
maintainers: maintainers:
- email: info@truecharts.org - email: info@truecharts.org
@@ -22,7 +19,7 @@ name: midarr
sources: sources:
- https://github.com/truecharts/charts/tree/master/charts/incubator/midarr - https://github.com/truecharts/charts/tree/master/charts/incubator/midarr
- https://github.com/midarrlabs/midarr-server - https://github.com/midarrlabs/midarr-server
version: 3.0.22 version: 4.0.0
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- media - media
@@ -0,0 +1,5 @@
# Installation Notes
Midarr requires a sonarr and radarr instance to be setup prior for the app to function.
Its recommended all apps share the same internal path like /media when mounting your media libraries to these apps.
+17 -9
View File
@@ -10,9 +10,9 @@ questions:
# Include{replicas1} # Include{replicas1}
# Include{podSpec} # Include{podSpec}
# Include{containerMain} # Include{containerMain}
# Include{containerBasic} # Include{containerBasic}
# Include{containerAdvanced} # Include{containerAdvanced}
- variable: midarr - variable: midarr
group: App Configuration group: App Configuration
label: Midarr Configuration label: Midarr Configuration
@@ -30,17 +30,20 @@ questions:
label: Admin Mail label: Admin Mail
schema: schema:
type: string type: string
required: true
default: "" default: ""
- variable: name - variable: name
label: Admin Name label: Admin Name
schema: schema:
type: string type: string
required: true
default: "" default: ""
- variable: pass - variable: pass
label: Admin Password label: Admin Password
schema: schema:
type: string type: string
private: true private: true
required: true
default: "" default: ""
- variable: general - variable: general
label: General Configuration label: General Configuration
@@ -59,7 +62,7 @@ questions:
label: Mailer From label: Mailer From
schema: schema:
type: string type: string
default: "" default: "midarr@example.com"
- variable: sendgrid_api_key - variable: sendgrid_api_key
label: SendGrid API Key label: SendGrid API Key
schema: schema:
@@ -76,12 +79,14 @@ questions:
label: Base URL label: Base URL
schema: schema:
type: string type: string
required: true
default: "" default: ""
- variable: api_key - variable: api_key
label: API Key label: API Key
schema: schema:
type: string type: string
private: true private: true
required: true
default: "" default: ""
- variable: sonarr - variable: sonarr
label: Sonarr Configuration label: Sonarr Configuration
@@ -93,14 +98,17 @@ questions:
label: Base URL label: Base URL
schema: schema:
type: string type: string
required: true
default: "" default: ""
- variable: api_key - variable: api_key
label: API Key label: API Key
schema: schema:
type: string type: string
private: true private: true
required: true
default: "" default: ""
# Include{containerConfig} # Include{containerConfig}
# Include{podOptions}
# Include{serviceRoot} # Include{serviceRoot}
- variable: main - variable: main
label: Main Service label: Main Service
@@ -141,16 +149,16 @@ questions:
# Include{ingressAdvanced} # Include{ingressAdvanced}
# Include{ingressList} # Include{ingressList}
# Include{podSecurityContextRoot} # Include{securityContextRoot}
- variable: runAsUser - variable: runAsUser
label: runAsUser label: "runAsUser"
description: The UserID of the user running the application description: "The UserID of the user running the application"
schema: schema:
type: int type: int
default: 0 default: 0
- variable: runAsGroup - variable: runAsGroup
label: runAsGroup label: "runAsGroup"
description: The groupID this App of the user running the application description: "The groupID of the user running the application"
schema: schema:
type: int type: int
default: 0 default: 0
@@ -158,8 +166,8 @@ questions:
# Include{securityContextAdvanced} # Include{securityContextAdvanced}
# Include{securityContextPod} # Include{securityContextPod}
- variable: fsGroup - variable: fsGroup
label: fsGroup label: "fsGroup"
description: The group that should own ALL storage. description: "The group that should own ALL storage."
schema: schema:
type: int type: int
default: 568 default: 568
@@ -0,0 +1 @@
{{- include "tc.v1.common.lib.chart.notes" $ -}}
@@ -1,36 +0,0 @@
{{/* Define the configmap */}}
{{- define "midarr.config" -}}
{{- $configName := printf "%s-config" (include "tc.common.names.fullname" .) }}
---
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ $configName }}
labels:
{{- include "tc.common.labels" . | nindent 4 }}
data:
DB_USERNAME: {{ .Values.postgresql.postgresqlUsername }}
DB_DATABASE: {{ .Values.postgresql.postgresqlDatabase }}
DB_HOSTNAME: {{ printf "%v-%v" .Release.Name "postgresql" }}
{{- with .Values.midarr.admin.mail }}
SETUP_ADMIN_EMAIL: {{ . }}
{{- end }}
{{- with .Values.midarr.admin.name }}
SETUP_ADMIN_NAME: {{ . }}
{{- end }}
{{- with .Values.midarr.radarr.base_url }}
RADARR_BASE_URL: {{ . }}
{{- end }}
{{- with .Values.midarr.sonarr.base_url }}
SONARR_BASE_URL: {{ . }}
{{- end }}
{{- with .Values.midarr.general.app_url }}
APP_URL: http://localhost:4000
{{- end }}
{{- with .Values.midarr.general.app_mailer_from }}
APP_MAILER_FROM: example@email.com
{{- end }}
{{- end -}}
@@ -1,29 +0,0 @@
{{/* Define the secret */}}
{{- define "midarr.secret" -}}
{{- $secretName := printf "%s-secret" (include "tc.common.names.fullname" .) }}
---
apiVersion: v1
kind: Secret
type: Opaque
metadata:
name: {{ $secretName }}
labels:
{{- include "tc.common.labels" . | nindent 4 }}
data:
DB_PASSWORD: {{ .Values.postgresql.postgresqlPassword | trimAll "\"" | b64enc }}
{{- with .Values.midarr.admin.pass }}
SETUP_ADMIN_PASSWORD: {{ . | b64enc }}
{{- end }}
{{- with .Values.midarr.radarr.api_key }}
RADARR_API_KEY: {{ . | b64enc }}
{{- end }}
{{- with .Values.midarr.sonarr.api_key }}
SONARR_API_KEY: {{ . | b64enc }}
{{- end }}
{{- with .Values.midarr.general.sendgrid_api_key }}
SENDGRID_API_KEY: {{ . | b64enc }}
{{- end }}
{{- end }}
@@ -0,0 +1,67 @@
{{/* Define the secrets */}}
{{- define "midarr.secrets" -}}
{{- $secretName := (printf "%s-midarr-secrets" (include "tc.v1.common.lib.chart.names.fullname" $)) -}}
{{- $midarr := .Values.midarr -}}
{{- $admin := $midarr.admin -}}
{{- $general := $midarr.general -}}
{{- $radarr := $midarr.radarr -}}
{{- $sonarr := $midarr.sonarr -}}
{{- $host := printf "%v-cnpg-main-rw" (include "tc.v1.common.lib.chart.names.fullname" $) }}
{{- $password := .Values.cnpg.main.creds.password | trimAll "\"" }}
enabled: true
data:
{{/* DB */}}
DB_USERNAME: {{ .Values.cnpg.main.user }}
DB_DATABASE: {{ .Values.cnpg.main.database }}
DB_HOSTNAME: {{ $host }}
DB_PASSWORD: {{ $password }}
{{/* MIDARR */}}
{{- with $admin.mail }}
SETUP_ADMIN_EMAIL: {{ . }}
{{- end }}
{{- with $admin.name }}
SETUP_ADMIN_NAME: {{ . }}
{{- end }}
{{- with $admin.pass }}
SETUP_ADMIN_PASSWORD: {{ . | b64enc }}
{{- end }}
{{/* GENERAL */}}
{{- with $general.app_url }}
APP_URL: http://localhost:4000
{{- end }}
{{- with $general.app_mailer_from }}
APP_MAILER_FROM: {{ . }}
{{- end }}
{{- with $general.sendgrid_api_key }}
SENDGRID_API_KEY: {{ . | b64enc }}
{{- end }}
{{/* RADARR */}}
{{- with $radarr.base_url }}
RADARR_BASE_URL: {{ . }}
{{- end }}
{{- with $radarr.api_key }}
RADARR_API_KEY: {{ . | b64enc }}
{{- end }}
{{/* SONARR */}}
{{- with $sonarr.base_url }}
SONARR_BASE_URL: {{ . }}
{{- end }}
{{- with $sonarr.api_key }}
SONARR_API_KEY: {{ . | b64enc }}
{{- end }}
{{- end -}}
@@ -1,11 +1,11 @@
{{/* Make sure all variables are set properly */}} {{/* Make sure all variables are set properly */}}
{{- include "tc.common.loader.init" . }} {{- include "tc.v1.common.loader.init" . }}
{{/* Render config */}} {{/* Render secrets for midarr */}}
{{- include "midarr.config" . }} {{- $secrets := include "midarr.secrets" . | fromYaml -}}
{{- if $secrets -}}
{{/* Render secret */}} {{- $_ := set .Values.secret "midarr-secrets" $secrets -}}
{{- include "midarr.secret" . }} {{- end -}}
{{/* Render the templates */}} {{/* Render the templates */}}
{{ include "tc.common.loader.apply" . }} {{ include "tc.v1.common.loader.apply" . }}
+25 -19
View File
@@ -1,16 +1,22 @@
image: image:
repository: tccr.io/truecharts/midarr-server repository: tccr.io/truecharts/midarr-server
tag: 1.16.1@sha256:5c0d69dbef7500b95aa11b9b51b8875a6355cfccc9cc57e9de202f574cf10b4f tag: v3.1.0@sha256:5d85789b1a43cd6f7b133ae129d9f1dae4b97773e6c9f54b48094b1c86b47422
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
securityContext: securityContext:
readOnlyRootFilesystem: false container:
runAsNonRoot: false runAsNonRoot: false
readOnlyRootFilesystem: false
podSecurityContext:
runAsUser: 0 runAsUser: 0
runAsGroup: 0 runAsGroup: 0
service:
main:
ports:
main:
port: 10347
targetPort: 4000
midarr: midarr:
admin: admin:
mail: admin@example.com mail: admin@example.com
@@ -27,25 +33,25 @@ midarr:
base_url: "" base_url: ""
api_key: "" api_key: ""
envFrom: workload:
main:
podSpec:
containers:
main:
command:
- sh
- -c
- chmod u+x entry-local.sh && ./entry-local.sh
envFrom:
- secretRef: - secretRef:
name: '{{ include "tc.common.names.fullname" . }}-secret' name: "midarr-secrets"
- configMapRef:
name: '{{ include "tc.common.names.fullname" . }}-config'
service: cnpg:
main: main:
ports:
main:
port: 10347
protocol: HTTP
targetPort: 4000
postgresql:
enabled: true enabled: true
existingSecret: dbcreds user: midarr
postgresqlUsername: midarr database: midarr
postgresqlDatabase: midarr
portal: portal:
open:
enabled: true enabled: true