From b12203cc763543b6e00ac7f61132533784e1e469 Mon Sep 17 00:00:00 2001 From: "Timothy J. Miller" Date: Sat, 15 Oct 2022 09:43:57 -0500 Subject: [PATCH 1/3] upgrade ingress to networking/v1 --- charts/kube-plex/templates/ingress.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/kube-plex/templates/ingress.yaml b/charts/kube-plex/templates/ingress.yaml index 167f70b3..b000c8f4 100644 --- a/charts/kube-plex/templates/ingress.yaml +++ b/charts/kube-plex/templates/ingress.yaml @@ -1,6 +1,6 @@ {{- if .Values.ingress.enabled -}} {{- $serviceName := include "fullname" . -}} -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ template "fullname" . }} @@ -20,9 +20,12 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: {{ $serviceName }} - servicePort: pms + service: + name: {{ $serviceName }} + port: + name: pms {{- end -}} {{- if .Values.ingress.tls }} tls: From be650d3e06e5b86d3e09605cff0278c63b70521c Mon Sep 17 00:00:00 2001 From: "Timothy J. Miller" Date: Sat, 15 Oct 2022 12:12:31 -0500 Subject: [PATCH 2/3] add ingressClassName --- charts/kube-plex/templates/ingress.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/kube-plex/templates/ingress.yaml b/charts/kube-plex/templates/ingress.yaml index b000c8f4..e18e4c40 100644 --- a/charts/kube-plex/templates/ingress.yaml +++ b/charts/kube-plex/templates/ingress.yaml @@ -14,6 +14,9 @@ metadata: {{ $key }}: {{ $value | quote }} {{- end }} spec: + {{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className | quote }} + {{- end }} rules: {{- range $host := .Values.ingress.hosts }} - host: {{ $host }} From 13574d90753cabc1875cc6df7e9553af5f3c5a1c Mon Sep 17 00:00:00 2001 From: "Timothy J. Miller" Date: Fri, 11 Nov 2022 17:24:33 -0600 Subject: [PATCH 3/3] enable discovery with nodePort deployment --- charts/kube-plex/templates/deployment.yaml | 4 ++++ charts/kube-plex/templates/service.yaml | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/charts/kube-plex/templates/deployment.yaml b/charts/kube-plex/templates/deployment.yaml index eafe64b8..59f79206 100644 --- a/charts/kube-plex/templates/deployment.yaml +++ b/charts/kube-plex/templates/deployment.yaml @@ -88,6 +88,10 @@ spec: - name: https containerPort: 32443 env: +{{- if .Values.discovery.enabled }} + - name: ADVERTISE_IP + value: https://{{ .Values.discovery.ip }}:{{ .Values.service.nodePort }} +{{- end }} - name: TZ value: "{{ .Values.timezone }}" # TODO: move this to a secret? diff --git a/charts/kube-plex/templates/service.yaml b/charts/kube-plex/templates/service.yaml index f850d581..00de3e3d 100644 --- a/charts/kube-plex/templates/service.yaml +++ b/charts/kube-plex/templates/service.yaml @@ -53,6 +53,28 @@ spec: - name: https port: 443 targetPort: 32443 +{{- if .Values.discovery.enabled }} + - name: udp1 + nodePort: 32410 + port: 32410 + protocol: UDP + targetPort: 32410 + - name: udp2 + nodePort: 32412 + port: 32412 + protocol: UDP + targetPort: 32412 + - name: udp3 + nodePort: 32413 + port: 32413 + protocol: UDP + targetPort: 32413 + - name: udp4 + nodePort: 32414 + port: 32414 + protocol: UDP + targetPort: 32414 +{{- end }} selector: app: {{ template "name" . }} release: {{ .Release.Name }}