Skip to content

Commit c4591ee

Browse files
utkuozdemirutkuozdemir
committed
Update charts
1 parent 8339261 commit c4591ee

17 files changed

+210
-68
lines changed

‎docs/index.yaml

+52-1
Original file line numberDiff line numberDiff line change
@@ -1502,6 +1502,16 @@ entries:
15021502
- https://utkuozdemir.org/helm-charts/prerender-1.0.0.tgz
15031503
version: 1.0.0
15041504
restreamer:
1505+
- apiVersion: v2
1506+
appVersion: 0.6.4
1507+
created: "2021-11-05T23:39:08.970974Z"
1508+
description: Restreamer helm chart
1509+
digest: ef5874eee97988843264317abf73a06067a8e34c30ecaee1bc1fc8388eb46acb
1510+
name: restreamer
1511+
type: application
1512+
urls:
1513+
- https://utkuozdemir.org/helm-charts/restreamer-1.1.0.tgz
1514+
version: 1.1.0
15051515
- apiVersion: v2
15061516
appVersion: 0.6.4
15071517
created: "2020-11-15T22:07:04.951657+01:00"
@@ -1513,6 +1523,15 @@ entries:
15131523
- https://utkuozdemir.org/helm-charts/restreamer-1.0.0.tgz
15141524
version: 1.0.0
15151525
transmission-exporter:
1526+
- apiVersion: v1
1527+
appVersion: 0.3.0
1528+
created: "2021-11-05T23:40:48.150292Z"
1529+
description: Transmission Exporter
1530+
digest: cef0d54ad327eb63b88c88d84ae653b0d77e6b21cca267ee9593a22e07a800e4
1531+
name: transmission-exporter
1532+
urls:
1533+
- https://utkuozdemir.org/helm-charts/transmission-exporter-1.1.0.tgz
1534+
version: 1.1.0
15161535
- apiVersion: v1
15171536
appVersion: 0.3.0
15181537
created: "2020-11-15T22:07:04.954106+01:00"
@@ -1532,6 +1551,38 @@ entries:
15321551
- https://utkuozdemir.org/helm-charts/transmission-exporter-0.1.0.tgz
15331552
version: 0.1.0
15341553
transmission-openvpn:
1554+
- annotations:
1555+
artifacthub.io/changes: |
1556+
- Update ingress to support newer Kubernetes APIs
1557+
artifacthub.io/images: |
1558+
- name: haugene/transmission-openvpn
1559+
image: docker.io/haugene/transmission-openvpn:3.7.1
1560+
artifacthub.io/license: MIT
1561+
apiVersion: v2
1562+
appVersion: 3.7.1
1563+
created: "2021-11-05T23:42:39.401771Z"
1564+
description: Transmission + OpenVPN chart based on haugene/transmission-openvpn
1565+
image
1566+
digest: 86ccc7ae7f289de6c81fbcbe4a3069b9ecea78da6d1539cedc7eb122091def48
1567+
home: https://haugene.github.io/docker-transmission-openvpn
1568+
icon: https://utkuozdemir.org/helm-charts/transmission.png
1569+
keywords:
1570+
- transmission
1571+
- openvpn
1572+
- transmission-openvpn
1573+
- torrent
1574+
maintainers:
1575+
- email: [email protected]
1576+
name: Utku Özdemir
1577+
url: https://utkuozdemir.org
1578+
name: transmission-openvpn
1579+
sources:
1580+
- https://github.com/haugene/docker-transmission-openvpn
1581+
- https://github.com/utkuozdemir/helm-charts
1582+
type: application
1583+
urls:
1584+
- https://utkuozdemir.org/helm-charts/transmission-openvpn-1.1.11.tgz
1585+
version: 1.1.11
15351586
- annotations:
15361587
artifacthub.io/changes: |
15371588
- Bump appVersion to 3.7.1
@@ -1820,4 +1871,4 @@ entries:
18201871
urls:
18211872
- https://utkuozdemir.org/helm-charts/transmission-openvpn-0.1.0.tgz
18221873
version: 0.1.0
1823-
generated: "2021-11-05T23:36:39.786052Z"
1874+
generated: "2021-11-05T23:42:39.400849Z"

‎docs/restreamer-1.1.0.tgz

5.95 KB
Binary file not shown.

‎docs/transmission-exporter-1.1.0.tgz

4.38 KB
Binary file not shown.

‎docs/transmission-openvpn-1.1.11.tgz

7.01 KB
Binary file not shown.

‎prerender/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ The command removes all the Kubernetes components associated with the chart and
6161
| `service.type` | Type of the service | `"ClusterIP"` |
6262
| `service.annotations` | Annotations for the service | `{}` |
6363
| `ingress.enabled` | Enable the use of the ingress controller | `false` |
64-
| `ingress.className` | Class name for the Ingress | `{}` |
65-
| `ingress.annotations` | Annotations for the Ingress | `{}` |
64+
| `ingress.className` | Class name for the ingress | `{}` |
65+
| `ingress.annotations` | Annotations for the ingress | `{}` |
6666
| `ingress.hosts` | Hosts configuration of the ingress | see [values.yaml](values.yaml) |
6767
| `ingress.tls` | The TLS configuration for the ingress | `[]` |
6868
| `replicaCount` | Pod replica count (if autoscaling is not enabled) | `1` |

‎restreamer/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: restreamer
33
description: Restreamer helm chart
44
type: application
5-
version: 1.0.0
5+
version: 1.1.0
66
appVersion: 0.6.4

‎restreamer/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ The following tables lists the configurable parameters of the chart and their de
5959
| `service.type` | Kubernetes Service type | `ClusterIP` |
6060
| `service.port` | Kubernetes Service port | `80` |
6161
| `service.annotations` | Annotations for the Service | `{}` |
62-
| `ingress.enabled` | Enable the use of the ingress controller to access the web UI | `false` |
63-
| `ingress.annotations` | Annotations for the Ingress | `{}` |
64-
| `ingress.hosts[0].host` | Hostname to your installation | `chart-example.local` |
65-
| `ingress.hosts[0].paths` | Path within the url structure | `[]` |
62+
| `ingress.enabled` | Enable the use of the ingress controller | `false` |
63+
| `ingress.className` | Class name for the ingress | `{}` |
64+
| `ingress.annotations` | Annotations for the ingress | `{}` |
65+
| `ingress.hosts` | Hosts configuration of the ingress | see [values.yaml](values.yaml) |
6666
| `ingress.tls` | The TLS configuration for the ingress | `[]` |
6767
| `resources` | The resources to allocate for the container | `{}` |
6868
| `affinity` | Map of node/pod affinities | `{}` |

‎restreamer/templates/ingress.yaml

+31-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
{{- if .Values.ingress.enabled -}}
22
{{- $fullName := include "restreamer.fullname" . -}}
33
{{- $svcPort := .Values.service.port -}}
4-
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
4+
{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
5+
{{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
6+
{{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
7+
{{- end }}
8+
{{- end }}
9+
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
10+
apiVersion: networking.k8s.io/v1
11+
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
512
apiVersion: networking.k8s.io/v1beta1
613
{{- else -}}
714
apiVersion: extensions/v1beta1
@@ -16,26 +23,39 @@ metadata:
1623
{{- toYaml . | nindent 4 }}
1724
{{- end }}
1825
spec:
19-
{{- if .Values.ingress.tls }}
26+
{{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
27+
ingressClassName: {{ .Values.ingress.className }}
28+
{{- end }}
29+
{{- if .Values.ingress.tls }}
2030
tls:
21-
{{- range .Values.ingress.tls }}
31+
{{- range .Values.ingress.tls }}
2232
- hosts:
23-
{{- range .hosts }}
33+
{{- range .hosts }}
2434
- {{ . | quote }}
25-
{{- end }}
35+
{{- end }}
2636
secretName: {{ .secretName }}
37+
{{- end }}
2738
{{- end }}
28-
{{- end }}
2939
rules:
30-
{{- range .Values.ingress.hosts }}
40+
{{- range .Values.ingress.hosts }}
3141
- host: {{ .host | quote }}
3242
http:
3343
paths:
34-
{{- range .paths }}
35-
- path: {{ . }}
44+
{{- range .paths }}
45+
- path: {{ .path }}
46+
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
47+
pathType: {{ .pathType }}
48+
{{- end }}
3649
backend:
50+
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
51+
service:
52+
name: {{ $fullName }}
53+
port:
54+
number: {{ $svcPort }}
55+
{{- else }}
3756
serviceName: {{ $fullName }}
3857
servicePort: {{ $svcPort }}
39-
{{- end }}
40-
{{- end }}
58+
{{- end }}
59+
{{- end }}
60+
{{- end }}
4161
{{- end }}

‎restreamer/values.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,22 @@ service:
4040
port: 80
4141

4242
ingress:
43+
# -- Enable the use of the ingress controller to access the web UI
4344
enabled: false
45+
# -- Class name of the Ingress
46+
className: ""
47+
# -- Annotations for the Ingress
4448
annotations: {}
4549
# kubernetes.io/ingress.class: nginx
4650
# kubernetes.io/tls-acme: "true"
51+
52+
# -- Hosts for the ingress
53+
# @default -- see [values.yaml](values.yaml)
4754
hosts:
4855
- host: chart-example.local
49-
paths: []
56+
paths:
57+
- path: /
58+
pathType: ImplementationSpecific
5059
tls: []
5160
# - secretName: chart-example-tls
5261
# hosts:

‎transmission-exporter/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v1
22
appVersion: "0.3.0"
33
description: Transmission Exporter
44
name: transmission-exporter
5-
version: 1.0.0
5+
version: 1.1.0

‎transmission-exporter/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ The following tables lists the configurable parameters of the chart and their de
5858
| `service.type` | Kubernetes Service type | `ClusterIP` |
5959
| `service.port` | Kubernetes Service port | `19091` |
6060
| `service.annotations` | Annotations for the Service | `{}` |
61-
| `ingress.enabled` | Enable the use of the ingress controller to access the web UI | `false` |
62-
| `ingress.annotations` | Annotations for the Ingress | `{}` |
63-
| `ingress.hosts[0].host` | Hostname to your installation | `chart-example.local` |
64-
| `ingress.hosts[0].paths` | Path within the url structure | `[]` |
61+
| `ingress.enabled` | Enable the use of the ingress controller | `false` |
62+
| `ingress.className` | Class name for the ingress | `{}` |
63+
| `ingress.annotations` | Annotations for the ingress | `{}` |
64+
| `ingress.hosts` | Hosts configuration of the ingress | see [values.yaml](values.yaml) |
6565
| `ingress.tls` | The TLS configuration for the ingress | `[]` |
6666
| `resources` | The resources to allocate for the container | `{}` |
6767
| `affinity` | Map of node/pod affinities | `{}` |

‎transmission-exporter/templates/ingress.yaml

+46-21
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,61 @@
11
{{- if .Values.ingress.enabled -}}
22
{{- $fullName := include "transmission-exporter.fullname" . -}}
3-
{{- $ingressPath := .Values.ingress.path -}}
4-
apiVersion: {{ template "ingress.apiVersion" . }}
3+
{{- $svcPort := .Values.service.port -}}
4+
{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
5+
{{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
6+
{{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
7+
{{- end }}
8+
{{- end }}
9+
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
10+
apiVersion: networking.k8s.io/v1
11+
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
12+
apiVersion: networking.k8s.io/v1beta1
13+
{{- else -}}
14+
apiVersion: extensions/v1beta1
15+
{{- end }}
516
kind: Ingress
617
metadata:
718
name: {{ $fullName }}
8-
namespace: {{ .Release.Namespace }}
919
labels:
10-
app: {{ template "transmission-exporter.name" . }}
11-
chart: {{ template "transmission-exporter.chart" . }}
12-
release: {{ .Release.Name }}
13-
heritage: {{ .Release.Service }}
14-
{{- if .Values.ingress.labels }}
15-
{{ toYaml .Values.ingress.labels | indent 4 }}
16-
{{- end }}
17-
{{- with .Values.ingress.annotations }}
20+
{{- include "transmission-exporter.labels" . | nindent 4 }}
21+
{{- with .Values.ingress.annotations }}
1822
annotations:
19-
{{ toYaml . | indent 4 }}
20-
{{- end }}
23+
{{- toYaml . | nindent 4 }}
24+
{{- end }}
2125
spec:
22-
{{- if .Values.ingress.tls }}
26+
{{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
27+
ingressClassName: {{ .Values.ingress.className }}
28+
{{- end }}
29+
{{- if .Values.ingress.tls }}
2330
tls:
24-
{{ toYaml .Values.ingress.tls | indent 4 }}
25-
{{- end }}
31+
{{- range .Values.ingress.tls }}
32+
- hosts:
33+
{{- range .hosts }}
34+
- {{ . | quote }}
35+
{{- end }}
36+
secretName: {{ .secretName }}
37+
{{- end }}
38+
{{- end }}
2639
rules:
27-
{{- range .Values.ingress.hosts }}
28-
- host: {{ . }}
40+
{{- range .Values.ingress.hosts }}
41+
- host: {{ .host | quote }}
2942
http:
3043
paths:
31-
- path: {{ $ingressPath }}
44+
{{- range .paths }}
45+
- path: {{ .path }}
46+
{{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
47+
pathType: {{ .pathType }}
48+
{{- end }}
3249
backend:
50+
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
51+
service:
52+
name: {{ $fullName }}
53+
port:
54+
number: {{ $svcPort }}
55+
{{- else }}
3356
serviceName: {{ $fullName }}
34-
servicePort: http
35-
{{- end }}
57+
servicePort: {{ $svcPort }}
58+
{{- end }}
59+
{{- end }}
60+
{{- end }}
3661
{{- end }}

‎transmission-exporter/values.yaml

+12-4
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,22 @@ service:
2222
# prometheus.io/port: "19091"
2323

2424
ingress:
25+
# -- Enable the use of the ingress controller to access the web UI
2526
enabled: false
27+
# -- Class name of the Ingress
28+
className: ""
29+
# -- Annotations for the Ingress
2630
annotations: {}
2731
# kubernetes.io/ingress.class: nginx
28-
# kubernetes.io/tls-acme: "true"
29-
labels: {}
30-
path: /
32+
# kubernetes.io/tls-acme: "true"
33+
34+
# -- Hosts for the ingress
35+
# @default -- see [values.yaml](values.yaml)
3136
hosts:
32-
- chart-example.local
37+
- host: chart-example.local
38+
paths:
39+
- path: /
40+
pathType: ImplementationSpecific
3341
tls: []
3442
# - secretName: chart-example-tls
3543
# hosts:

‎transmission-openvpn/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: transmission-openvpn
33
description: Transmission + OpenVPN chart based on haugene/transmission-openvpn image
44
type: application
5-
version: 1.0.11
5+
version: 1.1.11
66
appVersion: "3.7.1"
77
home: https://haugene.github.io/docker-transmission-openvpn
88
keywords:
@@ -21,7 +21,7 @@ maintainers:
2121
annotations:
2222
artifacthub.io/license: MIT
2323
artifacthub.io/changes: |
24-
- Bump appVersion to 3.7.1
24+
- Update ingress to support newer Kubernetes APIs
2525
artifacthub.io/images: |
2626
- name: haugene/transmission-openvpn
2727
image: docker.io/haugene/transmission-openvpn:3.7.1

‎transmission-openvpn/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ The following tables lists the configurable parameters of the chart and their de
5858
| `securityContext` | The security context for the application container. Includes `NET_ADMIN` by default for the OpenVPN connection to work | `{"capabilities":{"add":["NET_ADMIN"]}}` |
5959
| `service.type` | Kubernetes Service type | `ClusterIP` |
6060
| `service.port` | Kubernetes Service port | `80` |
61-
| `ingress.enabled` | Enable the use of the ingress controller to access the web UI | `false` |
62-
| `ingress.annotations` | Annotations for the Ingress | `{}` |
63-
| `ingress.hosts[0].host` | Hostname to your installation | `chart-example.local` |
64-
| `ingress.hosts[0].paths` | Path within the url structure | `[]` |
61+
| `ingress.enabled` | Enable the use of the ingress controller | `false` |
62+
| `ingress.className` | Class name for the ingress | `{}` |
63+
| `ingress.annotations` | Annotations for the ingress | `{}` |
64+
| `ingress.hosts` | Hosts configuration of the ingress | see [values.yaml](values.yaml) |
6565
| `ingress.tls` | The TLS configuration for the ingress | `[]` |
6666
| `resources` | The resources to allocate for the container | `{}` |
6767
| `affinity` | Map of node/pod affinities | `{}` |

0 commit comments

Comments
 (0)