Update charts to support multiple neon-core ingresses

Update CLI entrypoint to make iris Gradio UI deployments optional
NeonGeckoCom · Dec 29, 2023 · 8db4114 · 8db4114
1 parent 3a52bd0
commit 8db4114
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 60 deletions.
diff --git a/neon_diana_utils/configuration.py b/neon_diana_utils/configuration.py
@@ -645,13 +645,14 @@ def configure_neon_core(mq_user: str = None,
         return
 
     # Prompt for IRIS Web UI configuration
-    # TODO: Optional
-    confirmed = False
-    iris_domain = "iris.diana.k8s"  # TODO: Read from backend config
-    while not confirmed:
-        iris_domain = click.prompt("Hostname for Iris Web UI", type=str,
-                                   default=iris_domain)
-        confirmed = click.confirm(f"Is {iris_domain} correct?")
+    iris_domain = None
+    if click.confirm("Configure IRIS Gradio Web UI?"):
+        confirmed = False
+        iris_domain = "iris.diana.k8s"  # TODO: Read from backend config
+        while not confirmed:
+            iris_domain = click.prompt("Hostname for Iris Gradio Web UI",
+                                       type=str, default=iris_domain)
+            confirmed = click.confirm(f"Is {iris_domain} correct?")
 
     if orchestrator == Orchestrator.KUBERNETES:
         shutil.copytree(join(dirname(__file__), "templates", "neon"),
@@ -661,8 +662,19 @@ def configure_neon_core(mq_user: str = None,
         values = join(output_path, "neon-core", "values.yaml")
         with open(values, "r") as f:
             config = yaml.safe_load(f)
-        config['iris']['subdomain'], config['iris']['domain'] =\
-            iris_domain.split('.', 1)
+        if iris_domain:
+            iris_subdomain, iris_domain = iris_domain.split('.', 1)
+            config['core']['domain'] = iris_domain
+            config['core']['ingress']['rules'].append(
+                {'host': iris_subdomain, 'serviceName': 'neon-core-iris',
+                 'servicePort': 7860})
+        else:
+            click.echo("iris Gradio UI disabled")
+            config['core']['iris-gradio']['replicaCount'] = 0
+
+        if not config['core']['ingress']['rules']:
+            click.echo('No HTTP ingress configured')
+            config['core']['ingress']['enabled'] = False
         with open(values, 'w') as f:
             yaml.safe_dump(config, f)
     elif orchestrator == Orchestrator.COMPOSE:

diff --git a/neon_diana_utils/helm_charts/base/base-neon/Chart.yaml b/neon_diana_utils/helm_charts/base/base-neon/Chart.yaml
@@ -3,5 +3,5 @@ name: base-neon
 description: Library chart for basic Neon Core Services
 
 type: library
-version: 0.0.4
+version: 0.0.5
 appVersion: "1.0.1a16"
diff --git a/neon_diana_utils/helm_charts/base/base-neon/templates/_ingress.tpl b/neon_diana_utils/helm_charts/base/base-neon/templates/_ingress.tpl
@@ -0,0 +1,40 @@
+{{- define "base-neon.ingress" -}}
+{{ if .Values.ingress.enabled }}
+{{- $domain := .Values.domain -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: ingress-iris-http
+  annotations:
+    kubernetes.io/ingress.class: {{ .Values.ingress.ingressClassName }}
+    cert-manager.io/issuer: {{ .Values.ingress.certIssuer }}
+spec:
+  tls:
+    - secretName: {{ .Values.ingress.tlsSecretName }}
+      hosts:
+        {{- range .Values.ingress.rules }}
+        - {{ printf "%s.%s " .host $.Values.domain }}
+        {{- end }}
+
+  rules:
+    {{- range .Values.ingress.rules }}
+    - host: {{ printf "%s.%s " .host $.Values.domain }}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ .serviceName }}
+                port:
+                  number: {{ .servicePort }}
+    {{- end }}
+
+  {{- end -}}
+{{- end -}}
diff --git a/neon_diana_utils/helm_charts/neon/core/Chart.yaml b/neon_diana_utils/helm_charts/neon/core/Chart.yaml
@@ -3,9 +3,12 @@ name: neon-core
 description: Deploy Neon Core Services
 
 type: application
-version: 0.0.6
+version: 0.0.8
 appVersion: "1.0.1a16"
 dependencies:
+  - name: base-neon
+    version: 0.0.5
+    repository: file://../../base/base-neon
   - name: neon-messagebus
     alias: neon-messagebus
     version: 0.0.6
@@ -29,4 +32,8 @@ dependencies:
   - name: neon-gui
     alias: neon-gui
     version: 0.0.5
-    repository: file://../neon-gui
+    repository: file://../neon-gui
+  - name: neon-iris
+    alias: iris-gradio
+    version: 0.0.5
+    repository: file://../neon-iris
diff --git a/neon_diana_utils/helm_charts/neon/core/templates/ingress.yaml b/neon_diana_utils/helm_charts/neon/core/templates/ingress.yaml
@@ -0,0 +1 @@
+{{- include "base-neon.ingress" . }}
diff --git a/neon_diana_utils/helm_charts/neon/core/values.yaml b/neon_diana_utils/helm_charts/neon/core/values.yaml
@@ -18,4 +18,19 @@ neon-enclosure:
     tag: *tag
 neon-gui:
   image:
-    tag: *tag
+    tag: *tag
+iris-gradio:
+  ingress:
+    enabled: False
+
+domain: diana.local
+ingress:
+  enabled: True
+  ingressClassName: nginx
+  tlsSecretName: tls-letsencrypt-iris
+  certIssuer: letsencrypt-private-key
+  rules:
+    - host: iris
+      serviceName: neon-core-iris
+      servicePort: 7860
+    # Define ingress rules for any available web UIs that may be enabled here
diff --git a/neon_diana_utils/helm_charts/neon/neon-iris/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-iris/Chart.yaml
@@ -3,10 +3,10 @@ name: neon-iris
 description: Deploy Neon IRIS Web UI
 
 type: application
-version: 0.0.4
+version: 0.0.5
 appVersion: "1.0.1a16"
 
 dependencies:
   - name: base-neon
-    version: 0.0.4
+    version: 0.0.5
     repository: file://../../base/base-neon
diff --git a/neon_diana_utils/helm_charts/neon/neon-iris/templates/ingress.yaml b/neon_diana_utils/helm_charts/neon/neon-iris/templates/ingress.yaml
@@ -1,38 +1 @@
-{{ if .Values.ingress.enabled }}
-{{- $domain := .Values.domain -}}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: ingress-iris-http
-  annotations:
-    kubernetes.io/ingress.class: {{ .Values.ingress.ingressClassName }}
-    cert-manager.io/issuer: {{ .Values.ingress.certIssuer }}
-spec:
-  tls:
-    - secretName: {{ .Values.ingress.tlsSecretName }}
-      hosts:
-        {{- range .Values.ingress.rules }}
-        - {{ printf "%s.%s " .host $.Values.domain }}
-        {{- end }}
-
-  rules:
-    {{- range .Values.ingress.rules }}
-    - host: {{ printf "%s.%s " .host $.Values.domain }}
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ .serviceName }}
-                port:
-                  number: {{ .servicePort }}
-    {{- end }}
-
-  {{- end }}
+{{- include "base-neon.ingress" . }}
diff --git a/neon_diana_utils/helm_charts/neon/neon-iris/values.yaml b/neon_diana_utils/helm_charts/neon/neon-iris/values.yaml
@@ -1,5 +1,4 @@
 serviceName: neon-core-iris
-subdomain: iris
 domain: diana.local
 replicaCount: 1
 configMap: neon-config

diff --git a/neon_diana_utils/templates/neon/Chart.yaml b/neon_diana_utils/templates/neon/Chart.yaml
@@ -9,9 +9,5 @@ appVersion: "1.0.1a5"
 dependencies:
   - name: neon-core
     alias: core
-    version: 0.0.6
-    repository: https://neongeckocom.github.io/neon-diana-utils
-  - name: neon-iris
-    alias: iris
-    version: 0.0.4
+    version: 0.0.8
     repository: https://neongeckocom.github.io/neon-diana-utils
diff --git a/neon_diana_utils/templates/neon/values.yaml b/neon_diana_utils/templates/neon/values.yaml
@@ -11,4 +11,9 @@ core:
     image: {}
   neon-gui:
     image: {}
-iris: {}
+  iris-gradio:
+    image: {}
+
+  domain: diana.local
+  ingress:
+    rules: []