ingress kibana v0.0.3

InseeFrLab · Mar 11, 2021 · 245f103 · 245f103
1 parent 4fb5572
commit 245f103
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 32 deletions.
diff --git a/charts/elastic/Chart.yaml b/charts/elastic/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.2
+version: 0.0.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/elastic/templates/ingress.yaml b/charts/elastic/templates/ingress.yaml
@@ -0,0 +1,31 @@
+{{- if .Values.ingress.enabled -}}
+{{- $svcPort := .Values.kibana.service.port -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-kibana
+  labels:
+    {{- include "kibana.labels" . | nindent 4 }}
+{{- with .Values.kibana.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+    - hosts:
+        - {{ .Values.ingress.hostname | quote }}
+{{- end }}
+  rules:
+    - host: {{ .Values.ingress.hostname | quote }}
+      http:
+        paths:
+          - path: /
+            backend:
+              serviceName: {{ .Release.Name }}-kibana
+              servicePort: {{ $svcPort }}
+{{- end }}
diff --git a/charts/elastic/values.schema.json b/charts/elastic/values.schema.json
@@ -14,32 +14,28 @@
         }
       }
     },
-    "kibana": {
-      "description": "postgres specific configuration",
+    "ingress": {
       "type": "object",
+      "form": true,
+      "title": "Ingress Details",
       "properties": {
-        "ingress": {
-          "type": "object",
-          "form": true,
-          "title": "Ingress Details",
-          "properties": {
-            "hostname": {
-                "type": "string",
-                "form": true,
-                "title": "Hostname",
-                "x-form": {
-                    "hidden": true
-                },
-                "x-generated": {
-                    "type": "externalDNS",
-                    "scope": "jupyter",
-                    "name": "ihm"
-                }
+        "hostname": {
+            "type": "string",
+            "form": true,
+            "title": "Hostname",
+            "x-form": {
+                "hidden": true
+            },
+            "x-generated": {
+                "type": "externalDNS",
+                "scope": "jupyter",
+                "name": "ihm"
             }
-          }
         }
       }
     }
+
+
   }  
 
 }
diff --git a/charts/elastic/values.yaml b/charts/elastic/values.yaml
@@ -3,14 +3,13 @@ elasticsearch:
   sysctlInitContainer:
     enabled: false
 
-kibana:
-  ingress:
-    enabled: true
-    tls: true
-    annotations:
-      kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    hostname: chart-example.local
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
+ingress:
+  enabled: true
+  tls: true
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hostname: chart-example.local
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local