Updated ingress to released version

nicholaswilde · Nov 26, 2020 · 1ee8fa1 · 1ee8fa1
1 parent 46e85ba
commit 1ee8fa1
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 8 deletions.
diff --git a/charts/transmission/Chart.yaml b/charts/transmission/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 appVersion: 3.00
-version: 0.1.8
+version: 0.1.9
 name: transmission
 description: A Fast, Easy, and Free BitTorrent Client.
 type: application

diff --git a/charts/transmission/README.md b/charts/transmission/README.md
@@ -1,8 +1,8 @@
 # transmission
 
-A Fast, Easy, and Free BitTorrent Client.
+![Version: 0.1.9](https://img.shields.io/badge/Version-0.1.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.00](https://img.shields.io/badge/AppVersion-3.00-informational?style=flat-square)
 
-![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.00](https://img.shields.io/badge/AppVersion-3.00-informational?style=flat-square)
+A Fast, Easy, and Free BitTorrent Client.
 
 ## TL;DR
 ```console

diff --git a/charts/transmission/README.md.gotmpl b/charts/transmission/README.md.gotmpl
@@ -66,16 +66,22 @@ helm install {{ template "chart.name" . }} {{ template "helm.path" . }} -f value
 ```
 {{- end -}}
 
+{{- define "todo" -}}
+## Todo
+- [ ] Incorporate Docker secret.
+{{- end -}}
+
 {{- define "author" -}}
 ## Author
 This project was started in 2020 by Nicholas Wilde.
 {{- end -}}
 
 {{ template "chart.header" . }}
-{{ template "chart.description" . }}
 
 {{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
 
+{{ template "chart.description" . }}
+
 {{ template "chart.requirementsSection" . }}
 
 {{ template "chart.kubeVersionLine" . }}

diff --git a/charts/transmission/templates/NOTES.txt b/charts/transmission/templates/NOTES.txt
@@ -2,7 +2,7 @@
 {{- if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}

diff --git a/charts/transmission/templates/ingress.yaml → .../transmission/templates/ingress-beta.yaml b/charts/transmission/templates/ingress.yaml → .../transmission/templates/ingress-beta.yaml
@@ -1,7 +1,8 @@
 {{- if .Values.ingress.enabled -}}
+{{- if not (.Capabilities.APIVersions.Has "networking.k8s.io/v1") }}
 {{- $fullName := include "transmission.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -32,10 +33,11 @@ spec:
       http:
         paths:
           {{- range .paths }}
-          - path: {{ . }}
+          - path: {{ .path }}
             backend:
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
           {{- end }}
     {{- end }}
   {{- end }}
+{{- end }}
diff --git a/charts/transmission/templates/ingress-released.yaml b/charts/transmission/templates/ingress-released.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.ingress.enabled -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
+{{- $fullName := include "transmission.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "transmission.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+          {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end }}
diff --git a/charts/transmission/values.yaml b/charts/transmission/values.yaml
@@ -81,12 +81,31 @@ ingress:
     nginx.ingress.kubernetes.io/whitelist-source-range: 192.168.1.0/24
   hosts:
     - host: "transmission.192.168.1.193.nip.io"
-      paths: [/]
+      paths:
+        - path: "/"
+          pathType: Prefix
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
 
+podAnnotations:
+  # https://crazymax.dev/diun/providers/kubernetes/#kubernetes-annotations
+  # Set to true to enable image analysis of this pod
+  diun.enable: "false"
+  # Watch all tags of this pod image
+  diun.watch_repo: "false"
+  ## Registry options name to use
+  # regopt: ""
+  ## Maximum number of tags to watch if diun.watch_repo enabled. 0 means all of them
+  # max_tags: 0
+  ## Semi-colon separated list of regular expressions to include tags. Can be
+  ## useful if you enable diun.watch_repo
+  # include_tags: ""
+  ## Semi-colon separated list of regular expressions to exclude tags. Can be
+  ## useful if you enable diun.watch_repo
+  # exclude_tags: ""
+
 persistence:
   downloads:
     enabled: true