change rabbitmq chart naming to generate proper dns and app names

charts/taiga/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: taiga
-version: 0.1.6
+version: 0.1.11
 description: Chart for Taiga
 keywords:
   - kanban
@@ -16,9 +16,9 @@ dependencies:
   - name: rabbitmq
     version: 13.0.3
     repository: https://charts.bitnami.com/bitnami
-    alias: taiga-async-rabbitmq
+    alias: async-rabbitmq
   - name: rabbitmq
     version: 13.0.3
     repository: https://charts.bitnami.com/bitnami
-    alias: taiga-events-rabbitmq
+    alias: events-rabbitmq
 appVersion: 6.7.7

charts/taiga/templates/deployment-events.yaml

@@ -55,7 +55,10 @@ spec:
             {{ toYaml .Values.events.resources | nindent 12 }}
           ports:
             - name: taiga-events
-              containerPort: {{ .Values.events.service.port }}
+              containerPort: {{ .Values.events.service.http.port }}
+              protocol: TCP
+            - name: taiga-app
+              containerPort: {{ .Values.events.service.app.port }}
               protocol: TCP
           env:
             - name: TAIGA_SECRET_KEY
@@ -70,12 +73,14 @@ spec:
                 secretKeyRef:
                   name: {{ index .Values "taiga-events-rabbitmq" "auth" "existingPasswordSecret" }}
                   key: {{ index .Values "taiga-events-rabbitmq" "auth" "existingSecretPasswordKey" }}
+            - name: APP_PORT
+              value: "{{ .Values.events.service.app.port }}"
 
           {{- if .Values.events.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: /admin/login/
-              port: {{ .Values.events.service.port }}
+              path: /healthz
+              port: {{ .Values.events.service.app.port }}
             initialDelaySeconds: {{ .Values.events.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.events.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.events.livenessProbe.timeoutSeconds }}
@@ -86,8 +91,8 @@ spec:
           {{- if .Values.events.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: /admin/login/
-              port: {{ .Values.events.service.port }}
+              path: /healthz
+              port: {{ .Values.events.service.app.port }}
             initialDelaySeconds: {{ .Values.events.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.events.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.events.readinessProbe.timeoutSeconds }}

charts/taiga/templates/service.yaml

@@ -55,10 +55,14 @@ metadata:
 spec:
   type: {{ .Values.events.service.type }}
   ports:
-    - port: {{ .Values.events.service.port }}
+    - port: {{ .Values.events.service.http.port }}
       targetPort: taiga-events
       protocol: TCP
       name: taiga-events
+    - port: {{ .Values.events.service.app.port }}
+      targetPort: taiga-app
+      protocol: TCP
+      name: taiga-app
   selector:
     {{- include "taiga.events.matchLabels" . | nindent 4 }}
     {{- with .Values.events.service.extraSelectorLabels }}

charts/taiga/values.yaml

@@ -347,7 +347,7 @@ async:
 ## Async Rabbitmq
 ## https://artifacthub.io/packages/helm/bitnami/rabbitmq?modal=values-schema
 ##
-taiga-async-rabbitmq:
+async-rabbitmq:
   auth:
     ## @param auth.username RabbitMQ application username
     ## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables
@@ -487,13 +487,18 @@ events:
     # -- Allow adding additional match labels
     extraSelectorLabels: {}
 
-    # -- HTTP port number
-    port: 8888
+    http:
+      # -- HTTP port number
+      port: 8888
+
+    app:
+      # -- HTTP port number
+      port: 3023
 
 ## Events Rabbitmq
 ## https://artifacthub.io/packages/helm/bitnami/rabbitmq?modal=values-schema
 ##
-taiga-events-rabbitmq:
+events-rabbitmq:
   auth:
     ## @param auth.username RabbitMQ application username
     ## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables