From 4b348234c9b2dc2a0d2f9dbca12d8fc61f08544a Mon Sep 17 00:00:00 2001 From: nold Date: Sat, 17 Apr 2021 08:58:03 +0200 Subject: [PATCH 1/2] Feature: Ingress & Service --- fahclient/Chart.yaml | 2 +- fahclient/README.md | 8 ++++---- fahclient/templates/ingress.yaml | 31 +++++++++++++++++++++++++++++++ fahclient/templates/service.yaml | 15 +++++++++++++++ fahclient/values.yaml | 21 +++++++++++++++++++++ 5 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 fahclient/templates/ingress.yaml create mode 100644 fahclient/templates/service.yaml diff --git a/fahclient/Chart.yaml b/fahclient/Chart.yaml index 1ad6e67..c4921b4 100644 --- a/fahclient/Chart.yaml +++ b/fahclient/Chart.yaml @@ -14,4 +14,4 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 2.5.5 +version: 2.6.5 diff --git a/fahclient/README.md b/fahclient/README.md index e4fe576..82185b8 100644 --- a/fahclient/README.md +++ b/fahclient/README.md @@ -50,11 +50,11 @@ drop me an e-mail at . | image.repository | string | `"foldingathome/fah-gpu"` | | | image.tag | string | `"latest"` | | | imagePullSecrets | list | `[]` | | +| ingress.enabled | bool | `false` | Enable Ingress for WebUI | | ingress.annotations | object | `{}` | | -| ingress.enabled | bool | `false` | | -| ingress.hosts[0].host | string | `"chart-example.local"` | | -| ingress.hosts[0].paths | list | `[]` | | -| ingress.tls | list | `[]` | | +| ingress.host | string | `"chart-example.local"` | | +| ingress.path | string | `/` | | +| ingress.tls | bool | `false` | Enable TLS for Ingress | | nameOverride | string | `""` | | | podSecurityContext.fsGroup | int | `9999` | | | priorityClassName | string | `nil` | When not specified, take the default priority class | diff --git a/fahclient/templates/ingress.yaml b/fahclient/templates/ingress.yaml new file mode 100644 index 0000000..b793737 --- /dev/null +++ b/fahclient/templates/ingress.yaml @@ -0,0 +1,31 @@ +{{- if .Values.ingress.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "fahclient.fullname" . }}-ingress + namespace: {{ .Release.Namespace }} + labels: + app: {{ include "fahclient.fullname" . }} + {{- if .Values.ingress.annotations }} + annotations: + {{- .Values.ingress.annotations | toYaml | nindent 4 }} + {{- end }} +spec: + rules: + - host: {{ .Values.ingress.hostname }} + http: + paths: + - backend: + service: + name: {{ include "fahclient.fullname" . }}-service + port: + number: {{ .Values.service.port }} + pathType: ImplementationSpecific + path: {{ .Values.ingress.path | default "/" }} + {{- if .Values.ingress.tls }} + tls: + - hosts: + - {{ .Values.ingress.hostname }} + secretName: {{ printf "%s-tls" .Values.ingress.hostname }} + {{- end }} +{{- end }} diff --git a/fahclient/templates/service.yaml b/fahclient/templates/service.yaml new file mode 100644 index 0000000..eb4b8af --- /dev/null +++ b/fahclient/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "fahclient.fullname" . }}-service + labels: + app: {{ include "fahclient.fullname" . }} +spec: + type: {{ .Values.service.type | default "ClusterIP" }} + selector: + app: {{ include "fahclient.fullname" . }} + ports: + - name: "http" + protocol: TCP + targetPort: 7396 + port: {{ .Values.service.port | default "80" }} diff --git a/fahclient/values.yaml b/fahclient/values.yaml index 0254a93..35ad219 100644 --- a/fahclient/values.yaml +++ b/fahclient/values.yaml @@ -37,6 +37,10 @@ fahClient: + + + @@ -70,10 +74,27 @@ securityContext: - ALL readOnlyRootFilesystem: false +# Don't forget to enable external access in configmap, to access service service: type: ClusterIP port: 80 +# Ingress for WebUI +# Don't forget to enable external access in configmap, too +ingress: + enabled: false + hostname: chart-example.local + path: / + + # Enable TLS for Ingress e.g. letsencrypt using cert-manager + tls: false + + # Ingress Annotations + annotations: + #cert-manager.io/cluster-issuer: cluster-issuer + #kubernetes.io/ingress.class: nginx + #ingress.kubernetes.io/ssl-redirect: 'true' + storageClassName: "" # set to some sane defaults to prevent interference From 37776a848ad8b6ce99acd8863de54186ff861a9a Mon Sep 17 00:00:00 2001 From: nold Date: Sat, 15 May 2021 18:10:23 +0200 Subject: [PATCH 2/2] Add: fahclient-2.6.5.tgz & updated helm repo index --- docs/fahclient-2.6.5.tgz | Bin 0 -> 6588 bytes docs/index.yaml | 45 +++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 docs/fahclient-2.6.5.tgz diff --git a/docs/fahclient-2.6.5.tgz b/docs/fahclient-2.6.5.tgz new file mode 100644 index 0000000000000000000000000000000000000000..44dced79c03097b9cdb8aeb79be0adc4ef9add3b GIT binary patch literal 6588 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