fix

apps/taiga/taiga_workload.tf

@@ -82,24 +82,6 @@ resource "kubectl_manifest" "Deployment_taiga-events" {
                 path: env.template
 EOF
 }
-            # livenessProbe:
-            #   httpGet:
-            #     path: /admin/login/
-            #     port: 8000
-            #   initialDelaySeconds: 20
-            #   periodSeconds: 10
-            #   timeoutSeconds: 5
-            #   successThreshold: 1
-            #   failureThreshold: 3
-            # readinessProbe:
-            #   httpGet:
-            #     path: /admin/login/
-            #     port: 8000
-            #   initialDelaySeconds: 5
-            #   periodSeconds: 10
-            #   timeoutSeconds: 1
-            #   successThreshold: 1
-            #   failureThreshold: 3
 
 resource "kubectl_manifest" "Deployment_taiga-front" {
   yaml_body  = <<-EOF
@@ -123,7 +105,10 @@ resource "kubectl_manifest" "Deployment_taiga-front" {
             imagePullPolicy: ${var.images.front.pull_policy}
             env:
             - name: GITLAB_CLIENT_ID
-              value: gitlab-api-client-id
+              valueFrom:
+                secretKeyRef:
+                  name: ${module.oauth2.secret_client_id_name}
+                  key: ${module.oauth2.secret_client_id_key}
             envFrom:
             - configMapRef:
                 name: ${kubectl_manifest.cm_env_front.name}
@@ -177,6 +162,10 @@ resource "kubectl_manifest" "Deployment_taiga-protected" {
             ports:
             - name: taiga-protected
               containerPort: 8003
+            livenessProbe:
+              initialDelaySeconds: 10
+              exec:
+                command: ["/bin/sh", "-c", "pidof -x gunicorn"]
 EOF
 }
 
@@ -200,6 +189,7 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
           - name: taiga-back
             image: "${var.images.back.registry}/${var.images.back.repository}:${var.images.back.tag}"
             imagePullPolicy: ${var.images.back.pull_policy}
+            command: ["/bin/back_entrypoint.sh"]
             env:
             - name: TAIGA_EVENTS_RABBITMQ_HOST
               value: ${kubectl_manifest.rabbit.name}
@@ -216,9 +206,15 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
                   name: ${kubectl_manifest.rabbit_user_secret.name}
                   key: password
             - name: GITLAB_API_CLIENT_ID
-              value: gitlab-api-client-id
+              valueFrom:
+                secretKeyRef:
+                  name: ${module.oauth2.secret_client_id_name}
+                  key: ${module.oauth2.secret_client_id_key}
             - name: GITLAB_API_CLIENT_SECRET
-              value: gitlab-api-client-secret
+              valueFrom:
+                secretKeyRef:
+                  name: ${module.oauth2.secret_client_secret_name}
+                  key: ${module.oauth2.secret_client_secret_key}
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
@@ -233,6 +229,9 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
             - name: taiga-back
               containerPort: 8000
             volumeMounts:
+            - name: scripts
+              mountPath: /bin/back_entrypoint.sh
+              subPath: back_entrypoint.sh
             - name: data
               mountPath: /taiga-back/static
               subPath: static
@@ -260,8 +259,7 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
           - name: taiga-async
             image: "${var.images.back.registry}/${var.images.back.repository}:${var.images.back.tag}"
             imagePullPolicy: ${var.images.back.pull_policy}
-            command:
-            - /taiga-back/docker/async_entrypoint.sh
+            command: ["/bin/async_entrypoint.sh"]
             env:
             - name: RABBITMQ_USER
               valueFrom:
@@ -284,6 +282,9 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
             - configMapRef:
                 name: ${kubectl_manifest.cm_env_back.name}
             volumeMounts:
+            - name: scripts
+              mountPath: /bin/async_entrypoint.sh
+              subPath: async_entrypoint.sh
             - name: data
               mountPath: /taiga-back/static
               subPath: static
@@ -306,6 +307,15 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
             - name: taiga-conf
               mountPath: /etc/nginx/conf.d/
           volumes:
+          - name: scripts
+            configMap:
+              name: ${kubectl_manifest.cm_scripts.name}
+              defaultMode: 0755
+              items:
+              - key: back_entrypoint.sh
+                path: back_entrypoint.sh
+              - key: async_entrypoint.sh
+                path: async_entrypoint.sh
           - name: data
             persistentVolumeClaim:
               claimName: ${kubectl_manifest.pvc.name}