Merge pull request #70 from irfanhakim-as/ingress

Flex: Additional custom Ingress annotations

mika/flex/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: flex
 description: Flex is a collection of curated services that aims to provide a complete home media server solution.
 type: application
-version: 0.1.3
+version: 0.1.4
 appVersion: "1.40.0.7998-c29d4c0c8"
 keywords:
   - "flex"

mika/flex/README.md

@@ -788,6 +788,7 @@ Flex is a collection of curated services that aims to provide a complete home me
 | image.sonarr.tag | string | `""` | The tag that specifies the version of the Sonarr container image used. Default: `4.0.1.929-ls224`. |
 | imagePullSecrets | list | `[]` | Credentials used to securely authenticate and authorise the pulling of container images from private registries. |
 | ingress.clusterIssuer | string | `""` | The name of the cluster issuer for Ingress. Default: `"letsencrypt-dns-prod"`. |
+| ingress.customAnnotations | list | `[]` | Additional configuration annotations to be added to the Ingress resource. |
 | ingress.enabled | bool | `false` | Specifies whether Ingress should be enabled for hosting Flex services. |
 | jackett.autoUpdate | bool | `true` | Specifies whether to allow Jackett to automatically update itself inside the container. |
 | jackett.customConfigs | list | `[]` | Optional custom configurations to be mounted as a file inside the Jackett container. |

mika/flex/templates/ingress.yaml

@@ -10,6 +10,7 @@
 {{- $radarrIngress := .Values.radarr.ingress }}
 {{- $sonarrIngress := .Values.sonarr.ingress }}
 {{- $clusterIssuer := .Values.ingress.clusterIssuer | default "letsencrypt-dns-prod" | toString | quote }}
+{{- $customAnnotations := .Values.ingress.customAnnotations }}
 {{- $bazarrDomain := .Values.bazarr.domain | toString | quote }}
 {{- $jackettDomain := .Values.jackett.domain | toString | quote }}
 {{- $overseerrDomain := .Values.overseerr.domain | toString | quote }}
@@ -35,6 +36,9 @@ metadata:
     nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"
     nginx.ingress.kubernetes.io/session-cookie-name: "route"
     nginx.org/client-max-body-size: "100m"
+    {{- range $customAnnotations }}
+    {{ printf "%s/%s" (.prefix | default "nginx.ingress.kubernetes.io") .name }}: {{ .value | quote }}
+    {{- end }}
 spec:
   ingressClassName: "nginx"
   rules:

mika/flex/values.yaml

@@ -421,6 +421,23 @@ ingress:
   # The name of the cluster issuer for Ingress.
   # Default: "letsencrypt-dns-prod"
   clusterIssuer: ""
+  # Additional configuration annotations to be added to the Ingress resource.
+  # Example:
+  # customAnnotations:
+  #   # The prefix of the annotation.
+  #   # Default: "nginx.ingress.kubernetes.io"
+  #   # Example:
+  #   # - prefix: "nginx.org"
+  #   - prefix: ""
+  #   # The name of the annotation.
+  #   # Example:
+  #     # name: "proxy-connect-timeout"
+  #     name: ""
+  #   # The value of the annotation.
+  #   # Example:
+  #     # value: "120"
+  #     value: ""
+  customAnnotations: []
 
 # Service configurations.
 service: