Merge pull request 'Update actions/checkout action to v4' (#79) from renovate/actions-checkout-4.x into main

Reviewed-on: #79

.gitea/workflows/ci-test.yml

@@ -10,7 +10,7 @@ jobs:
     name: check and test
     runs-on: ubuntu-latest
     steps:
-      - uses: https://gitea.com/actions/checkout@v3
+      - uses: https://gitea.com/actions/checkout@v4
       - name: install tools
         run: |
           apt update -y

.gitea/workflows/release-version.yml

@@ -9,11 +9,11 @@ jobs:
   generate-chart-publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: https://gitea.com/actions/checkout@v3
+      - uses: https://gitea.com/actions/checkout@v4
       - name: install tools
         run: |
           apt update -y
-          apt install -y curl
+          apt install -y curl lftp
           curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | tee /usr/share/keyrings/helm.gpg > /dev/null
           echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list
           apt update -y
@@ -43,11 +43,5 @@ jobs:
           done
 
       - name: Deploy to FTP Server
-        uses: https://github.com/SamKirkland/FTP-Deploy-Action@v4.3.4
+        run: |
-        with:
+          lftp ${{ secrets.ftp_host }} -u ${{ secrets.ftp_user }},${{ secrets.ftp_password }} -e "set ftp:ssl-protect-data true; set ftp:ssl-force true; set ssl:verify-certificate true; mirror --overwrite --reverse --continue --dereference -x ^\.git/$ ./_build/ ./; quit"  
-          server: ${{ secrets.ftp_host }}
-          username: ${{ secrets.ftp_user }}
-          server-dir: ./
-          local-dir: ./_build/
-          protocol: ftps
-          password: ${{ secrets.ftp_password }}

Makefile

@@ -18,7 +18,7 @@ romm: configure romm_ci
 	helm package charts/stable/romm/ -d _build/
 
 index:
-	curl -L -o _build/index.yaml https://charts.coo-ops.space/index.yaml
+	curl -L -o index.yaml https://charts.coo-ops.space/index.yaml
 	helm repo index _build/ --url https://charts.coo-ops.space --merge index.yaml
 
 ci: homebox_ci romm_ci

charts/stable/homebox/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: homebox
 # This is the chart version.
-version: 0.1.2
+version: 0.1.6
 # A SemVer range of compatible Kubernetes versions (optional)
 # kubeVersion: ">=1.16.0-0"
 # What is this Application?

charts/stable/homebox/templates/config.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-kind: Secret
+kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-config
   namespace: {{ .Values.namespace }}

charts/stable/homebox/templates/deployment.yaml

@@ -38,6 +38,18 @@ spec:
             - name: http
               containerPort: 7745 
               protocol: TCP
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            {{- toYaml (omit .Values.livenessProbe "enabled") | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            {{- toYaml (omit .Values.readinessProbe "enabled") | nindent 12 }}
+          {{- end }}
+          {{- if .Values.startupProbe.enabled }}
+          startupProbe:
+            {{- toYaml (omit .Values.startupProbe "enabled") | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

charts/stable/homebox/templates/service.yaml

@@ -4,9 +4,9 @@ metadata:
   name: {{ .Release.Name }}
   namespace: {{ .Values.namespace }}
   labels:
-    app: {{ .Release.Name }}
+    {{- include "homebox.labels" . | nindent 4 }}
 spec:
   ports:
     - port: 7745
   selector:
-    app: {{ .Release.Name }}
+    {{- include "homebox.selectorLabels" . | nindent 4 }}

charts/stable/homebox/values.yaml

@@ -21,21 +21,21 @@ fullnameOverride: ""
 homebox:
   env:
     HBOX_MODE: production #application mode used for runtime behavior can be one of: development, production
-    HBOX_WEB_PORT: 7745 #port to run the web server on, if you're using docker do not change this
+    HBOX_WEB_PORT: "7745" #port to run the web server on, if you're using docker do not change this
     # HBOX_WEB_HOST: 	#host to run the web server on, if you're using docker do not change this
-    HBOX_OPTIONS_ALLOW_REGISTRATION: true #allow users to register themselves
+    HBOX_OPTIONS_ALLOW_REGISTRATION: "true" #allow users to register themselves
-    HBOX_OPTIONS_AUTO_INCREMENT_ASSET_ID: true #auto increments the asset_id field for new items
+    HBOX_OPTIONS_AUTO_INCREMENT_ASSET_ID: "true" #auto increments the asset_id field for new items
-    HBOX_WEB_MAX_UPLOAD_SIZE: 10 #maximum file upload size supported in MB
+    HBOX_WEB_MAX_UPLOAD_SIZE: "10" #maximum file upload size supported in MB
     HBOX_STORAGE_DATA: /data/ #path to the data directory, do not change this if you're using docker
     HBOX_STORAGE_SQLITE_URL: /data/homebox.db?_fk=1 #sqlite database url, in you're using docker do not change this
     HBOX_LOG_LEVEL: info #log level to use, can be one of: trace, debug, info, warn, error, critical
     HBOX_LOG_FORMAT: text #log format to use, can be one of: text, json
     # HBOX_MAILER_HOST: 	#email host to use, if not set no email provider will be used
-    HBOX_MAILER_PORT: 587 #email port to use
+    HBOX_MAILER_PORT: "587" #email port to use
     # HBOX_MAILER_USERNAME: 	#email user to use
     # HBOX_MAILER_PASSWORD: 	#email password to use
     # HBOX_MAILER_FROM: 	#email from address to use
-    HBOX_SWAGGER_HOST: 7745 #swagger host to use, if not set swagger will be disabled
+    HBOX_SWAGGER_HOST: "7745" #swagger host to use, if not set swagger will be disabled
     HBOX_SWAGGER_SCHEMA: http #swagger schema to use, can be one of: http, https
 
 ingress:
@@ -64,3 +64,33 @@ persistence:
 
 extraVolumes: []
 extraContainerVolumeMounts: []
+
+livenessProbe:
+  enabled: true
+  tcpSocket:
+    port: http
+  initialDelaySeconds: 200
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 10
+
+readinessProbe:
+  enabled: true
+  tcpSocket:
+    port: http
+  initialDelaySeconds: 5
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
+
+startupProbe:
+  enabled: false
+  tcpSocket:
+    port: http
+  initialDelaySeconds: 60
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 10

charts/stable/kavita/Chart.yaml

@@ -0,0 +1,36 @@
+apiVersion: v2
+name: kavita
+# This is the chart version.
+version: 0.1.0
+# A SemVer range of compatible Kubernetes versions (optional)
+# kubeVersion: ">=1.16.0-0"
+# What is this Application?
+description: "Kavita is a rocket fueled self-hosted digital library which supports a vast array of file formats."
+type: application
+# Meta Keywords
+keywords:
+  - PDF
+  - Manga
+  - Comic
+  - eReader
+# The URL of this projects home page
+home: https://www.kavitareader.com/
+# A list of URLs to source code for this project
+sources:
+  - https://github.com/Kareadita/Kavita
+  - https://github.com/Kareadita/Kavita/pkgs/container/kavita
+# Who's looking after this Chart?
+maintainers:
+  - name: Kyle Coo-ops
+    email: kyle@coo-ops.space
+    url: https://git.coo-ops.space/cooper
+  - name: Alice
+    email: alice@stacktonic.com.au
+    url: https://github.com/HunterNyan
+# A URL to an SVG or PNG image to be used as an icon (optional).
+icon: https://raw.githubusercontent.com/Kareadita/Kavita/develop/favicon.ico
+
+# This is the version number of the application being deployed. This version number should be
+appVersion: "v0.7.3"
+# Whether this chart is deprecated (optional, boolean)
+deprecated: false

charts/stable/kavita/templates/_helpers.tpl

@@ -0,0 +1,73 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "kavita.name" -}}
+    {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "kavita.fullname" -}}
+    {{- if .Values.fullnameOverride }}
+        {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+    {{- else }}
+        {{- $name := default .Chart.Name .Values.nameOverride }}
+        {{- if contains $name .Release.Name }}
+            {{- .Release.Name | trunc 63 | trimSuffix "-" }}
+        {{- else }}
+            {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+        {{- end }}
+    {{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "kavita.chart" -}}
+    {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "kavita.labels" -}}
+helm.sh/chart: {{ include "kavita.chart" . }}
+{{ include "kavita.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "kavita.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kavita.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Storage Class
+*/}}
+{{- define "kavita.persistence.storageClass" -}}
+{{- $storageClass := .Values.persistence.storageClass }}
+{{- if $storageClass }}
+storageClassName: {{ $storageClass | quote }}
+{{- end }}
+{{- end -}}
+
+
+{{- define "kavita.container-additional-mounts" -}}
+  {{- /* Honor the deprecated extraVolumeMounts variable when defined */ -}}
+  {{- if gt (len .Values.extraContainerVolumeMounts) 0 -}}
+    {{- toYaml .Values.extraContainerVolumeMounts -}}
+  {{- else if gt (len .Values.extraVolumeMounts) 0 -}}
+    {{- toYaml .Values.extraVolumeMounts -}}
+  {{- end -}}
+{{- end -}}

charts/stable/kavita/templates/config.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-config
+  namespace: {{ .Values.namespace }}
+data:    
+{{- toYaml .Values.kavita.env | nindent 2 }}

charts/stable/kavita/templates/deployment.yaml

@@ -0,0 +1,94 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "kavita.fullname" . }}
+  namespace: {{ .Values.namespace }}
+  labels:
+    {{- include "kavita.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "kavita.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+    {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      labels:
+        {{- include "kavita.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.www.image }}:{{ .Values.www.tag  | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.www.pullPolicy }}
+          envFrom:
+          - configMapRef:
+              name: {{ .Release.Name }}-config
+          ports:
+            - name: http
+              containerPort: 7745 
+              protocol: TCP
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            {{- toYaml (omit .Values.livenessProbe "enabled") | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            {{- toYaml (omit .Values.readinessProbe "enabled") | nindent 12 }}
+          {{- end }}
+          {{- if .Values.startupProbe.enabled }}
+          startupProbe:
+            {{- toYaml (omit .Values.startupProbe "enabled") | nindent 12 }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: config
+              mountPath: /kavita/config
+              {{- if .Values.persistence.subPath }}
+              subPath: {{ .Values.persistence.subPath }}
+              {{- end }}
+      volumes:
+        {{- if gt (len .Values.extraVolumes) 0 }}
+        {{- toYaml .Values.extraVolumes | nindent 8 }}
+        {{- end }}
+        {{- if and .Values.persistence.enabled .Values.persistence.existingClaim }}
+        - name: config
+          persistentVolumeClaim:
+            {{- with .Values.persistence.existingClaim }}
+            claimName: {{ tpl . $ }}
+            {{- end }}
+        {{- else if not .Values.persistence.enabled }}
+        - name: config
+          emptyDir: {}
+        {{- else if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+        - name: config
+          persistentVolumeClaim:
+            claimName: {{ include "kavita.fullname" . }}-pvc
+        {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.dnsConfig }}
+      dnsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

charts/stable/kavita/templates/ingress.yaml

@@ -0,0 +1,41 @@
+{{- if .Values.ingress.enabled -}}
+{{- $serviceName := .Release.Name -}}
+
+apiVersion:  networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+{{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className }}
+{{- end }}
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: 5000
+          {{- end }}
+    {{- end }}
+{{- end }}

charts/stable/kavita/templates/pvc.yaml

@@ -0,0 +1,28 @@
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  namespace: {{ .Values.namespace }}
+  name: {{ include "kavita.fullname" . }}-pvc
+  {{- with .Values.persistence.annotations }}
+  annotations:
+  {{- range $key, $value := . }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
+  {{- end }}
+  {{- with .Values.persistence.labels }}
+  labels:
+  {{- range $key, $value := . }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
+  {{- end }}
+spec:
+  accessModes:
+  {{- range .Values.persistence.accessModes }}
+  - {{ . | quote }}
+  {{- end }}
+  {{- include "kavita.persistence.storageClass" . | indent 2 }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size | quote }}
+{{- end }}

charts/stable/kavita/templates/service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}
+  namespace: {{ .Values.namespace }}
+  labels:
+    {{- include "kavita.labels" . | nindent 4 }}
+spec:
+  ports:
+    - port: 5000
+  selector:
+    {{- include "kavita.selectorLabels" . | nindent 4 }}

charts/stable/kavita/values.yaml

@@ -0,0 +1,87 @@
+# Default values for kavita.
+# This is a YAML-formatted file.
+
+# Namespace to use.
+namespace: kavita
+
+# Replica's to Deploy.
+replicaCount: 1
+
+# Image to use.
+www:
+  image: kizaing/kavita
+  pullPolicy: Always
+  tag: "v0.7.3"
+
+# Overrides.
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+kavita:
+  env:
+    TZ: UTC
+
+ingress:
+  enabled: true
+  className: "nginx"
+  tls:
+    - secretName: kavita-domain-tls
+      hosts:
+        - kavita.example.com
+  hosts:
+    - host: kavita.example.com
+      paths:
+        - path: /
+          pathType: Prefix
+
+persistence:
+  enabled: true
+  existingClaim:
+  size: 1Gi
+  accessModes:
+    - ReadWriteOnce
+  labels: {}
+  annotations: {}
+  storageClass:
+  subPath:
+
+extraVolumes:
+#  - name: nfs
+#    nfs:
+#      server: "10.0.0.1"
+#      path: "/nextcloud_data"
+#      readOnly: false
+extraVolumeMounts:
+#  - name: nfs
+#    mountPath: "/legacy_data"
+
+livenessProbe:
+  enabled: true
+  tcpSocket:
+    port: http
+  initialDelaySeconds: 200
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 10
+
+readinessProbe:
+  enabled: true
+  tcpSocket:
+    port: http
+  initialDelaySeconds: 5
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
+
+startupProbe:
+  enabled: false
+  tcpSocket:
+    port: http
+  initialDelaySeconds: 60
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 10

charts/stable/romm/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
   repository: https://charts.bitnami.com/bitnami
-  version: 11.0.14
+  version: 18.0.4
-digest: sha256:ecbf12680948a285c2fa529ab2096ee8f46d056382cecc16db4b469ed8b17216
+digest: sha256:0a9177fb8bda8a0fd4cb8b281de618035ca08cfbd2f99edcb5b21559593b74ce
-generated: "2023-06-25T19:08:44.147546695Z"
+generated: "2024-05-14T06:30:55.182258781Z"

charts/stable/romm/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: romm
 # This is the chart version.
-version: 0.1.0
+version: 0.1.2
 # A SemVer range of compatible Kubernetes versions (optional)
 # kubeVersion: ">=1.16.0-0"
 # What is this Application?
@@ -20,7 +20,7 @@ sources:
   - https://hub.docker.com/r/zurdi15/romm
 dependencies: 
   - name: mariadb
-    version: 11.0.14
+    version: 18.0.4
     repository: https://charts.bitnami.com/bitnami
     condition: mariadb.enabled
 # Who's looking after this Chart?
@@ -35,6 +35,6 @@ maintainers:
 icon: https://raw.githubusercontent.com/zurdi15/romm/master/romm.svg
 
 # This is the version number of the application being deployed. This version number should be
-appVersion: "v1.8.4"
+appVersion: "1.8.4"
 # Whether this chart is deprecated (optional, boolean)
 deprecated: false

charts/stable/romm/templates/deployment.yaml

@@ -65,6 +65,18 @@ spec:
             - name: http
               containerPort: 80 
               protocol: TCP
+          {{- if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            {{- toYaml (omit .Values.livenessProbe "enabled") | nindent 12 }}
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            {{- toYaml (omit .Values.readinessProbe "enabled") | nindent 12 }}
+          {{- end }}
+          {{- if .Values.startupProbe.enabled }}
+          startupProbe:
+            {{- toYaml (omit .Values.startupProbe "enabled") | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:

charts/stable/romm/templates/service.yaml

@@ -4,9 +4,9 @@ metadata:
   name: {{ .Release.Name }}
   namespace: {{ .Values.namespace }}
   labels:
-    app: {{ .Release.Name }}
+    {{- include "romm.labels" . | nindent 4 }}
 spec:
   ports:
     - port: 80
   selector:
-    app: {{ .Release.Name }}
+    {{- include "romm.selectorLabels" . | nindent 4 }}

charts/stable/romm/values.yaml

@@ -11,7 +11,7 @@ replicaCount: 1
 www:
   image: zurdi15/romm
   pullPolicy: Always
-  tag: "v1.8.4"
+  tag: "1.8.4"
 
 # Overrides.
 imagePullSecrets: []
@@ -95,3 +95,33 @@ externalDatabase:
   ## @param externalDatabase.database Name of the existing database
   ##
   database: dmarc
+
+livenessProbe:
+  enabled: true
+  tcpSocket:
+    port: http
+  initialDelaySeconds: 200
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 10
+
+readinessProbe:
+  enabled: true
+  tcpSocket:
+    port: http
+  initialDelaySeconds: 5
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
+
+startupProbe:
+  enabled: false
+  tcpSocket:
+    port: http
+  initialDelaySeconds: 60
+  timeoutSeconds: 1
+  periodSeconds: 10
+  successThreshold: 1
+  failureThreshold: 10

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "reviewers": ["alice","cooper"],
+  "assignees": ["alice","cooper"],
+  "dependencyDashboard": "true"
+}