fix http service value

charts/taiga/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: taiga
-version: 0.1.3
+version: 0.1.9
 description: Chart for Taiga
 keywords:
   - kanban

charts/taiga/templates/deployment-back.yaml

@@ -213,7 +213,7 @@ spec:
               value: "False"
           {{ end }}
 
-          {{ if .Values.trelloImporter }}
+          {{ if .Values.trelloImporter.enabled }}
             - name: ENABLE_TRELLO_IMPORTER
               value: "True"
             - name: TRELLO_IMPORTER_API_KEY
@@ -437,7 +437,7 @@ spec:
               value: "False"
           {{ end }}
 
-          {{ if .Values.trelloImporter }}
+          {{ if .Values.trelloImporter.enabled }}
             - name: ENABLE_TRELLO_IMPORTER
               value: "True"
             - name: TRELLO_IMPORTER_API_KEY

charts/taiga/templates/deployment-events.yaml

@@ -46,51 +46,56 @@ spec:
       securityContext:
         {{- with .Values.events.securityContext }}
         {{ toYaml . | nindent 8 }}
-        {{- end }}
-        containers:
-          - name: {{ template "taiga.fullname" . }}-events
-            image: "{{ .Values.events.image.repository }}:{{ .Values.events.image.tag }}"
-            imagePullPolicy: {{ .Values.events.image.pullPolicy }}
-            resources:
-              {{ toYaml .Values.events.resources | nindent 12 }}
-            ports:
-              - name: taiga-events
-                containerPort: {{ .Values.events.service.port }}
-                protocol: TCP
-            env:
-              - name: TAIGA_SECRET_KEY
-                valueFrom:
-                  secretKeyRef:
-                    name: "{{ .Values.secretKey.existingSecretName }}"
-                    key: "{{ .Values.secretKey.existingSecretKey }}"
-              - name: RABBITMQ_USER
-                value: "{{ index .Values "taiga-events-rabbitmq" "auth" "username" }}"
-              - name: RABBITMQ_PASS
-                valueFrom:
-                  secretKeyRef:
-                    name: {{ index .Values "taiga-events-rabbitmq" "auth" "existingPasswordSecret" }}
-                    key: {{ index .Values "taiga-events-rabbitmq" "auth" "existingSecretPasswordKey" }}
+      {{- end }}
+      containers:
+        - name: {{ template "taiga.fullname" . }}-events
+          image: "{{ .Values.events.image.repository }}:{{ .Values.events.image.tag }}"
+          imagePullPolicy: {{ .Values.events.image.pullPolicy }}
+          resources:
+            {{ toYaml .Values.events.resources | nindent 12 }}
+          ports:
+            - name: taiga-events
+              containerPort: {{ .Values.events.service.http.port }}
+              protocol: TCP
+            - name: taiga-events-app
+              containerPort: {{ .Values.events.service.app.port }}
+              protocol: TCP
+          env:
+            - name: TAIGA_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Values.secretKey.existingSecretName }}"
+                  key: "{{ .Values.secretKey.existingSecretKey }}"
+            - name: RABBITMQ_USER
+              value: "{{ index .Values "taiga-events-rabbitmq" "auth" "username" }}"
+            - name: RABBITMQ_PASS
+              valueFrom:
+                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 }}
-              initialDelaySeconds: {{ .Values.events.livenessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.events.livenessProbe.periodSeconds }}
-              timeoutSeconds: {{ .Values.events.livenessProbe.timeoutSeconds }}
-              successThreshold: {{ .Values.events.livenessProbe.successThreshold }}
-              failureThreshold: {{ .Values.events.livenessProbe.failureThreshold }}
-            {{- end }}
+          {{- if .Values.events.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: {{ .Values.events.service.app.port }}
+            initialDelaySeconds: {{ .Values.events.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.events.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.events.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.events.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.events.livenessProbe.failureThreshold }}
+          {{- end }}
 
-            {{- if .Values.events.readinessProbe.enabled }}
-            readinessProbe:
-              httpGet:
-                path: /admin/login/
-                port: {{ .Values.events.service.port }}
-              initialDelaySeconds: {{ .Values.events.readinessProbe.initialDelaySeconds }}
-              periodSeconds: {{ .Values.events.readinessProbe.periodSeconds }}
-              timeoutSeconds: {{ .Values.events.readinessProbe.timeoutSeconds }}
-              successThreshold: {{ .Values.events.readinessProbe.successThreshold }}
-              failureThreshold: {{ .Values.events.readinessProbe.failureThreshold }}
-            {{- end }}
+          {{- if .Values.events.readinessProbe.enabled }}
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: {{ .Values.events.service.app.port }}
+            initialDelaySeconds: {{ .Values.events.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.events.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.events.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.events.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.events.readinessProbe.failureThreshold }}
+          {{- end }}

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-events-app
+      protocol: TCP
+      name: taiga-events-app
   selector:
     {{- include "taiga.events.matchLabels" . | nindent 4 }}
     {{- with .Values.events.service.extraSelectorLabels }}

charts/taiga/values.yaml

@@ -487,8 +487,13 @@ 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