From 9640731603959534f9bcf78a8e06531167dc3633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 24 May 2024 12:39:36 +0200 Subject: [PATCH] fix --- apps/sonar/sonar_ConfigMap.tf | 2 +- apps/sonar/sonar_workload.tf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/sonar/sonar_ConfigMap.tf b/apps/sonar/sonar_ConfigMap.tf index 71e4417..f1e677f 100644 --- a/apps/sonar/sonar_ConfigMap.tf +++ b/apps/sonar/sonar_ConfigMap.tf @@ -8,7 +8,7 @@ resource "kubectl_manifest" "cm_env" { namespace: ${var.namespace} data: SONAR_JDBC_USERNAME: ${var.component} - SONAR_JDBC_URL: jdbc:postgresql://${var.instance}-${var.component}-rw.${var.namespace}.svc:5432/${var.component} + SONAR_JDBC_URL: jdbc:postgresql://${var.instance}-${var.component}-pg-rw.${var.namespace}.svc:5432/${var.component} SONAR_WEB_CONTEXT: / SONAR_WEB_JAVAOPTS: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8000:/opt/sonarqube/conf/prometheus-config.yaml SONAR_CE_JAVAOPTS: -javaagent:/opt/sonarqube/data/jmx_prometheus_javaagent.jar=8001:/opt/sonarqube/conf/prometheus-ce-config.yaml diff --git a/apps/sonar/sonar_workload.tf b/apps/sonar/sonar_workload.tf index 718be7b..fd74757 100644 --- a/apps/sonar/sonar_workload.tf +++ b/apps/sonar/sonar_workload.tf @@ -41,7 +41,7 @@ resource "kubectl_manifest" "Deployment_sonar-sonarqube" { seccompProfile: type: RuntimeDefault command: ["/bin/bash", "-c"] - args: ["set -o pipefail;for i in {1..200};do (echo > /dev/tcp/${var.instance}-${var.component}-rw/5432) && exit 0; sleep 2;done; exit 1"] + args: ["set -o pipefail;for i in {1..200};do (echo > /dev/tcp/${var.instance}-${var.component}-pg-rw/5432) && exit 0; sleep 2;done; exit 1"] - name: configure image: "${var.images.sonar.registry}/${var.images.sonar.repository}:${var.images.sonar.tag}" imagePullPolicy: ${var.images.sonar.pull_policy} @@ -95,7 +95,7 @@ resource "kubectl_manifest" "Deployment_sonar-sonarqube" { - name: SONAR_JDBC_PASSWORD valueFrom: secretKeyRef: - name: ${var.instance}-${var.component}-rw.${var.namespace}.svc + name: ${var.instance}-${var.component}-pg-app key: password envFrom: - secretRef: