EEML-110: Fix grafana ingress creation (#155)

mlrun · Dec 15, 2024 · 94d7a24 · 94d7a24
1 parent 0d40fe2
commit 94d7a24
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,3 +36,14 @@ jobs:
         uses: helm/chart-releaser-action@v1.1.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+  notify_mlefi:
+    runs-on: ubuntu-latest
+    steps:
+        - name: Send repository dispatch event
+          run: |
+            curl -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: token ${{ secrets.MLEfiGHTrigger }}" \
+            https://api.github.com/repos/iguazio/mlefi/dispatches \
+            -d '{"event_type":"helm-release","client_payload":{"chart_version":"${{ github.event.release.tag_name }}"}}'
diff --git a/charts/mlrun-ce/Chart.yaml b/charts/mlrun-ce/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mlrun-ce
-version: 0.7.1-rc7
+version: 0.7.1-rc8
 description: MLRun Open Source Stack
 home: https://iguazio.com
 icon: https://www.iguazio.com/wp-content/uploads/2019/10/Iguazio-Logo.png

diff --git a/charts/mlrun-ce/templates/aws/aws_ingress.yaml b/charts/mlrun-ce/templates/aws/aws_ingress.yaml
@@ -6,19 +6,19 @@ metadata:
   annotations:
     alb.ingress.kubernetes.io/scheme: internet-facing
     alb.ingress.kubernetes.io/target-type: ip
-  {{- if .Values.global.infrastructure.inboundCidrs }}
+    {{- if .Values.global.infrastructure.inboundCidrs }}
     alb.ingress.kubernetes.io/inbound-cidrs: {{ .Values.global.infrastructure.inboundCidrs }}
-  {{- end }}  
-  {{- if .Values.global.infrastructure.loadBalancerName }}
+    {{- end }}
+    {{- if .Values.global.infrastructure.loadBalancerName }}
     alb.ingress.kubernetes.io/load-balancer-name: {{ .Values.global.infrastructure.loadBalancerName }}
-  {{- end }}
-  {{- if .Values.global.infrastructure.aws.domainNameCertificate }}
+    {{- end }}
+    {{- if .Values.global.infrastructure.aws.domainNameCertificate }}
     alb.ingress.kubernetes.io/certificate-arn: {{ .Values.global.infrastructure.aws.domainNameCertificate }}
     alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
     alb.ingress.kubernetes.io/ssl-redirect: '443'
-  {{- else }}
+    {{- else }}
     alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}]'
-  {{- end }}
+    {{- end }}
 spec:
   ingressClassName: alb
   rules:
@@ -62,6 +62,7 @@ spec:
                 name: mlrun-jupyter
                 port:
                   number: 80
+    {{- if index .Values "kube-prometheus-stack" "enabled" }}
     - host: grafana.{{ .Values.global.externalHostAddress }}
       http:
         paths:
@@ -72,4 +73,5 @@ spec:
                 name: grafana
                 port:
                   number: 80
-{{- end }}
+    {{- end }}
+{{- end }}