fix events app port to service and port

charts/postgres-cluster/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: postgres-cluster
-version: 2.1.0
+version: 2.2.0
 description: Chart for cloudnative-pg cluster
 keywords:
   - database

charts/postgres-cluster/templates/_helpers.tpl

@@ -5,8 +5,7 @@ Expand the name of the chart.
   {{- if .Values.nameOverride }}
     {{- .Values.nameOverride | trunc 63 | trimSuffix "-" }}
   {{- else }}
-    {{ $version := split "." .Values.cluster.image.tag }}
-    {{- printf "postgresql-%s-%s" $version._0 .Release.Name | trunc 63 | trimSuffix "-" -}}
+    {{- printf "postgresql-%s-%s" .Values.cluster.image.majorVersion .Release.Name | trunc 63 | trimSuffix "-" -}}
   {{- end }}
 {{- end }}
 

charts/postgres-cluster/values.yaml

@@ -24,6 +24,7 @@ cluster:
   image:
     repository: ghcr.io/cloudnative-pg/postgresql
     tag: "16.2"
+    majorVersion: "16"
     pullPolicy: IfNotPresent
 
   # The UID and GID of the postgres user inside the image

charts/taiga/Chart.yaml

@@ -1,13 +1,13 @@
 apiVersion: v2
 name: taiga
-version: 0.1.0
+version: 0.1.8
 description: Chart for Taiga
 keywords:
   - kanban
   - project management
 sources:
   - https://github.com/taigaio
-  - https://github.com/rabbitmq/rabbitmq-server  
+  - https://github.com/rabbitmq/rabbitmq-server
   - https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq
 maintainers:
   - name: alexlebens

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,8 +46,8 @@ spec:
       securityContext:
         {{- with .Values.events.securityContext }}
         {{ toYaml . | nindent 8 }}
-        {{- end }}
-        containers:
+      {{- end }}
+      containers:
         - name: {{ template "taiga.fullname" . }}-events
           image: "{{ .Values.events.image.repository }}:{{ .Values.events.image.tag }}"
           imagePullPolicy: {{ .Values.events.image.pullPolicy }}
@@ -55,7 +55,10 @@ spec:
             {{ toYaml .Values.events.resources | nindent 12 }}
           ports:
             - name: taiga-events
-              containerPort: {{ .Values.events.service.port }}
+              containerPort: {{ .Values.events.http.service.port }}
+              protocol: TCP
+            - name: taiga-events-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-events-app
+      protocol: TCP
+      name: taiga-events-app
   selector:
     {{- include "taiga.events.matchLabels" . | nindent 4 }}
     {{- with .Values.events.service.extraSelectorLabels }}

charts/taiga/values.yaml

@@ -53,10 +53,6 @@ maxAge: 360
 # TODO: This values seems to be unused
 createInitialTemplates: false
 
-## Taiga's url
-##
-taigaUrl: ""
-
 ## Telemetry settings
 ##
 enableTelemetry: true
@@ -260,14 +256,6 @@ async:
     ##
     pullPolicy: IfNotPresent
 
-  ## async-taiga rabbitmq credentials
-  ## Must match to async-rabbitmq.auth.username and async-rabbitmq.auth.password
-  ## I don't use async-rabbitmq values because this bug: https://github.com/helm/helm/issues/2192
-  rabbitmq:
-    auth:
-      username: taiga
-      password: taiga
-
   ## Define the number of pods the deployment will create
   ## Do not change unless your persistent volume allows more than one writer, ie NFS
   ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/
@@ -414,14 +402,6 @@ events:
     ##
     pullPolicy: IfNotPresent
 
-  ## events-taiga rabbitmq credentials
-  ## Must match to events-rabbitmq.auth.username and events-rabbitmq.auth.password
-  ## I don't use events-rabbitmq values because this bug: https://github.com/helm/helm/issues/2192
-  rabbitmq:
-    auth:
-      username: taiga
-      password: taiga
-
   ## Pod Security Context
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
   ##
@@ -507,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