Merge branch 'bugfix/remove-loki-ingress-when-not-needed' into tmp/octopus/w/132.0/bugfix/remove-loki-ingress-when-not-needed

Author: bert-e

CHANGELOG.md

@@ -12,6 +12,11 @@
 
 ## Release 131.0.5 (in development)
 
+### Bug Fixes
+
+- Do not deploy Loki ingress when Loki addon is not enabled
+  (PR[#4725](https://github.com/scality/metalk8s/pull/4725))
+
 ## Release 131.0.4
 
 ## Release 131.0.3

salt/metalk8s/addons/ui/deployed/ingress.sls

@@ -87,13 +87,15 @@ spec:
             name: alertmanager-api
             port:
               number: 9093
+      {%- if pillar.addons.loki.enabled %}
       - path: /api/loki(/|$)(.*)
         pathType: Prefix
         backend:
           service:
             name: loki-api
             port:
               number: 3100
+      {%- endif %}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress