Merge pull request #9 from cloudymax/fix/ingress

actually fix the ingress for real this time
cloudymax · Apr 23, 2024 · 6eb862a · 6eb862a
2 parents 43dded2 + 684d830
commit 6eb862a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/charts/kubevirt-manager/Chart.yaml b/charts/kubevirt-manager/Chart.yaml
@@ -3,7 +3,7 @@ name: kubevirt-manager
 description: Install the Kubevirt Manager UI
 
 type: application
-version: 0.1.7
+version: 0.1.8
 appVersion: 1.3.1
 
 maintainers:

diff --git a/charts/kubevirt-manager/README.md b/charts/kubevirt-manager/README.md
@@ -1,6 +1,6 @@
 # kubevirt-manager
 
-![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.1](https://img.shields.io/badge/AppVersion-1.3.1-informational?style=flat-square)
+![Version: 0.1.8](https://img.shields.io/badge/Version-0.1.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.1](https://img.shields.io/badge/AppVersion-1.3.1-informational?style=flat-square)
 
 Install the Kubevirt Manager UI
 

diff --git a/charts/kubevirt-manager/templates/ingress.yaml b/charts/kubevirt-manager/templates/ingress.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.ingress.enabled }}
+{{- if eq .Values.ingress.enabled true }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -13,9 +13,12 @@ metadata:
 {{- end }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
+{{- if eq .Values.ingress.tls.enabled true }}
   tls:
    - hosts:
      - {{ .Values.ingress.hostname }}
+     secretName: {{ .Values.ingress.tls.secretName | quote }}
+{{- end }}
   rules:
   - host: {{ .Values.ingress.hostname }}
     http:
@@ -27,5 +30,4 @@ spec:
             name: kubevirt-manager
             port:
               number: {{ .Values.service.port }}
-
 {{- end }}
diff --git a/charts/kubevirt-manager/templates/service.yaml b/charts/kubevirt-manager/templates/service.yaml
@@ -7,10 +7,11 @@ metadata:
     app: kubevirt-manager
     kubevirt-manager.io/version: {{ .Chart.AppVersion }}
 spec:
-  type: ClusterIP
+  type: {{ .Values.service.type }}
   selector:
     app: kubevirt-manager
   ports:
-    - protocol: TCP
+    - name: {{ .Values.service.name }} 
+      protocol: {{ .Values.service.protocol }}
       port: {{ .Values.service.port }}
-      targetPort: 8080
+      targetPort: {{ .Values.service.targetPort }}