fix(blocky): allow port changes, allow dot, fix prometheus and fix api access (#3899)

* fix(blocky): allow port changes, allow dot and fix api access

* update documentation and remove non-present unbound feature

* more docs

* fix a sponsor link while at it

* fix mistake

* fix two mistakes in prometheus config

* fix questions.yaml as well

* fix bug in basic auth template

charts/enterprise/blocky/templates/_blockyConfig.tpl

@@ -35,6 +35,22 @@ upstream:
 {{- $value.dnsservers | toYaml | nindent 8 }}
 {{- end }}
 
+{{- if .Values.service.dnsudp.enabled }}
+port: {{ .Values.service.dnsudp.ports.dnsudp.targetPort }}
+{{- end }}
+
+{{- if .Values.service.dot.enabled }}
+tlsPort: {{ .Values.service.dot.ports.dot.targetPort }}
+{{- end }}
+
+{{- if .Values.service.http.enabled }}
+httpPort: {{ .Values.service.http.ports.http.targetPort }}
+{{- end }}
+
+{{- if .Values.service.https.enabled }}
+httpsPort: {{ .Values.service.https.ports.https.targetPort }}
+{{- end }}
+
 {{- if .Values.certFile }}
 certFile: {{ .Values.certFile }}
 {{- end }}

charts/enterprise/blocky/templates/common.yaml

@@ -34,7 +34,7 @@ volumeSpec:
 
 {{- $_ := set .Values.podAnnotations "prometheus.io/scrape" "true" -}}
 {{- $_ := set .Values.podAnnotations "prometheus.io/path" "/metrics" -}}
-{{- $_ := set .Values.podAnnotations "prometheus.io/port" (.Values.service.main.ports.main.targetPort | quote) -}}
+{{- $_ := set .Values.podAnnotations "prometheus.io/port" (.Values.service.http.ports.http.targetPort | toString) -}}
 
 {{- if .Values.blocky.enableWebUI -}}
 {{- $_ := set .Values.additionalContainers "frontend" (include "blocky.frontend" . | fromYaml) -}}