Add backtracking and new SonarQube installation

divyanshujainSquareops · divyanshujainSquareops · commit e7e25177750f · 2025-04-28T12:29:15.000Z
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | Version of the Jenkins chart that will be used to deploy Jenkins application. | `string` | `"2025.2.0"` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Name of the Kubernetes namespace where the Jenkins deployment will be deployed. | `string` | `"sonarqube"` | no |
-| <a name="input_sonarqube_config"></a> [sonarqube\_config](#input\_sonarqube\_config) | Specify the configuration settings for Sonarqube, including the hostname, storage options, and custom YAML values. | `any` | <pre>{<br/>  "grafana_monitoring_enabled": false,<br/>  "hostname": "",<br/>  "postgresql_external_server_url": "",<br/>  "postgresql_password_external": "",<br/>  "postgresql_volume_size": "",<br/>  "sonarqube_volume_size": "",<br/>  "storage_class_name": "",<br/>  "values_yaml": ""<br/>}</pre> | no |
+| <a name="input_sonarqube_config"></a> [sonarqube\_config](#input\_sonarqube\_config) | Specify the configuration settings for Sonarqube, including the hostname, storage options, and custom YAML values. | `any` | <pre>{<br/>  "grafana_monitoring_enabled": false,<br/>  "hostname": "",<br/>  "postgresql_external_server_url": "",<br/>  "postgresql_password_external": "",<br/>  "postgresql_volume_size": "",<br/>  "sonarqube_volume_size": "",<br/>  "storage_class_name": "",<br/>  "updateExistingSonarqube": false,<br/>  "values_yaml": ""<br/>}</pre> | no |
 
 ## Outputs
 
diff --git a/examples/complete/aws/main.tf b/examples/complete/aws/main.tf
@@ -1,7 +1,7 @@
 locals {
-  name        = ""
-  region      = ""
-  environment = ""
+  name        = "test"
+  region      = "ap-south-1"
+  environment = "squareops"
   additional_tags = {
     Owner      = "organization_name"
     Expires    = "Never"
@@ -19,10 +19,13 @@ module "sonarqube" {
     sonarqube_volume_size          = "5Gi"
     postgresql_volume_size         = "10Gi"
     grafana_monitoring_enabled     = false
-    monitoringPasscode             = "xxxxxxx"
-    sonarqube_current_password     = "xxxxxxx"     # if you upgrade sonarqube then you have to provide your previous sonarqube password ##Secret name=sonarqube-postgresql
-    postgresql_current_password    = "xxxxxxxxxxx" # if you upgrade sonarqube then you have to provide your previous postgresql password ##Secret name=sonarqube-sonarqube-admin-password
+    monitoringPasscode             = ""
     postgresql_password_external   = ""
     postgresql_external_server_url = ""
+    sonarqube_password             = ""
+
+    updateExistingSonarqube     = true
+    sonarqube_current_password  = "orWZVlhIXZvD3W4RXA7h" # if you upgrade sonarqube then you have to provide your previous sonarqube password ##Secret name=sonarqube-postgresql
+    postgresql_current_password = "ZIMOR6c3joeYJvAyVUnu" # if you upgrade sonarqube then you have to provide your previous postgresql password ##Secret name=sonarqube-sonarqube-admin-password
   }
 }
diff --git a/examples/complete/aws/provider.tf b/examples/complete/aws/provider.tf
@@ -6,11 +6,11 @@ provider "aws" {
 }
 
 data "aws_eks_cluster" "cluster" {
-  name = ""
+  name = "stage-sqops"
 }
 
 data "aws_eks_cluster_auth" "cluster" {
-  name = ""
+  name = "stage-sqops"
 }
 
 
diff --git a/examples/complete/azure/main.tf b/examples/complete/azure/main.tf
@@ -19,10 +19,13 @@ module "sonarqube" {
     sonarqube_volume_size          = "5Gi"
     postgresql_volume_size         = "10Gi"
     grafana_monitoring_enabled     = false
-    monitoringPasscode             = "xxxxxxx"
-    sonarqube_current_password     = "xxxxxxx"     # if you upgrade sonarqube then you have to provide your previous sonarqube password ##Secret name=sonarqube-postgresql
-    postgresql_current_password    = "xxxxxxxxxxx" # if you upgrade sonarqube then you have to provide your previous postgresql password ##Secret name=sonarqube-sonarqube-admin-password
+    monitoringPasscode             = ""
     postgresql_password_external   = ""
     postgresql_external_server_url = ""
+    sonarqube_password             = ""
+
+    updateExistingSonarqube     = true
+    sonarqube_current_password  = "orWZVlhIXZvD3W4RXA7h" # if you upgrade sonarqube then you have to provide your previous sonarqube password ##Secret name=sonarqube-postgresql
+    postgresql_current_password = "ZIMOR6c3joeYJvAyVUnu" # if you upgrade sonarqube then you have to provide your previous postgresql password ##Secret name=sonarqube-sonarqube-admin-password
   }
 }
diff --git a/examples/complete/gcp/main.tf b/examples/complete/gcp/main.tf
@@ -19,10 +19,13 @@ module "sonarqube" {
     sonarqube_volume_size          = "5Gi"
     postgresql_volume_size         = "10Gi"
     grafana_monitoring_enabled     = false
-    monitoringPasscode             = "xxxxxxx"
-    sonarqube_current_password     = "xxxxxxx"     # if you upgrade sonarqube then you have to provide your previous sonarqube password ##Secret name=sonarqube-postgresql
-    postgresql_current_password    = "xxxxxxxxxxx" # if you upgrade sonarqube then you have to provide your previous postgresql password ##Secret name=sonarqube-sonarqube-admin-password
+    monitoringPasscode             = ""
     postgresql_password_external   = ""
     postgresql_external_server_url = ""
+    sonarqube_password             = ""
+
+    updateExistingSonarqube     = true
+    sonarqube_current_password  = "orWZVlhIXZvD3W4RXA7h" # if you upgrade sonarqube then you have to provide your previous sonarqube password ##Secret name=sonarqube-postgresql
+    postgresql_current_password = "ZIMOR6c3joeYJvAyVUnu" # if you upgrade sonarqube then you have to provide your previous postgresql password ##Secret name=sonarqube-sonarqube-admin-password
   }
 }
diff --git a/main.tf b/main.tf
@@ -34,13 +34,13 @@ resource "helm_release" "sonarqube" {
       volume_size                    = var.sonarqube_config.sonarqube_volume_size
       sonarqube_sc                   = var.sonarqube_config.storage_class_name
       postgresql_enable              = var.sonarqube_config.postgresql_external_server_url != "" ? false : true
-      sonarqube_password             = random_password.sonarqube_password.result
-      sonarqube_current_password     = var.sonarqube_config.sonarqube_current_password
-      postgresql_password            = var.sonarqube_config.postgresql_current_password != "" ? var.sonarqube_config.postgresql_current_password : random_password.postgresql_password.result
+      sonarqube_password             = var.sonarqube_config.sonarqube_password != "" ? var.sonarqube_config.sonarqube_password : random_password.sonarqube_password.result
+      sonarqube_current_password     = var.sonarqube_config.updateExistingSonarqube == true ? var.sonarqube_config.sonarqube_current_password : "admin"
+      postgresql_password            = var.sonarqube_config.postgresql_current_password != "" && var.sonarqube_config.updateExistingSonarqube == true ? var.sonarqube_config.postgresql_current_password : random_password.postgresql_password.result
       postgresql_disk_size           = var.sonarqube_config.postgresql_volume_size
       prometheus_exporter_enable     = var.sonarqube_config.grafana_monitoring_enabled
-      postgresql_password_external   = var.sonarqube_config.postgresql_password_external
       postgresql_external_server_url = var.sonarqube_config.postgresql_external_server_url
+      postgresql_password_external   = var.sonarqube_config.postgresql_password_external
 
     }),
     var.sonarqube_config.values_yaml
@@ -62,6 +62,7 @@ resource "helm_release" "sonarqube" {
   }
 }
 resource "kubernetes_manifest" "migration_job" {
+  count = var.sonarqube_config.updateExistingSonarqube ? 1 : 0
   manifest = {
     apiVersion = "batch/v1"
     kind       = "Job"
diff --git a/variables.tf b/variables.tf
@@ -9,6 +9,7 @@ variable "sonarqube_config" {
     grafana_monitoring_enabled     = false
     postgresql_password_external   = ""
     postgresql_external_server_url = ""
+    updateExistingSonarqube        = false
   }
   description = "Specify the configuration settings for Sonarqube, including the hostname, storage options, and custom YAML values."
 }
@@ -19,6 +20,7 @@ variable "chart_version" {
   description = "Version of the Jenkins chart that will be used to deploy Jenkins application."
 }
 
+
 variable "namespace" {
   type        = string
   default     = "sonarqube"

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ provider "aws" {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`data "aws_eks_cluster" "cluster" {`
`9`		`- name = ""`
	`9`	`+ name = "stage-sqops"`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`data "aws_eks_cluster_auth" "cluster" {`
`13`		`- name = ""`
	`13`	`+ name = "stage-sqops"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ variable "sonarqube_config" {`
`9`	`9`	`grafana_monitoring_enabled = false`
`10`	`10`	`postgresql_password_external = ""`
`11`	`11`	`postgresql_external_server_url = ""`
	`12`	`+ updateExistingSonarqube = false`
`12`	`13`	`}`
`13`	`14`	`description = "Specify the configuration settings for Sonarqube, including the hostname, storage options, and custom YAML values."`
`14`	`15`	`}`
`@@ -19,6 +20,7 @@ variable "chart_version" {`
`19`	`20`	`description = "Version of the Jenkins chart that will be used to deploy Jenkins application."`
`20`	`21`	`}`
`21`	`22`
	`23`	`+`
`22`	`24`	`variable "namespace" {`
`23`	`25`	`type = string`
`24`	`26`	`default = "sonarqube"`