do not assume first cluster issuer for ingress annotation

Author: monrax

graylog/templates/_helpers.tpl

@@ -463,23 +463,6 @@ Cert-manager issuer name
 {{- include "graylog.fullname" . | printf "%s-letsencrypt" }}
 {{- end }}
 
-{{/*
-Cert-manager ClusterIssuer name getter
-*/}}
-{{- define "cert-manager.clusterissuer.existing.name" }}
-{{- $gv := "cert-manager.io/v1" }}
-{{- $name := "" }}
-{{- if .Capabilities.APIVersions.Has $gv }}
-{{- $ci := lookup $gv "ClusterIssuer" "" "" | default dict }}
-{{- $hasCI := $ci.items | default (list) | len | lt 0 }}
-{{- if $hasCI }}
-{{- $name = (index $ci.items 0).metadata.name | default "" }}
-{{- end }}
-{{- end }}
-{{- $name }}
-{{- end }}
-
-
 {{/*
 Cert-manager issuer checker
 Return: true if there is at least one Issuer or ClusterIssuer in the cluster.
@@ -489,9 +472,9 @@ Usage: if (include "cert-manager.issuer.exists.any" . | eq "true") ...
 {{- $gv := "cert-manager.io/v1" }}
 {{- $exists := false }}
 {{- if .Capabilities.APIVersions.Has $gv }}
-{{- $ci := include "cert-manager.clusterissuer.existing.name" . }}
+{{- $ci := lookup $gv "ClusterIssuer" "" "" | default dict }}
 {{- $ni := lookup $gv "Issuer" .Release.Namespace "" | default dict }}
-{{- $hasCI := empty $ci | not }}
+{{- $hasCI := $ci.items | default (list) | len | lt 0 }}
 {{- $hasNI := $ni.items | default (list) | len | lt 0 }}
 {{- $exists = or $hasCI $hasNI }}
 {{- end }}

graylog/templates/service/ingress/graylog.yaml

@@ -6,8 +6,8 @@ metadata:
   labels:
     {{- include "graylog.labels" . | nindent 4 }}
   annotations:
-  {{- $clusterissuer := include "cert-manager.clusterissuer.existing.name" . }}
-  {{- if or $clusterissuer .Values.ingress.config.tls.issuer.existingName .Values.ingress.config.tls.issuer.autoissue.enabled }}
+  {{- $clusterissuer := .Values.ingress.config.tls.clusterIssuer.existingName }}
+  {{- if or $clusterissuer .Values.ingress.config.tls.issuer.existingName .Values.ingress.config.tls.issuer.autoissue.enabled | and .Values.ingress.web.tls }}
     {{- if $clusterissuer }}
     cert-manager.io/cluster-issuer: {{ $clusterissuer }}
     {{- else }}

graylog/values.yaml

@@ -294,6 +294,8 @@ ingress:
     defaultBackend:
       enabled: true
     tls:
+      clusterIssuer:
+        existingName:
       issuer:
         existingName:
         autoissue: