fix
This commit is contained in:
@@ -13,6 +13,7 @@ resource "kubectl_manifest" "cm_env_back" {
|
|||||||
TAIGA_URL: https://${local.dns_name}
|
TAIGA_URL: https://${local.dns_name}
|
||||||
TAIGA_SITES_DOMAIN: ${local.dns_name}
|
TAIGA_SITES_DOMAIN: ${local.dns_name}
|
||||||
TAIGA_SITES_SCHEME: https
|
TAIGA_SITES_SCHEME: https
|
||||||
|
TAIGA_ASYNC_RABBITMQ_HOST: ${kubectl_manifest.rabbit.name}
|
||||||
SESSION_COOKIE_SECURE: "False"
|
SESSION_COOKIE_SECURE: "False"
|
||||||
CSRF_COOKIE_SECURE: "False"
|
CSRF_COOKIE_SECURE: "False"
|
||||||
ENABLE_TELEMETRY: "False"
|
ENABLE_TELEMETRY: "False"
|
||||||
@@ -33,7 +34,7 @@ resource "kubectl_manifest" "cm_env_front" {
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
name: "${var.instance}-${var.component}-from"
|
name: "${var.instance}-${var.component}-front"
|
||||||
labels: ${jsonencode(local.common_labels)}
|
labels: ${jsonencode(local.common_labels)}
|
||||||
namespace: ${var.namespace}
|
namespace: ${var.namespace}
|
||||||
data:
|
data:
|
||||||
|
|||||||
@@ -96,9 +96,9 @@ resource "kubectl_manifest" "svc_front" {
|
|||||||
spec:
|
spec:
|
||||||
type: ClusterIP
|
type: ClusterIP
|
||||||
ports:
|
ports:
|
||||||
- name: taiga-front
|
- name: http
|
||||||
port: 80
|
port: 80
|
||||||
targetPort: taiga-front
|
targetPort: http
|
||||||
selector: ${jsonencode(local.front_labels)}
|
selector: ${jsonencode(local.front_labels)}
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ resource "kubectl_manifest" "Deployment_taiga-events" {
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: taiga-events
|
name: "${var.instance}-${var.component}-events"
|
||||||
labels: ${jsonencode(local.event_all_labels)}
|
labels: ${jsonencode(local.event_all_labels)}
|
||||||
namespace: ${var.namespace}
|
namespace: ${var.namespace}
|
||||||
spec:
|
spec:
|
||||||
@@ -37,6 +37,26 @@ resource "kubectl_manifest" "Deployment_taiga-events" {
|
|||||||
ports:
|
ports:
|
||||||
- name: taiga-events
|
- name: taiga-events
|
||||||
containerPort: 8888
|
containerPort: 8888
|
||||||
|
- name: health
|
||||||
|
containerPort: 3023
|
||||||
|
livenessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /healthz
|
||||||
|
port: health
|
||||||
|
initialDelaySeconds: 20
|
||||||
|
periodSeconds: 10
|
||||||
|
timeoutSeconds: 5
|
||||||
|
successThreshold: 1
|
||||||
|
failureThreshold: 3
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /healthz
|
||||||
|
port: health
|
||||||
|
initialDelaySeconds: 5
|
||||||
|
periodSeconds: 10
|
||||||
|
timeoutSeconds: 1
|
||||||
|
successThreshold: 1
|
||||||
|
failureThreshold: 3
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
# livenessProbe:
|
# livenessProbe:
|
||||||
@@ -63,7 +83,7 @@ resource "kubectl_manifest" "Deployment_taiga-front" {
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: taiga-front
|
name: "${var.instance}-${var.component}-front"
|
||||||
labels: ${jsonencode(local.front_all_labels)}
|
labels: ${jsonencode(local.front_all_labels)}
|
||||||
namespace: ${var.namespace}
|
namespace: ${var.namespace}
|
||||||
spec:
|
spec:
|
||||||
@@ -85,8 +105,21 @@ resource "kubectl_manifest" "Deployment_taiga-front" {
|
|||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: ${kubectl_manifest.cm_env_front.name}
|
name: ${kubectl_manifest.cm_env_front.name}
|
||||||
ports:
|
ports:
|
||||||
- name: taiga-front
|
- name: http
|
||||||
containerPort: 80
|
containerPort: 80
|
||||||
|
livenessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /
|
||||||
|
port: http
|
||||||
|
httpHeaders:
|
||||||
|
initialDelaySeconds: 3
|
||||||
|
periodSeconds: 3
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /ready
|
||||||
|
port: http
|
||||||
|
initialDelaySeconds: 3
|
||||||
|
periodSeconds: 3
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,7 +128,7 @@ resource "kubectl_manifest" "Deployment_taiga-protected" {
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: taiga-protected
|
name: "${var.instance}-${var.component}-protected"
|
||||||
labels: ${jsonencode(local.protected_all_labels)}
|
labels: ${jsonencode(local.protected_all_labels)}
|
||||||
namespace: ${var.namespace}
|
namespace: ${var.namespace}
|
||||||
spec:
|
spec:
|
||||||
@@ -129,7 +162,7 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: taiga-back
|
name: "${var.instance}-${var.component}-back"
|
||||||
labels: ${jsonencode(local.back_all_labels)}
|
labels: ${jsonencode(local.back_all_labels)}
|
||||||
namespace: ${var.namespace}
|
namespace: ${var.namespace}
|
||||||
spec:
|
spec:
|
||||||
@@ -256,5 +289,18 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
|
|||||||
- name: taiga-conf
|
- name: taiga-conf
|
||||||
configMap:
|
configMap:
|
||||||
name: ${kubectl_manifest.cm_nginx.name}
|
name: ${kubectl_manifest.cm_nginx.name}
|
||||||
|
livenessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /
|
||||||
|
port: http
|
||||||
|
httpHeaders:
|
||||||
|
initialDelaySeconds: 3
|
||||||
|
periodSeconds: 3
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /ready
|
||||||
|
port: http
|
||||||
|
initialDelaySeconds: 3
|
||||||
|
periodSeconds: 3
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user