Merge pull request #69 from grycap/devel

Add ingress tls
grycap · Apr 10, 2024 · 0abf737 · 0abf737
2 parents c568f13 + 3802c51
commit 0abf737
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 2 deletions.
diff --git a/IM/Chart.yaml b/IM/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: IM
 description: Deploy a HA Infrastructure Manager
-version: 1.6.1
+version: 1.6.2
 type: application
 home: https://www.grycap.upv.es/im
 sources:

diff --git a/IM/templates/im_dashboard_ingress.yaml b/IM/templates/im_dashboard_ingress.yaml
@@ -38,5 +38,9 @@ spec:
           pathType: Prefix
 {{- end }}
           path: {{ .Values.imdashboard.ingress.path }}/?(.*)
+{{- if .Values.imdashboard.ingress.tls }}
+  tls:
+{{ tpl (toYaml .Values.imdashboard.ingress.tls | indent 4) . }}
+{{- end -}}
 
 {{ end }}
diff --git a/IM/templates/im_ingress.yaml b/IM/templates/im_ingress.yaml
@@ -52,4 +52,9 @@ spec:
 
 {{- end }}
           path: {{ .Values.im.ingress.path }}/?(.*)
+{{- if .Values.im.ingress.tls }}
+  tls:
+{{ tpl (toYaml .Values.im.ingress.tls | indent 4) . }}
+{{- end -}}
+
 {{- end }}
diff --git a/IM/templates/im_web_ingress.yaml b/IM/templates/im_web_ingress.yaml
@@ -37,5 +37,8 @@ spec:
           pathType: Prefix
 {{- end }}
           path: {{ .Values.imweb.ingress.path }}/?(.*)
-
+{{- if .Values.imweb.ingress.tls }}
+  tls:
+{{ tpl (toYaml .Values.imweb.ingress.tls | indent 4) . }}
+{{- end -}}
 {{ end }}
diff --git a/IM/tests/im_ingress_test.yaml b/IM/tests/im_ingress_test.yaml
@@ -7,6 +7,10 @@ tests:
       im.ingress.enabled: true
       im.ingress.path: /im
       im.ingress.host: somehost.com
+      im.ingress.tls:
+        - secretName: tls-secret
+          hosts:
+            - somehost.com
     asserts:
       - isKind:
           of: Ingress
@@ -19,3 +23,9 @@ tests:
       - equal:
           path: spec.rules[0].host
           value: somehost.com
+      - equal:
+          path: spec.tls[0].hosts[0]
+          value: somehost.com
+      - equal:
+          path: spec.tls[0].secretName
+          value: tls-secret
diff --git a/IM/values.yaml b/IM/values.yaml
@@ -50,6 +50,7 @@ imweb:
     enabled: true
     host: ""
     path: "/im-web"
+    tls: []
   resources:
     requests:
       memory: 256Mi
@@ -63,6 +64,7 @@ imdashboard:
     enabled: true
     host: ""
     path: "/im-dashboard"
+    tls: []
   resources:
     requests:
       memory: 256Mi
@@ -89,6 +91,7 @@ im:
     enabled: true
     host: ""
     path: "/im"
+    tls: []
   resources:
     requests:
       memory: 256Mi

diff --git a/docs/IM-1.6.2.tgz b/docs/IM-1.6.2.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -1,6 +1,38 @@
 apiVersion: v1
 entries:
   IM:
+  - apiVersion: v2
+    created: "2024-04-10T10:05:48.594751554Z"
+    dependencies:
+    - name: mysql
+      repository: https://charts.helm.sh/stable
+      version: '>= 1.1.1'
+    - condition: vault.enabled
+      name: vault
+      repository: https://helm.releases.hashicorp.com
+      version: '>= 0.17.1'
+    - condition: mongodb.enabled
+      name: mongodb
+      repository: https://charts.bitnami.com/bitnami
+      version: '>= 12.1.31'
+    description: Deploy a HA Infrastructure Manager
+    digest: ef717f489fabfe443828ed698c0d97e8d02178a8523452c8896a639f1af418b9
+    home: https://www.grycap.upv.es/im
+    icon: https://github.com/grycap/helm-charts/raw/master/icons/im.png
+    keywords:
+    - Infrastructure Manager
+    - Cloud Orchestrator
+    - TOSCA
+    maintainers:
+    - email: [email protected]
+      name: Miguel Caballer
+    name: IM
+    sources:
+    - https://github.com/grycap/im
+    type: application
+    urls:
+    - https://grycap.github.io/helm-charts/IM-1.6.2.tgz
+    version: 1.6.2
   - apiVersion: v2
     created: "2024-03-27T07:45:48.471861612Z"
     dependencies: