diff --git a/ansible-5/roles/prod.k3s/defaults/main.yml b/ansible-5/roles/prod.k3s/defaults/main.yml index 835ed61..a0a34e7 100644 --- a/ansible-5/roles/prod.k3s/defaults/main.yml +++ b/ansible-5/roles/prod.k3s/defaults/main.yml @@ -89,9 +89,9 @@ apps: funkwhale: enabled: true namespace: funkwhale - state: absent + state: present redis: - enabled: false + enabled: true namespace: redis state: present diff --git a/ansible-5/roles/prod.k3s/files/funkwhale/values.yaml b/ansible-5/roles/prod.k3s/files/funkwhale/values.yaml index 53ef692..9636420 100644 --- a/ansible-5/roles/prod.k3s/files/funkwhale/values.yaml +++ b/ansible-5/roles/prod.k3s/files/funkwhale/values.yaml @@ -15,10 +15,10 @@ replicaCount: 1 postgresql: ## If you already have a Postgresql service you'd like to use, set ## this to false and adjust the host to use your existing service. - enabled: true + enabled: false ## External Postgresql hostname or IP -# host: postgresql.postgres + host: postgresql.postgres auth: ## Database user @@ -43,8 +43,8 @@ redis: # host: redis-master.redis persistence: - enabled: false -# existingClaim: data-funkwhale-0 + enabled: true + existingClaim: data-funkwhale-0 # storageClass: "-" ## Note; Using ReadWriteOnce for persistence will require the addition of @@ -54,3 +54,32 @@ persistence: ## An example is provided for the worker affinity accessMode: ReadWriteMany size: 1Gi + + +api: + livenessProbe: + httpGet: + path: / + port: api + scheme: HTTP + timeoutSeconds: 1 + periodSeconds: 10 + successThreshold: 1 + failureThreshold: 10 + readinessProbe: + httpGet: + path: / + port: api + scheme: HTTP + timeoutSeconds: 1 + periodSeconds: 10 + successThreshold: 1 + failureThreshold: 10 + startupProbe: + tcpSocket: + port: api + timeoutSeconds: 1 + periodSeconds: 10 + successThreshold: 1 + failureThreshold: 10 + initialDelaySeconds: 60 diff --git a/ansible-5/roles/prod.k3s/tasks/deployments/funkwhale.yaml b/ansible-5/roles/prod.k3s/tasks/deployments/funkwhale.yaml index 43831d8..fab7f3b 100644 --- a/ansible-5/roles/prod.k3s/tasks/deployments/funkwhale.yaml +++ b/ansible-5/roles/prod.k3s/tasks/deployments/funkwhale.yaml @@ -10,15 +10,15 @@ state: "{{apps.funkwhale.state}}" become: true -#- name: create persistent volume resources -# kubernetes.core.k8s: -# kubeconfig: "/etc/rancher/k3s/k3s.yaml" -# state: "{{apps.funkwhale.state}}" -# definition: "{{ lookup('template', item) | from_yaml }}" -# loop: -# - funkwhale/pv.yaml -# - funkwhale/pv-claim.yaml -# become: true +- name: create persistent volume resources + kubernetes.core.k8s: + kubeconfig: "/etc/rancher/k3s/k3s.yaml" + state: "{{apps.funkwhale.state}}" + definition: "{{ lookup('template', item) | from_yaml }}" + loop: + - funkwhale/pv.yaml + - funkwhale/pv-claim.yaml + become: true - name: Install funkwhale globally available