Compare commits

...

6 Commits

7 changed files with 30 additions and 19 deletions

View File

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

View File

@@ -232,12 +232,12 @@ spec:
{{ end }} {{ end }}
- name: RABBITMQ_USER - name: RABBITMQ_USER
value: "{{ index .Values "taiga-async-rabbitmq" "auth" "username" }}" value: "{{ index .Values "async-rabbitmq" "auth" "username" }}"
- name: RABBITMQ_PASS - name: RABBITMQ_PASS
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ index .Values "taiga-async-rabbitmq" "auth" "existingPasswordSecret" }} name: {{ index .Values "async-rabbitmq" "auth" "existingPasswordSecret" }}
key: {{ index .Values "taiga-async-rabbitmq" "auth" "existingSecretPasswordKey" }} key: {{ index .Values "async-rabbitmq" "auth" "existingSecretPasswordKey" }}
{{ if .Values.ingress.enabled }} {{ if .Values.ingress.enabled }}
- name: TAIGA_SITES_DOMAIN - name: TAIGA_SITES_DOMAIN
@@ -456,12 +456,12 @@ spec:
{{ end }} {{ end }}
- name: RABBITMQ_USER - name: RABBITMQ_USER
value: "{{ index .Values "taiga-async-rabbitmq" "auth" "username" }}" value: "{{ index .Values "async-rabbitmq" "auth" "username" }}"
- name: RABBITMQ_PASS - name: RABBITMQ_PASS
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ index .Values "taiga-async-rabbitmq" "auth" "existingPasswordSecret" }} name: {{ index .Values "async-rabbitmq" "auth" "existingPasswordSecret" }}
key: {{ index .Values "taiga-async-rabbitmq" "auth" "existingSecretPasswordKey" }} key: {{ index .Values "async-rabbitmq" "auth" "existingSecretPasswordKey" }}
{{ if .Values.ingress.enabled }} {{ if .Values.ingress.enabled }}
- name: TAIGA_SITES_DOMAIN - name: TAIGA_SITES_DOMAIN

View File

@@ -55,9 +55,9 @@ spec:
{{ toYaml .Values.events.resources | nindent 12 }} {{ toYaml .Values.events.resources | nindent 12 }}
ports: ports:
- name: taiga-events - name: taiga-events
containerPort: {{ .Values.events.http.service.port }} containerPort: {{ .Values.events.service.http.port }}
protocol: TCP protocol: TCP
- name: taiga-events-app - name: taiga-app
containerPort: {{ .Values.events.service.app.port }} containerPort: {{ .Values.events.service.app.port }}
protocol: TCP protocol: TCP
env: env:
@@ -67,12 +67,12 @@ spec:
name: "{{ .Values.secretKey.existingSecretName }}" name: "{{ .Values.secretKey.existingSecretName }}"
key: "{{ .Values.secretKey.existingSecretKey }}" key: "{{ .Values.secretKey.existingSecretKey }}"
- name: RABBITMQ_USER - name: RABBITMQ_USER
value: "{{ index .Values "taiga-events-rabbitmq" "auth" "username" }}" value: "{{ index .Values "events-rabbitmq" "auth" "username" }}"
- name: RABBITMQ_PASS - name: RABBITMQ_PASS
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: {{ index .Values "taiga-events-rabbitmq" "auth" "existingPasswordSecret" }} name: {{ index .Values "events-rabbitmq" "auth" "existingPasswordSecret" }}
key: {{ index .Values "taiga-events-rabbitmq" "auth" "existingSecretPasswordKey" }} key: {{ index .Values "events-rabbitmq" "auth" "existingSecretPasswordKey" }}
- name: APP_PORT - name: APP_PORT
value: "{{ .Values.events.service.app.port }}" value: "{{ .Values.events.service.app.port }}"

View File

@@ -72,6 +72,8 @@ spec:
value: "false" value: "false"
- name: ENABLE_GITLAB_AUTH - name: ENABLE_GITLAB_AUTH
value: "false" value: "false"
- name: ENABLE_OIDC
value: "{{ .Values.oidc.enabled }}"
- name: ENABLE_SLACK - name: ENABLE_SLACK
value: "{{ .Values.enableSlack }}" value: "{{ .Values.enableSlack }}"
- name: ENABLE_GITHUB_IMPORTER - name: ENABLE_GITHUB_IMPORTER

View File

@@ -48,6 +48,15 @@ spec:
port: port:
name: taiga-back name: taiga-back
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{ if .Values.oidc.enabled }}
- path: /oidc
backend:
service:
name: "{{ template "taiga.fullname" . }}-back"
port:
name: taiga-back
pathType: ImplementationSpecific
{{- end }}
- path: /events - path: /events
backend: backend:
service: service:

View File

@@ -60,9 +60,9 @@ spec:
protocol: TCP protocol: TCP
name: taiga-events name: taiga-events
- port: {{ .Values.events.service.app.port }} - port: {{ .Values.events.service.app.port }}
targetPort: taiga-events-app targetPort: taiga-app
protocol: TCP protocol: TCP
name: taiga-events-app name: taiga-app
selector: selector:
{{- include "taiga.events.matchLabels" . | nindent 4 }} {{- include "taiga.events.matchLabels" . | nindent 4 }}
{{- with .Values.events.service.extraSelectorLabels }} {{- with .Values.events.service.extraSelectorLabels }}

View File

@@ -347,7 +347,7 @@ async:
## Async Rabbitmq ## Async Rabbitmq
## https://artifacthub.io/packages/helm/bitnami/rabbitmq?modal=values-schema ## https://artifacthub.io/packages/helm/bitnami/rabbitmq?modal=values-schema
## ##
taiga-async-rabbitmq: async-rabbitmq:
auth: auth:
## @param auth.username RabbitMQ application username ## @param auth.username RabbitMQ application username
## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables ## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables
@@ -498,7 +498,7 @@ events:
## Events Rabbitmq ## Events Rabbitmq
## https://artifacthub.io/packages/helm/bitnami/rabbitmq?modal=values-schema ## https://artifacthub.io/packages/helm/bitnami/rabbitmq?modal=values-schema
## ##
taiga-events-rabbitmq: events-rabbitmq:
auth: auth:
## @param auth.username RabbitMQ application username ## @param auth.username RabbitMQ application username
## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables ## ref: https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq#environment-variables