Update neon modules to allow for name overrides

NeonGeckoCom · Nov 2, 2023 · c7153c6 · c7153c6
1 parent 0f3256f
commit c7153c6
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 20 deletions.
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.1
+version: 0.0.2
 appVersion: "1.0.1a5"
diff --git a/neon_diana_utils/helm_charts/base/base-neon/templates/_deployment.tpl b/neon_diana_utils/helm_charts/base/base-neon/templates/_deployment.tpl
@@ -1,30 +1,31 @@
+{{ $serviceName := default .Chart.Name .Values.serviceName }}
 {{- define "base-neon.deployment" -}}
 
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Chart.Name }}
+  name: {{ $serviceName }}
 spec:
   replicas:  {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      neon.diana.service: {{ .Chart.Name }}
+      neon.diana.service: {{ $serviceName }}
   strategy:
     type: Recreate
   template:
     metadata:
       annotations:
         releaseTime: {{ dateInZone "2006-01-02 15:04:05Z" (now) "UTC"| quote }}
       labels:
-        neon.diana.service: {{ .Chart.Name }}
+        neon.diana.service: {{ $serviceName }}
         neon.project.name: neon
         neon.service.class: neon-core
     spec:
       restartPolicy: Always
       containers:
         - image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          name: {{ .Chart.Name }}
+          name: {{ $serviceName }}
           volumeMounts:
             - name: config
               mountPath: /config/neon/neon.yaml

diff --git a/neon_diana_utils/helm_charts/base/base-neon/templates/_service.tpl b/neon_diana_utils/helm_charts/base/base-neon/templates/_service.tpl
@@ -1,16 +1,17 @@
+{{ $serviceName := default .Chart.Name .Values.serviceName }}
 {{- define "base-neon.service" -}}
 apiVersion: v1
 kind: Service
 metadata:
   labels:
     neon.project.name: neon
-    neon.diana.service: {{ .Chart.Name }}
+    neon.diana.service: {{ $serviceName }}
     neon.service.class: neon-core
-  name: {{ .Chart.Name }}
+  name: {{ $serviceName }}
 spec:
   clusterIP: None
   selector:
-    neon.diana.service: {{ .Chart.Name }}
+    neon.diana.service: {{ $serviceName }}
   ports:
     - name: headless
       port: 55555

diff --git a/neon_diana_utils/helm_charts/neon/neon-audio/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-audio/Chart.yaml
@@ -3,10 +3,10 @@ name: neon-audio
 description: Deploy Neon Core Audio Service
 
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "1.0.1a5"
 
 dependencies:
   - name: base-neon
-    version: 0.0.1
+    version: 0.0.2
     repository: https://neongeckocom.github.io/neon-diana-utils
diff --git a/neon_diana_utils/helm_charts/neon/neon-audio/values.yaml b/neon_diana_utils/helm_charts/neon/neon-audio/values.yaml
@@ -1,3 +1,4 @@
+serviceName: neon-core-audio
 replicaCount: 1
 configMap: neon-config
 image:

diff --git a/neon_diana_utils/helm_charts/neon/neon-enclosure/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-enclosure/Chart.yaml
@@ -3,10 +3,10 @@ name: neon-enclosure
 description: Deploy Neon Core Enclosure Service
 
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "1.0.1a5"
 
 dependencies:
   - name: base-neon
-    version: 0.0.1
+    version: 0.0.2
     repository: https://neongeckocom.github.io/neon-diana-utils
diff --git a/neon_diana_utils/helm_charts/neon/neon-enclosure/values.yaml b/neon_diana_utils/helm_charts/neon/neon-enclosure/values.yaml
@@ -1,3 +1,4 @@
+serviceName: neon-core-enclosure
 replicaCount: 1
 configMap: neon-config
 image:

diff --git a/neon_diana_utils/helm_charts/neon/neon-gui/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-gui/Chart.yaml
@@ -3,10 +3,10 @@ name: neon-gui
 description: Deploy Neon Core GUI Service
 
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "1.0.1a5"
 
 dependencies:
   - name: base-neon
-    version: 0.0.1
+    version: 0.0.2
     repository: https://neongeckocom.github.io/neon-diana-utils
diff --git a/neon_diana_utils/helm_charts/neon/neon-gui/values.yaml b/neon_diana_utils/helm_charts/neon/neon-gui/values.yaml
@@ -1,3 +1,4 @@
+serviceName: neon-core-gui
 replicaCount: 1
 configMap: neon-config
 port:

diff --git a/neon_diana_utils/helm_charts/neon/neon-messagebus/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-messagebus/Chart.yaml
@@ -3,10 +3,10 @@ name: neon-messagebus
 description: Deploy Neon Core Messagebus
 
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "1.0.1a5"
 
 dependencies:
   - name: base-neon
-    version: 0.0.1
+    version: 0.0.2
     repository: https://neongeckocom.github.io/neon-diana-utils
diff --git a/neon_diana_utils/helm_charts/neon/neon-messagebus/values.yaml b/neon_diana_utils/helm_charts/neon/neon-messagebus/values.yaml
@@ -1,3 +1,4 @@
+serviceName: neon-core-messagebus
 replicaCount: 1
 configMap: neon-config
 port:

diff --git a/neon_diana_utils/helm_charts/neon/neon-skills/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-skills/Chart.yaml
@@ -3,10 +3,10 @@ name: neon-skills
 description: Deploy Neon Core Skills Service
 
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "1.0.1a5"
 
 dependencies:
   - name: base-neon
-    version: 0.0.1
+    version: 0.0.2
     repository: https://neongeckocom.github.io/neon-diana-utils
diff --git a/neon_diana_utils/helm_charts/neon/neon-skills/values.yaml b/neon_diana_utils/helm_charts/neon/neon-skills/values.yaml
@@ -1,3 +1,4 @@
+serviceName: neon-core-skills
 replicaCount: 1
 configMap: neon-config
 image:

diff --git a/neon_diana_utils/helm_charts/neon/neon-speech/Chart.yaml b/neon_diana_utils/helm_charts/neon/neon-speech/Chart.yaml
@@ -3,10 +3,10 @@ name: neon-speech
 description: Deploy Neon Core Speech (Voice) Service
 
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "1.0.1a5"
 
 dependencies:
   - name: base-neon
-    version: 0.0.1
+    version: 0.0.2
     repository: https://neongeckocom.github.io/neon-diana-utils
diff --git a/neon_diana_utils/helm_charts/neon/neon-speech/values.yaml b/neon_diana_utils/helm_charts/neon/neon-speech/values.yaml
@@ -1,3 +1,4 @@
+serviceName: neon-core-speech
 replicaCount: 1
 configMap: neon-config
 image: