diff --git a/apps/arr/cm-common-env.yaml b/apps/arr/cm-common-env.yaml index bb365a2..8657fde 100644 --- a/apps/arr/cm-common-env.yaml +++ b/apps/arr/cm-common-env.yaml @@ -6,4 +6,5 @@ metadata: data: PUID: "1000" PGID: "1000" + UMASK: "002" TZ: "Europe/Oslo" diff --git a/apps/arr/common-values.yaml b/apps/arr/common-values.yaml index 593fdbb..5614708 100644 --- a/apps/arr/common-values.yaml +++ b/apps/arr/common-values.yaml @@ -10,6 +10,11 @@ env: configMapKeyRef: name: common-env key: PGID + - name: UMASK + valueFrom: + configMapKeyRef: + name: common-env + key: UMASK - name: TZ valueFrom: configMapKeyRef: diff --git a/apps/arr/kustomization.yaml b/apps/arr/kustomization.yaml index 13be035..32fa228 100644 --- a/apps/arr/kustomization.yaml +++ b/apps/arr/kustomization.yaml @@ -8,7 +8,7 @@ resources: - cm-common-env.yaml - ingress.yaml - auth.yaml - - torrent + - torrent.yaml - prowlarr.yaml - sonarr.yaml - radarr.yaml diff --git a/apps/arr/torrent.yaml b/apps/arr/torrent.yaml new file mode 100644 index 0000000..d6d0302 --- /dev/null +++ b/apps/arr/torrent.yaml @@ -0,0 +1,44 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: torrent + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: applications + source: + repoURL: https://github.com/vehagn/homelab + path: charts/application + targetRevision: HEAD + helm: + values: |- + name: torrent + image: + name: cr.hotio.dev/hotio/qbittorrent + tag: legacy + hostVolumes: + - name: torrent-config + hostPath: /disk/etc/qbittorrent + mountPath: /config + service: + type: LoadBalancer + containerPort: 8080 + additionalPorts: + - name: tcp + protocol: TCP + containerPort: 11011 + - name: udp + protocol: UDP + containerPort: 11011 + valueFiles: + - ../../apps/arr/common-values.yaml + destination: + namespace: arr + name: in-cluster + syncPolicy: + automated: + selfHeal: true + prune: true + syncOptions: + - CreateNamespace=true diff --git a/charts/application/templates/application/deployment.yaml b/charts/application/templates/application/deployment.yaml index 5f3f915..5c274a9 100644 --- a/charts/application/templates/application/deployment.yaml +++ b/charts/application/templates/application/deployment.yaml @@ -43,10 +43,18 @@ spec: {{- end }} env: {{- toYaml .Values.env | nindent 12 }} + {{- with .Values.additionalEnv }} + {{ . | nindent 12 }} + {{- end }} ports: - name: http containerPort: {{ .Values.service.containerPort }} protocol: TCP + {{- range .Values.service.additionalPorts }} + - name: {{ .name }} + containerPort: {{ .containerPort }} + protocol: {{ .protocol | default "TCP" }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- end }} \ No newline at end of file diff --git a/charts/application/templates/application/service.yaml b/charts/application/templates/application/service.yaml index 4b94e53..ef57e34 100644 --- a/charts/application/templates/application/service.yaml +++ b/charts/application/templates/application/service.yaml @@ -15,6 +15,12 @@ spec: port: {{ .Values.service.port }} targetPort: http protocol: TCP + {{- range .Values.service.additionalPorts }} + - name: {{ .name }} + port: {{ .port | default .containerPort }} + targetPort: {{ .name }} + protocol: {{ .protocol | default "TCP" }} + {{- end }} selector: app: {{ .Values.name }} {{- end }} \ No newline at end of file diff --git a/charts/application/values.yaml b/charts/application/values.yaml index 7c9d647..3cad4bf 100644 --- a/charts/application/values.yaml +++ b/charts/application/values.yaml @@ -16,11 +16,17 @@ service: type: ClusterIP port: 80 containerPort: 8080 + additionalPorts: [] +# - name: "" +# protocol: TCP +# containerPort: "" +# port: "" ingressRoute: create: true env: [] +additionalEnv: [] hostVolumes: [] #- name: volume-name