fix
This commit is contained in:
@@ -29,10 +29,10 @@ resource "kubectl_manifest" "post_install_job" {
|
||||
- name: post-config
|
||||
image: "${var.images.sonar.registry}/${var.images.sonar.repository}:${var.images.sonar.tag}"
|
||||
imagePullPolicy: ${var.images.sonar.pull_policy}
|
||||
command: ["/bin/bash", "-cx"]
|
||||
command: ["/bin/bash", "-c"]
|
||||
args:
|
||||
- >-
|
||||
curl -v -u admin:admin -X POST "http://${module.service.name}.${var.namespace}.svc/api/users/change_password?login=admin&previousPassword=admin&password=$ADMIN_PASSWORD"
|
||||
curl -o /dev/null -s -w "%{http_code}\n" -u admin:admin -X POST "http://${module.service.name}.${var.namespace}.svc/api/users/change_password?login=admin&previousPassword=admin&password=$ADMIN_PASSWORD"
|
||||
envFrom:
|
||||
- secretRef:
|
||||
name: ${kubectl_manifest.secret.name}
|
||||
|
||||
@@ -6,7 +6,7 @@ locals {
|
||||
}
|
||||
|
||||
module "service" {
|
||||
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//service"
|
||||
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//service?ref=0.3.0"
|
||||
component = var.component
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
@@ -19,7 +19,7 @@ module "service" {
|
||||
}
|
||||
|
||||
module "ingress" {
|
||||
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress"
|
||||
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress?ref=0.3.0"
|
||||
component = ""
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
@@ -34,7 +34,7 @@ module "ingress" {
|
||||
}
|
||||
|
||||
module "application" {
|
||||
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application"
|
||||
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//application?ref=0.3.0"
|
||||
component = var.component
|
||||
instance = var.instance
|
||||
app_group = var.app_group
|
||||
@@ -48,7 +48,7 @@ module "application" {
|
||||
}
|
||||
|
||||
module "saml" {
|
||||
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//saml"
|
||||
source = "git::https://git.solidite.fr/vynil/kydah-modules.git//saml?ref=0.3.0"
|
||||
component = var.component
|
||||
instance = var.instance
|
||||
acs_path = "oauth2/callback/saml"
|
||||
|
||||
@@ -6,6 +6,8 @@ resource "kubectl_manifest" "Deployment_sonar-sonarqube" {
|
||||
name: "${var.instance}-${var.component}"
|
||||
labels: ${jsonencode(local.sonar_all_labels)}
|
||||
namespace: ${var.namespace}
|
||||
annotations:
|
||||
configmap.reloader.stakater.com/reload: "${kubectl_manifest.cm_scripts.name},${kubectl_manifest.cm_files.name}"
|
||||
spec:
|
||||
replicas: 1
|
||||
revisionHistoryLimit: 10
|
||||
|
||||
@@ -6,6 +6,9 @@ resource "kubectl_manifest" "Deployment_taiga-events" {
|
||||
name: "${var.instance}-${var.component}-events"
|
||||
labels: ${jsonencode(local.event_all_labels)}
|
||||
namespace: ${var.namespace}
|
||||
annotations:
|
||||
configmap.reloader.stakater.com/reload: "${kubectl_manifest.cm_events.name}"
|
||||
secret.reloader.stakater.com/reload: "${kubectl_manifest.secret.name},${kubectl_manifest.rabbit_user_secret.name}"
|
||||
spec:
|
||||
selector:
|
||||
matchLabels: ${jsonencode(local.event_labels)}
|
||||
@@ -91,6 +94,9 @@ resource "kubectl_manifest" "Deployment_taiga-front" {
|
||||
name: "${var.instance}-${var.component}-front"
|
||||
labels: ${jsonencode(local.front_all_labels)}
|
||||
namespace: ${var.namespace}
|
||||
annotations:
|
||||
configmap.reloader.stakater.com/reload: "${kubectl_manifest.cm_env_front.name}"
|
||||
secret.reloader.stakater.com/reload: "${module.oauth2.secret_client_id_name}"
|
||||
spec:
|
||||
selector:
|
||||
matchLabels: ${jsonencode(local.front_labels)}
|
||||
@@ -139,6 +145,8 @@ resource "kubectl_manifest" "Deployment_taiga-protected" {
|
||||
name: "${var.instance}-${var.component}-protected"
|
||||
labels: ${jsonencode(local.protected_all_labels)}
|
||||
namespace: ${var.namespace}
|
||||
annotations:
|
||||
secret.reloader.stakater.com/reload: "${kubectl_manifest.secret.name}"
|
||||
spec:
|
||||
selector:
|
||||
matchLabels: ${jsonencode(local.protected_labels)}
|
||||
@@ -177,6 +185,9 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
|
||||
name: "${var.instance}-${var.component}-back"
|
||||
labels: ${jsonencode(local.back_all_labels)}
|
||||
namespace: ${var.namespace}
|
||||
annotations:
|
||||
configmap.reloader.stakater.com/reload: "${kubectl_manifest.cm_env_back.name},${kubectl_manifest.cm_scripts.name},${kubectl_manifest.cm_nginx.name}"
|
||||
secret.reloader.stakater.com/reload: "${kubectl_manifest.rabbit_user_secret.name},${module.oauth2.secret_client_id_name},${var.instance}-${var.component}-pg-app,${kubectl_manifest.secret.name}"
|
||||
spec:
|
||||
selector:
|
||||
matchLabels: ${jsonencode(local.back_labels)}
|
||||
|
||||
Reference in New Issue
Block a user