From 823e436d87a8e341476b9001eb03ddf84a4a0a42 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Mon, 5 Nov 2018 08:16:07 -0500 Subject: [PATCH 1/5] enriching service options Signed-off-by: Jeff Billimek --- charts/kube-plex/templates/ingress.yaml | 2 +- charts/kube-plex/templates/service.yaml | 47 +++++++++++++++++++++++++ charts/kube-plex/values.yaml | 18 ++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/charts/kube-plex/templates/ingress.yaml b/charts/kube-plex/templates/ingress.yaml index 388ce37..588ceac 100644 --- a/charts/kube-plex/templates/ingress.yaml +++ b/charts/kube-plex/templates/ingress.yaml @@ -22,7 +22,7 @@ spec: - path: / backend: serviceName: {{ $serviceName }} - servicePort: 32400 + servicePort: {{ .Values.service.port }} {{- end -}} {{- if .Values.ingress.tls }} tls: diff --git a/charts/kube-plex/templates/service.yaml b/charts/kube-plex/templates/service.yaml index 8e09eea..cde4898 100644 --- a/charts/kube-plex/templates/service.yaml +++ b/charts/kube-plex/templates/service.yaml @@ -7,6 +7,52 @@ metadata: chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} +{{- 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: pms + port: {{ .Values.service.port }} + protocol: TCP + targetPort: pms +{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }} + nodePort: {{.Values.service.nodePort}} +{{ end }} + - name: http + port: 80 + targetPort: pms + - name: https + port: 443 + targetPort: 32443 spec: type: {{ .Values.service.type }} ports: @@ -26,3 +72,4 @@ spec: selector: app: {{ template "name" . }} release: {{ .Release.Name }} + diff --git a/charts/kube-plex/values.yaml b/charts/kube-plex/values.yaml index eb44b62..71bbf63 100644 --- a/charts/kube-plex/values.yaml +++ b/charts/kube-plex/values.yaml @@ -21,6 +21,24 @@ timezone: Europe/London service: type: ClusterIP + port: 32400 + ## 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 ingress: enabled: false From 943a4c934b76d890e7d79b0b3ff1361c02b67179 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Mon, 5 Nov 2018 08:34:06 -0500 Subject: [PATCH 2/5] cleaning-up claimName settings Signed-off-by: Jeff Billimek --- charts/kube-plex/templates/deployment.yaml | 18 +++--------------- charts/kube-plex/templates/ingress.yaml | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/charts/kube-plex/templates/deployment.yaml b/charts/kube-plex/templates/deployment.yaml index b2a897c..22856f2 100644 --- a/charts/kube-plex/templates/deployment.yaml +++ b/charts/kube-plex/templates/deployment.yaml @@ -75,23 +75,11 @@ spec: fieldRef: fieldPath: metadata.namespace - name: TRANSCODE_PVC -{{- if .Values.persistence.transcode.claimName }} - value: "{{ .Values.persistence.transcode.claimName }}" -{{- else }} - value: "{{ template "fullname" . }}-transcode" -{{- end }} + value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-transcode{{- end }} - name: DATA_PVC -{{- if .Values.persistence.data.claimName }} - value: "{{ .Values.persistence.data.claimName }}" -{{- else }} - value: "{{ template "fullname" . }}-data" -{{- end }} + value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-data{{- end }} - name: CONFIG_PVC -{{- if .Values.persistence.config.claimName }} - value: "{{ .Values.persistence.config.claimName }}" -{{- else }} - value: "{{ template "fullname" . }}-config" -{{- end }} + value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-config{{- end }} volumeMounts: - name: data mountPath: /data diff --git a/charts/kube-plex/templates/ingress.yaml b/charts/kube-plex/templates/ingress.yaml index 588ceac..167f70b 100644 --- a/charts/kube-plex/templates/ingress.yaml +++ b/charts/kube-plex/templates/ingress.yaml @@ -22,7 +22,7 @@ spec: - path: / backend: serviceName: {{ $serviceName }} - servicePort: {{ .Values.service.port }} + servicePort: pms {{- end -}} {{- if .Values.ingress.tls }} tls: From 6dc2ac41e01455cebbf8fdd94c91ee43459900e3 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Mon, 5 Nov 2018 08:40:42 -0500 Subject: [PATCH 3/5] reverting claimName changes Signed-off-by: Jeff Billimek --- charts/kube-plex/templates/deployment.yaml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/charts/kube-plex/templates/deployment.yaml b/charts/kube-plex/templates/deployment.yaml index 22856f2..b2a897c 100644 --- a/charts/kube-plex/templates/deployment.yaml +++ b/charts/kube-plex/templates/deployment.yaml @@ -75,11 +75,23 @@ spec: fieldRef: fieldPath: metadata.namespace - name: TRANSCODE_PVC - value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-transcode{{- end }} +{{- if .Values.persistence.transcode.claimName }} + value: "{{ .Values.persistence.transcode.claimName }}" +{{- else }} + value: "{{ template "fullname" . }}-transcode" +{{- end }} - name: DATA_PVC - value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-data{{- end }} +{{- if .Values.persistence.data.claimName }} + value: "{{ .Values.persistence.data.claimName }}" +{{- else }} + value: "{{ template "fullname" . }}-data" +{{- end }} - name: CONFIG_PVC - value: {{ if .Values.persistence.config.claimName }}{{ .Values.persistence.config.claimName }}{{- else }}{{ template "fullname" . }}-config{{- end }} +{{- if .Values.persistence.config.claimName }} + value: "{{ .Values.persistence.config.claimName }}" +{{- else }} + value: "{{ template "fullname" . }}-config" +{{- end }} volumeMounts: - name: data mountPath: /data From 0c5036d33b1e05c3f650bde725ab25b5992ec357 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Mon, 5 Nov 2018 11:34:08 -0500 Subject: [PATCH 4/5] removing cruft Signed-off-by: Jeff Billimek --- charts/kube-plex/Chart.yaml | 2 +- charts/kube-plex/templates/service.yaml | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/charts/kube-plex/Chart.yaml b/charts/kube-plex/Chart.yaml index 90f79ac..37d34de 100644 --- a/charts/kube-plex/Chart.yaml +++ b/charts/kube-plex/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.10.1.4602-f54242b6b description: Plex Media Server name: kube-plex -version: 0.2.0 +version: 0.2.1 keywords: - plex home: https://plex.tv/ diff --git a/charts/kube-plex/templates/service.yaml b/charts/kube-plex/templates/service.yaml index cde4898..f850d58 100644 --- a/charts/kube-plex/templates/service.yaml +++ b/charts/kube-plex/templates/service.yaml @@ -53,22 +53,6 @@ spec: - name: https port: 443 targetPort: 32443 -spec: - type: {{ .Values.service.type }} - ports: - - name: http - port: 80 - targetPort: 32400 - - name: https - port: 443 - targetPort: 32443 - - name: pms - port: 32400 - targetPort: 32400 -{{- if .Values.service.externalIPs }} - externalIPs: -{{ toYaml .Values.service.externalIPs | indent 4 }} -{{- end }} selector: app: {{ template "name" . }} release: {{ .Release.Name }} From 09bd92346580a983f955188950f2a11979477ef0 Mon Sep 17 00:00:00 2001 From: Jeff Billimek Date: Mon, 5 Nov 2018 13:15:10 -0500 Subject: [PATCH 5/5] including needed ports in deployment spec Signed-off-by: Jeff Billimek --- charts/kube-plex/templates/deployment.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/charts/kube-plex/templates/deployment.yaml b/charts/kube-plex/templates/deployment.yaml index b2a897c..e30d048 100644 --- a/charts/kube-plex/templates/deployment.yaml +++ b/charts/kube-plex/templates/deployment.yaml @@ -59,6 +59,13 @@ spec: # httpGet: # path: / # port: 32400 + ports: + - name: pms + containerPort: 32400 + - name: http + containerPort: 32400 + - name: https + containerPort: 32443 env: - name: TZ value: "{{ .Values.timezone }}"