diff --git a/charts/calibre-web/.helmignore b/charts/calibre-web/.helmignore index 0e8a0eb3..e559de0a 100644 --- a/charts/calibre-web/.helmignore +++ b/charts/calibre-web/.helmignore @@ -14,10 +14,11 @@ *.swp *.bak *.tmp -*.orig *~ # Various IDEs .project .idea/ *.tmproj .vscode/ +# OWNERS file for Kubernetes +OWNERS diff --git a/charts/calibre-web/Chart.yaml b/charts/calibre-web/Chart.yaml index 0d25af45..d9cdb4b6 100644 --- a/charts/calibre-web/Chart.yaml +++ b/charts/calibre-web/Chart.yaml @@ -1,9 +1,8 @@ -type: application apiVersion: v2 -appVersion: 0.6.8 +appVersion: 0.6.9 description: Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. name: calibre-web -version: 2.0.1 +version: 3.0.0 keywords: - calibre - ebook @@ -15,3 +14,7 @@ sources: maintainers: - name: wojoinc email: wojoinc@pm.me +dependencies: + - name: common + repository: https://k8s-at-home.com/charts/ + version: 1.7.0 diff --git a/charts/calibre-web/OWNERS b/charts/calibre-web/OWNERS index 51f88652..1ce35762 100644 --- a/charts/calibre-web/OWNERS +++ b/charts/calibre-web/OWNERS @@ -1,4 +1,8 @@ approvers: - billimek +- onedr0p +- bjw-s reviewers: -- billimek \ No newline at end of file +- billimek +- onedr0p +- bjw-s diff --git a/charts/calibre-web/README.md b/charts/calibre-web/README.md index 3e76742e..0d7dcd13 100644 --- a/charts/calibre-web/README.md +++ b/charts/calibre-web/README.md @@ -1,14 +1,22 @@ -# calibre-web +# Calibre-Web -This is a helm chart for [calibre-web](https://github.com/janeczku/calibre-web) utilizing the [Linuxserver.io calibre-web image](https://hub.docker.com/r/linuxserver/calibre-web) +This is a helm chart for [Calibre-Web](https://github.com/janeczku/calibre-web). + +**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/k8s-at-home/charts/issues/new/choose)** ## TL;DR; ```shell -helm repo add k8s-at-home https://k8s-at-home.com/charts/ -helm install k8s-at-home/calibre-web +$ helm repo add k8s-at-home https://k8s-at-home.com/charts/ +$ helm install k8s-at-home/calibre-web ``` +## Storage + +If you plan to use networked storage to store your media or config for Booksonic, (NFS, etc.) please take a look at the +Fast Access option in the Booksonic settings. This will help improve the perfomance of the application +by not constantly monitoring media folders. + ## Installing the Chart To install the chart with the release name `my-release`: @@ -28,80 +36,50 @@ helm delete my-release --purge The command removes all the Kubernetes components associated with the chart and deletes the release. ## Configuration - -The following tables lists the configurable parameters of the `calibre-web` chart and their default values. - -| Parameter | Description | Default | -| --------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------- | -| `image.repository` | Image repository | `linuxserver/calibre-web` | -| `image.tag` | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/calibre-web/tags/). | `0.6.8-ls74` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `dockerMods.ebookConversion.enabled` | Enable optional ebook conversion feature. (x86_64 only) refer [here](https://github.com/linuxserver/docker-calibre-web#application-setup) | `false` | -| `dockerMods.ebookConversion.image.repository` | DockerMod image repository | `linuxserver/calibre-web` | -| `dockerMods.ebookConversion.image.tag` | DockerMod image tag. These typically start with `v`, with the "stable" tag being `calibre`. Can be found [here](https://hub.docker.com/r/linuxserver/calibre-web/tags/) | `calibre` | -| `strategyType` | Specifies the strategy used to replace old Pods by new ones | `Recreate` | -| `timezone` | Timezone the calibre-web instance should run as, e.g. 'America/New_York' | `UTC` | -| `puid` | process userID the calibre-web instance should run as | `1001` | -| `pgid` | process groupID the calibre-web instance should run as | `1001` | -| `umask` | Default umask to use when creating new files | `22` | -| `probes.liveness.initialDelaySeconds` | Specify liveness `initialDelaySeconds` parameter for the deployment | `60` | -| `probes.liveness.failureThreshold` | Specify liveness `failureThreshold` parameter for the deployment | `5` | -| `probes.liveness.timeoutSeconds` | Specify liveness `timeoutSeconds` parameter for the deployment | `10` | -| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment | `60` | -| `probes.readiness.failureThreshold` | Specify readiness `failureThreshold` parameter for the deployment | `5` | -| `probes.readiness.timeoutSeconds` | Specify readiness `timeoutSeconds` parameter for the deployment | `10` | -| `Service.type` | Kubernetes service type for the calibre-web GUI | `ClusterIP` | -| `Service.port` | Kubernetes port where the calibre-web GUI is exposed | `8083` | -| `Service.annotations` | Service annotations for the calibre-web GUI | `{}` | -| `Service.labels` | Custom labels | `{}` | -| `Service.loadBalancerIP` | Loadbalance IP for the calibre-web GUI | `{}` | -| `Service.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported) | None | -| `ingress.enabled` | Enables Ingress | `false` | -| `ingress.annotations` | Ingress annotations | `{}` | -| `ingress.labels` | Custom labels | `{}` | -| `ingress.path` | Ingress path | `/` | -| `ingress.hosts` | Ingress accepted hostnames | `chart-example.local` | -| `ingress.tls` | Ingress TLS configuration | `[]` | -| `persistence.config.enabled` | Use persistent volume to store configuration data | `true` | -| `persistence.config.size` | Size of persistent volume claim | `1Gi` | -| `persistence.config.existingClaim` | Use an existing PVC to persist data | `nil` | -| `persistence.config.storageClass` | Type of persistent volume claim | `-` | -| `persistence.config.accessMode` | Persistence access mode | `ReadWriteOnce` | -| `persistence.config.skipuninstall` | Do not delete the pvc upon helm uninstall | `false` | -| `persistence.books.enabled` | Use persistent volume to store books data | `true` | -| `persistence.books.size` | Size of persistent volume claim | `10Gi` | -| `persistence.books.existingClaim` | Use an existing PVC to persist data | `nil` | -| `persistence.books.storageClass` | Type of persistent volume claim | `-` | -| `persistence.books.accessMode` | Persistence access mode | `ReadWriteOnce` | -| `persistence.books.skipuninstall` | Do not delete the pvc upon helm uninstall | `false` | -| `persistence.extraExistingClaimMounts` | Optionally add multiple existing claims | `[]` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `tolerations` | Toleration labels for pod assignment | `[]` | -| `affinity` | Affinity settings for pod assignment | `{}` | -| `podAnnotations` | Key-value pairs to add as pod annotations | `{}` | -| `deploymentAnnotations` | Key-value pairs to add as deployment annotations | `{}` | +Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/calibre-web/values.yaml) +file. It has several commented out suggested values. Most notably, these include several environment variables used to +customize the container. +Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options. Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - ```console -helm install --name my-release \ - --set timezone="America/New York" \ +helm install calibre-web \ + --set env.TZ="America/New_York" \ k8s-at-home/calibre-web ``` - -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, - +Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the +chart. For example, ```console -helm install --name my-release -f values.yaml stable/calibre-web +helm install calibre-web k8s-at-home/calibre-web -f values.yaml +``` + +```yaml +image: + tag: ... ``` --- - **NOTE** -If you get `Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`. +If you get +```console +Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` +``` +it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`. --- -Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/calibre-web/values.yaml) file. It has several commented out suggested values. +## Upgrading an existing Release to a new major version + +A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions. + +### Upgrading from 2.x.x to 3.x.x + +Due to migrating to a centralized common library some values in `values.yaml` have changed. + +Examples: + +* `service.port` has been moved to `service.port.port`. +* `persistence.type` has been moved to `controllerType`. + +Refer to the library values.yaml for more configuration options. diff --git a/charts/calibre-web/ci/ct-values.yaml b/charts/calibre-web/ci/ct-values.yaml new file mode 100644 index 00000000..f6ccc628 --- /dev/null +++ b/charts/calibre-web/ci/ct-values.yaml @@ -0,0 +1,2 @@ +ingress: + enabled: true diff --git a/charts/calibre-web/templates/NOTES.txt b/charts/calibre-web/templates/NOTES.txt index 2b93c3fb..90f7b653 100644 --- a/charts/calibre-web/templates/NOTES.txt +++ b/charts/calibre-web/templates/NOTES.txt @@ -1,25 +1 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }}{{ $.Values.ingress.path }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "calibre-web.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "calibre-web.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "calibre-web.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "calibre-web.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:{{ .Values.service.port }} -{{- end }} - -{{- if .Values.dockerMods.ebookConversion.enabled }} -2. DockerMods: - You have enabled the EbookConversion Docker Mod using the {{ .Values.dockerMods.ebookConversion.image.repository }}:{{ .Values.dockerMods.ebookConversion.image.tag }} image. - Remember to visit https://github.com/linuxserver/docker-calibre-web#application-setup for instructions on configuring this feature in the calibre-web settings. -{{- end }} +{{- include "common.notes.defaultNotes" . -}} diff --git a/charts/calibre-web/templates/_helpers.tpl b/charts/calibre-web/templates/_helpers.tpl deleted file mode 100644 index af41c8fa..00000000 --- a/charts/calibre-web/templates/_helpers.tpl +++ /dev/null @@ -1,63 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "calibre-web.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 "calibre-web.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 "calibre-web.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "calibre-web.labels" -}} -helm.sh/chart: {{ include "calibre-web.chart" . }} -{{ include "calibre-web.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "calibre-web.selectorLabels" -}} -app.kubernetes.io/name: {{ include "calibre-web.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "calibre-web.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "calibre-web.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/charts/calibre-web/templates/books-pvc.yaml b/charts/calibre-web/templates/books-pvc.yaml deleted file mode 100644 index 2188df23..00000000 --- a/charts/calibre-web/templates/books-pvc.yaml +++ /dev/null @@ -1,25 +0,0 @@ - -{{- if and .Values.persistence.books.enabled (not .Values.persistence.books.existingClaim) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "calibre-web.fullname" . }}-books - {{- if .Values.persistence.books.skipuninstall }} - annotations: - "helm.sh/resource-policy": keep - {{- end }} - labels: {{ include "calibre-web.labels" . | nindent 4}} -spec: - accessModes: - - {{ .Values.persistence.books.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.books.size | quote }} -{{- if .Values.persistence.books.storageClass }} -{{- if (eq "-" .Values.persistence.books.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.books.storageClass }}" -{{- end }} -{{- end }} -{{- end -}} \ No newline at end of file diff --git a/charts/calibre-web/templates/common.yaml b/charts/calibre-web/templates/common.yaml new file mode 100644 index 00000000..a6613c2c --- /dev/null +++ b/charts/calibre-web/templates/common.yaml @@ -0,0 +1 @@ +{{ include "common.all" . }} diff --git a/charts/calibre-web/templates/config-pvc.yaml b/charts/calibre-web/templates/config-pvc.yaml deleted file mode 100644 index 5d36a7e1..00000000 --- a/charts/calibre-web/templates/config-pvc.yaml +++ /dev/null @@ -1,25 +0,0 @@ - -{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "calibre-web.fullname" . }}-config - {{- if .Values.persistence.config.skipuninstall }} - annotations: - "helm.sh/resource-policy": keep - {{- end }} - labels: {{ include "calibre-web.labels" . | nindent 4 }} -spec: - accessModes: - - {{ .Values.persistence.config.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.config.size | quote }} -{{- if .Values.persistence.config.storageClass }} -{{- if (eq "-" .Values.persistence.config.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.config.storageClass }}" -{{- end }} -{{- end }} -{{- end -}} \ No newline at end of file diff --git a/charts/calibre-web/templates/deployment.yaml b/charts/calibre-web/templates/deployment.yaml deleted file mode 100644 index 6f1297be..00000000 --- a/charts/calibre-web/templates/deployment.yaml +++ /dev/null @@ -1,112 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "calibre-web.fullname" . }} - {{- if .Values.deploymentAnnotations }} - annotations: - {{- range $key, $value := .Values.deploymentAnnotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} - labels: {{ include "calibre-web.labels" . | nindent 4 }} -spec: - replicas: 1 - revisionHistoryLimit: 3 - strategy: - type: {{ .Values.strategyType }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "calibre-web.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "calibre-web.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.podAnnotations }} - annotations: - {{- range $key, $value := .Values.podAnnotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} - {{- end }} - spec: - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: 8083 - protocol: TCP - livenessProbe: - tcpSocket: - port: http - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - failureThreshold: {{ .Values.probes.liveness.failureThreshold }} - timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }} - readinessProbe: - tcpSocket: - port: http - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - failureThreshold: {{ .Values.probes.readiness.failureThreshold }} - timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} - env: - - name: TZ - value: "{{ .Values.timezone }}" - - name: PUID - value: "{{ .Values.puid }}" - - name: PGID - value: "{{ .Values.pgid }}" - - name: UMASK - value: "{{ .Values.umask }}" - {{- if eq .Values.dockerMods.ebookConversion.enabled true }} - - name: DOCKER_MODS - value: "{{ .Values.dockerMods.ebookConversion.image.repository }}:{{ .Values.dockerMods.ebookConversion.image.tag }}" - {{- end }} - volumeMounts: - - mountPath: /config - name: config - - mountPath: /books - name: books - {{- if .Values.persistence.books.subPath }} - subPath: {{ .Values.persistence.books.subPath }} - {{- end }} - {{- range .Values.persistence.extraExistingClaimMounts }} - - name: {{ .name }} - mountPath: {{ .mountPath }} - readOnly: {{ .readOnly }} - {{- end }} - resources: -{{ toYaml .Values.resources | indent 12 }} - volumes: - - name: config - {{- if .Values.persistence.config.enabled }} - persistentVolumeClaim: - claimName: {{ if .Values.persistence.config.existingClaim }}{{ .Values.persistence.config.existingClaim }}{{- else }}{{ template "calibre-web.fullname" . }}-config{{- end }} - {{- else }} - emptyDir: {} - {{- end }} - - name: books - {{- if .Values.persistence.books.enabled }} - persistentVolumeClaim: - claimName: {{ if .Values.persistence.books.existingClaim }}{{ .Values.persistence.books.existingClaim }}{{- else }}{{ template "calibre-web.fullname" . }}-books{{- end }} - {{- else }} - emptyDir: {} - {{- end }} - {{- range .Values.persistence.extraExistingClaimMounts }} - - name: {{ .name }} - persistentVolumeClaim: - claimName: {{ .existingClaim }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: -{{ toYaml . | indent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: -{{ toYaml . | indent 8 }} - {{- end }} diff --git a/charts/calibre-web/templates/ingress.yaml b/charts/calibre-web/templates/ingress.yaml deleted file mode 100644 index fe567853..00000000 --- a/charts/calibre-web/templates/ingress.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "calibre-web.fullname" . -}} -{{- $ingressPath := .Values.ingress.path -}} -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: {{ include "calibre-web.labels" . | nindent 4 }} -{{- with .Values.ingress.annotations }} - annotations: -{{ toYaml . | indent 4 }} -{{- end }} -spec: -{{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ . | quote }} - http: - paths: - - path: {{ $ingressPath }} - backend: - serviceName: {{ $fullName }} - servicePort: http - {{- end }} -{{- end }} diff --git a/charts/calibre-web/templates/service.yaml b/charts/calibre-web/templates/service.yaml deleted file mode 100644 index 3b1adca3..00000000 --- a/charts/calibre-web/templates/service.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "calibre-web.fullname" . }} - labels: {{ include "calibre-web.labels" . | nindent 4 }} -{{- if .Values.service.labels }} -{{ toYaml .Values.service.labels | indent 4 }} -{{- end }} -{{- with .Values.service.annotations }} - annotations: -{{ toYaml . | indent 4 }} -{{- end }} -spec: -{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }} - type: ClusterIP - {{- if .Values.service.clusterIP }} - clusterIP: {{ .Values.service.clusterIP }} - {{end}} -{{- else if eq .Values.service.type "LoadBalancer" }} - type: {{ .Values.service.type }} - {{- if .Values.service.loadBalancerIP }} - loadBalancerIP: {{ .Values.service.loadBalancerIP }} - {{- end }} - {{- if .Values.service.loadBalancerSourceRanges }} - loadBalancerSourceRanges: -{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }} - {{- end -}} -{{- else }} - type: {{ .Values.service.type }} -{{- end }} -{{- if .Values.service.externalIPs }} - externalIPs: -{{ toYaml .Values.service.externalIPs | indent 4 }} -{{- end }} - {{- if .Values.service.externalTrafficPolicy }} - externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }} - {{- end }} - ports: - - name: http - port: {{ .Values.service.port }} - protocol: TCP - targetPort: http -{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }} - nodePort: {{.Values.service.nodePort}} -{{ end }} - selector: - app.kubernetes.io/name: {{ include "calibre-web.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} \ No newline at end of file diff --git a/charts/calibre-web/templates/tests/test-connection.yaml b/charts/calibre-web/templates/tests/test-connection.yaml deleted file mode 100644 index 210d248a..00000000 --- a/charts/calibre-web/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "calibre-web.fullname" . }}-test-connection" - labels: - {{- include "calibre-web.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test-success -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "calibre-web.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/charts/calibre-web/values.yaml b/charts/calibre-web/values.yaml index 3344ad28..f690faa5 100644 --- a/charts/calibre-web/values.yaml +++ b/charts/calibre-web/values.yaml @@ -1,136 +1,41 @@ -# Default values for calibre-web. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. +# Default values for Calibre-Web. image: repository: linuxserver/calibre-web - tag: 0.6.8-ls74 pullPolicy: IfNotPresent + tag: version-0.6.9 -# upgrade strategy type (e.g. Recreate or RollingUpdate) -strategyType: Recreate - -# Probes configuration -probes: - liveness: - initialDelaySeconds: 60 - failureThreshold: 5 - timeoutSeconds: 10 - readiness: - initialDelaySeconds: 60 - failureThreshold: 5 - timeoutSeconds: 10 - -nameOverride: "" -fullnameOverride: "" - -# Linuxserver.io additional layers. -# Enables additional features for the image, at the cost of increased size and -# possible incompatabilities with certain architectures. Disabled by default. -dockerMods: - # Enable ebook conversion. Compatible with x86_64 image only. - # To enable, set enabled to true, and follow the guide at: https://github.com/linuxserver/docker-calibre-web#application-setup - # to configure the application. - ebookConversion: - enabled: false - image: - repository: linuxserver/calibre-web - # To use a different tag for the DockerMod, specify the tag below - tag: calibre - -timezone: UTC -puid: 1001 -pgid: 1001 -umask: 22 +strategy: + type: Recreate service: - type: ClusterIP - port: 8083 - ## Specify the nodePort value for the LoadBalancer and NodePort service types. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport - ## - # nodePort: - ## Provide any additional annotations which may be required. This can be used to - ## set the LoadBalancer service type to internal only. - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer - ## - annotations: {} - labels: {} - ## Use loadBalancerIP to request a specific static IP, - ## otherwise leave blank - ## - loadBalancerIP: - # loadBalancerSourceRanges: [] - ## Set the externalTrafficPolicy in the Service to either Cluster or Local - # externalTrafficPolicy: Cluster + port: + port: 8083 -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - path: / - hosts: - - chart-example.local - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local +env: {} + # TZ: + # PUID: + # PGID: + # UMASK: + # DOCKER_MODS: persistence: config: - enabled: true - ## calibre-web configuration data Persistent Volume Storage Class + enabled: false + emptyDir: false + + books: + enabled: false + emptyDir: false + ## Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning ## If undefined (the default) or set to null, no storageClassName spec is ## set, choosing the default provisioner. (gp2 on AWS, standard on ## GKE, AWS & OpenStack) - ## # storageClass: "-" - ## - ## If you want to reuse an existing claim, you can pass the name of the PVC using - ## the existingClaim variable - # existingClaim: your-claim - accessMode: ReadWriteOnce - size: 1Gi - ## Do not delete the pvc upon helm uninstall - skipuninstall: false - books: - enabled: true - # storageClass: "-" - # existingClaim: your-claim - # subPath: some-subpath - accessMode: ReadWriteOnce - size: 10Gi - ## Do not delete the pvc upon helm uninstall - skipuninstall: false - extraExistingClaimMounts: [] - # - name: external-mount - # mountPath: /srv/external-mount - ## A manually managed Persistent Volume and Claim - ## If defined, PVC must be created manually before volume will be bound - # existingClaim: - # readOnly: true - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -podAnnotations: {} - -deploymentAnnotations: {} + # accessMode: ReadWriteOnce + # size: 1Gi + ## Set to true to retain the PVC upon helm uninstall + # skipuninstall: false + # existingClaim: ""