Merge pull request #451 from pree/feat/signalilo-ingress-support

feat(signalilo): add ingress support

README.md

@@ -28,7 +28,7 @@ helm repo add appuio https://charts.appuio.ch
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/prometheus-blackbox-exporter-0.3.1/total)](https://github.com/appuio/charts/releases/tag/prometheus-blackbox-exporter-0.3.1) | [prometheus-blackbox-exporter](appuio/prometheus-blackbox-exporter/README.md) |
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/redis-1.3.5/total)](https://github.com/appuio/charts/releases/tag/redis-1.3.5) | [redis](appuio/redis/README.md) |
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/secret-1.1.0/total)](https://github.com/appuio/charts/releases/tag/secret-1.1.0) | [secret](appuio/secret/README.md) |
-| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/signalilo-0.9.1/total)](https://github.com/appuio/charts/releases/tag/signalilo-0.9.1) | [signalilo](appuio/signalilo/README.md) |
+| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/signalilo-0.10.0/total)](https://github.com/appuio/charts/releases/tag/signalilo-0.10.0) | [signalilo](appuio/signalilo/README.md) |
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/snappass-0.2.15/total)](https://github.com/appuio/charts/releases/tag/snappass-0.2.15) | [snappass](appuio/snappass/README.md) |
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/stardog-0.14.1/total)](https://github.com/appuio/charts/releases/tag/stardog-0.14.1) | [stardog](appuio/stardog/README.md) |
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/stardog-userrole-operator-0.1.1/total)](https://github.com/appuio/charts/releases/tag/stardog-userrole-operator-0.1.1) | [stardog-userrole-operator](appuio/stardog-userrole-operator/README.md) |

appuio/signalilo/Chart.yaml

@@ -7,7 +7,7 @@ keywords:
   - alertmanager
   - webhook
   - icinga2
-version: 0.9.1
+version: 0.10.0
 appVersion: v0.12.0
 sources:
   - https://git.vshn.net/vshn/signalilo

appuio/signalilo/README.gotmpl.md

@@ -4,6 +4,11 @@ The README.md file is automatically generated with helm-docs!
 Edit the README.gotmpl.md template instead.
 -->
 
+## Deployment considerations
+
+It is recommended to deploy Signalilo only in the same cluster or network as the alertmanager instance which is sending the alerts.
+Using Signalilo from an alertmanager instance in a different network is untested.
+
 ## Configuration
 
 The following table lists the configurable parameters of the Signalilo chart and their default values.
@@ -34,6 +39,10 @@ Parameter | Description | Default
 `securityContext.runAsUser` | User to run the pod as | `999`
 `securityContext.fsGroup` | fs group to use for the pod | `999`
 `resources` | Pod resource requests and limits | `{}`
+`ingress.enabled` | Enable ingress | `false`
+`ingress.annotations` | Ingress annotations | `{}`
+`ingress.hosts` | Ingress hostnames | `["signalilo.local"]`
+`ingress.tls` | Ingress TLS configuration | `[]`
 `nodeSelector` | Pod node selector | `{}`
 `tolerations` | Pod tolerations | `[]`
 `affinity` | Pod affinity rules | `{}`

appuio/signalilo/README.md

@@ -1,6 +1,6 @@
 # signalilo
 
-![Version: 0.9.1](https://img.shields.io/badge/Version-0.9.1-informational?style=flat-square) ![AppVersion: v0.12.0](https://img.shields.io/badge/AppVersion-v0.12.0-informational?style=flat-square)
+![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat-square) ![AppVersion: v0.12.0](https://img.shields.io/badge/AppVersion-v0.12.0-informational?style=flat-square)
 
 Alertmanager to Icinga2 bridge
 
@@ -18,6 +18,11 @@ The README.md file is automatically generated with helm-docs!
 Edit the README.gotmpl.md template instead.
 -->
 
+## Deployment considerations
+
+It is recommended to deploy Signalilo only in the same cluster or network as the alertmanager instance which is sending the alerts.
+Using Signalilo from an alertmanager instance in a different network is untested.
+
 ## Configuration
 
 The following table lists the configurable parameters of the Signalilo chart and their default values.
@@ -48,6 +53,10 @@ Parameter | Description | Default
 `securityContext.runAsUser` | User to run the pod as | `999`
 `securityContext.fsGroup` | fs group to use for the pod | `999`
 `resources` | Pod resource requests and limits | `{}`
+`ingress.enabled` | Enable ingress | `false`
+`ingress.annotations` | Ingress annotations | `{}`
+`ingress.hosts` | Ingress hostnames | `["signalilo.local"]`
+`ingress.tls` | Ingress TLS configuration | `[]`
 `nodeSelector` | Pod node selector | `{}`
 `tolerations` | Pod tolerations | `[]`
 `affinity` | Pod affinity rules | `{}`

appuio/signalilo/templates/ingress.yaml

@@ -0,0 +1,38 @@
+{{- if .Values.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "signalilo.fullname" }}
+  labels:
+    app.kubernetes.io/name: {{ include "signalilo.name" . }}
+    helm.sh/chart: {{ include "signalilo.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          - path: /
+            backend:
+              service:
+                name: {{ include "signalilo.fullname" }}
+                port:
+                  number: 80
+    {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+{{- end }}

appuio/signalilo/values.yaml

@@ -67,6 +67,22 @@ resources:
     cpu: 200m
     memory: 128Mi
 
+# It is recommended to only use Signalilo inside the same cluster/network as the alertmanager instance sending the alerts.
+# Running Signalilo on a different network as the connected alertmanager is untested.
+ingress:
+  # -- enable ingress
+  enabled: false
+  # -- ingress annotations
+  annotations: {}
+    # cert-manager.io/cluster-issuer: letsencrypt-prod
+  # -- ingress hostnames
+  hosts: ["signalilo.local"]
+  # -- ingress TLS configuration
+  tls: []
+  #  - secretName: signalilo-tls
+  #    hosts:
+  #      - signalilo.local
+
 nodeSelector: {}
 
 tolerations: []