diff --git a/README.md b/README.md index e84a0af6..061102ba 100644 --- a/README.md +++ b/README.md @@ -104,9 +104,8 @@ The cluster-deployment tools here include helm charts and ansible playbooks to s | Service | Version | Notes | | --- | --- | --- | | davite | [![](https://img.shields.io/docker/v/instantlinux/davite?sort=date)](https://hub.docker.com/r/instantlinux/davite "Version badge") | party-invites manager like eVite | -| mt-daapd | [![](https://img.shields.io/docker/v/instantlinux/mt-daapd?sort=date)](https://hub.docker.com/r/instantlinux/mt-daapd "Version badge") | iTunes server | | mythtv-backend | [![](https://img.shields.io/docker/v/instantlinux/mythtv-backend?sort=date)](https://hub.docker.com/r/instantlinux/mythtv-backend "Version badge") | MythTV backend | -| owntone | ** | iTunes server (formerly forked-daapd) | +| OwnTone | ** | iTunes server (formerly forked-daapd) | | weewx | [![](https://img.shields.io/docker/v/instantlinux/weewx?sort=date)](https://hub.docker.com/r/instantlinux/weewx "Version badge") | Weather station software (Davis VantagePro2 etc.) | ### Credits diff --git a/images/mariadb-galera/helm/Chart.yaml b/images/mariadb-galera/helm/Chart.yaml index ef8df6f6..65c9de6e 100644 --- a/images/mariadb-galera/helm/Chart.yaml +++ b/images/mariadb-galera/helm/Chart.yaml @@ -7,8 +7,8 @@ sources: - https://github.com/MariaDB/server - https://github.com/MariaDB/galera type: application -version: 0.1.1 -appVersion: "12.0.2" +version: 0.1.2 +appVersion: "12.1.2" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/mt-daapd/README.md b/images/mt-daapd/README.md index bbd1a2e9..7df88fe3 100644 --- a/images/mt-daapd/README.md +++ b/images/mt-daapd/README.md @@ -1,6 +1,10 @@ ## mt-daapd [![](https://img.shields.io/docker/v/instantlinux/mt-daapd?sort=date)](https://hub.docker.com/r/instantlinux/mt-daapd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/mt-daapd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/mt-daapd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/mt-daapd/Dockerfile "dockerfile") +### Status +This is a legacy image, discontinued after 0.26.4+dfsg1 in 2020. A compatible replacement is at [owntone/owntone](https://hub.docker.com/r/owntone/owntone). You can launch that image using the helm chart provided [here](https://github.com/instantlinux/docker-tools/tree/main/k8s/helm/owntone). + +### Introduction This is Ron Pedde's [Firefly Media server](https://en.wikipedia.org/wiki/Firefly_Media_Server) which implements the Digital Audio Access Protocol for serving MP3 and other audio media formats from a directory mounted to this container onto a LAN. Devices such as Roku, Sonos and other brands of audio players or applications such as the Amarok music play for Linux will be able to connect to this service using mDNS/DNS-SD (Avahi). diff --git a/k8s/Makefile.versions b/k8s/Makefile.versions index 488026bd..d92adbd6 100644 --- a/k8s/Makefile.versions +++ b/k8s/Makefile.versions @@ -10,7 +10,7 @@ export VERSION_DEFAULTBACKEND ?= 1.5 export VERSION_FLANNEL ?= 0.28.0 export VERSION_HELM ?= 3.19.2 export VERSION_INGRESS_NGINX ?= 1.14.1 -export VERSION_METRICS ?= 2.17.0 +export VERSION_METRICS ?= 2.18.0 export VERSION_NODE_LOCAL_DNS ?= 1.34.3 # Held back versions - more effort to upgrade diff --git a/k8s/helm/mt-daapd b/k8s/helm/mt-daapd deleted file mode 120000 index db5293ea..00000000 --- a/k8s/helm/mt-daapd +++ /dev/null @@ -1 +0,0 @@ -../../images/mt-daapd/helm \ No newline at end of file diff --git a/k8s/helm/owntone/Chart.yaml b/k8s/helm/owntone/Chart.yaml new file mode 100644 index 00000000..ef0f515b --- /dev/null +++ b/k8s/helm/owntone/Chart.yaml @@ -0,0 +1,14 @@ +apiVersion: v2 +name: owntone +description: iTunes / Roku-compatible media server +home: https://github.com/instantlinux/docker-tools +sources: +- https://github.com/instantlinux/docker-tools +- https://github.com/owntone/owntone-server +type: application +version: 0.1.0 +appVersion: "29.0" +dependencies: +- name: chartlib + version: 0.1.8 + repository: https://instantlinux.github.io/docker-tools diff --git a/k8s/helm/owntone/templates/NOTES.txt b/k8s/helm/owntone/templates/NOTES.txt new file mode 100644 index 00000000..62ea3f4b --- /dev/null +++ b/k8s/helm/owntone/templates/NOTES.txt @@ -0,0 +1,28 @@ +{{- if hasKey .Values "service" }} +{{- if or .Values.service.enabled (not (hasKey .Values.service "enabled")) }} +1. Get the application URL by running these commands: +{{- if hasKey .Values "ingress" }} +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "local.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 "local.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "local.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 "local.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} +{{- end }} +{{- end }} +{{- end }} diff --git a/k8s/helm/owntone/templates/app.yaml b/k8s/helm/owntone/templates/app.yaml new file mode 100644 index 00000000..5b83e9c4 --- /dev/null +++ b/k8s/helm/owntone/templates/app.yaml @@ -0,0 +1,11 @@ +{{- include "chartlib.deployment" . }} +--- +{{- include "chartlib.hpa" . }} +--- +{{- include "chartlib.ingress" . }} +--- +{{- include "chartlib.ingresstotp" . }} +--- +{{- include "chartlib.service" . }} +--- +{{- include "chartlib.serviceaccount" . }} diff --git a/k8s/helm/owntone/templates/tests/test-connection.yaml b/k8s/helm/owntone/templates/tests/test-connection.yaml new file mode 100644 index 00000000..ae159a4f --- /dev/null +++ b/k8s/helm/owntone/templates/tests/test-connection.yaml @@ -0,0 +1,17 @@ +{{- if hasKey .Values "service" }} +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "local.fullname" . }}-test-connection" + labels: + {{- include "local.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "local.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never +{{- end }} diff --git a/k8s/helm/owntone/values.yaml b/k8s/helm/owntone/values.yaml new file mode 100644 index 00000000..fe8bcda3 --- /dev/null +++ b/k8s/helm/owntone/values.yaml @@ -0,0 +1,57 @@ +# Default values for owntone. +deployment: + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app.kubernetes.io/name + operator: In + values: + - owntone + topologyKey: "kubernetes.io/hostname" + env: + gid: 1000 + uid: 1000 + # The (unprotected) UI lives at :3689. Add a password and set + # trusted_network=none in /etc/owntone/owntone.conf after first launch + hostNetwork: true + nodeSelector: + service.owntone: allow + replicas: 2 + securityContext: + fsGroup: 1000 +volumeMounts: +- name: cache + mountPath: /var/cache/owntone +- name: share + mountPath: /etc/owntone + subPath: owntone/etc +- name: music + mountPath: /srv/media + readOnly: true +- name: run + mountPath: /run +volumes: +- name: cache + emptyDir: {} +- name: music + persistentVolumeClaim: + claimName: mp3 +- name: run + emptyDir: + medium: Memory +- name: share + hostPath: { path: /var/lib/docker/k8s-volumes/share } + +image: + repository: owntone/owntone + pullPolicy: IfNotPresent + # tag: default + +nameOverride: "" +fullnameOverride: "" + +serviceAccount: {} +autoscaling: + enabled: false