Skip to content

Commit 7d970fd

Browse files
author
Andrew Trice
authored
updated tf dependencies for generating helm chart (#23)
Signed-off-by: Andrew Trice <[email protected]>
1 parent 3d868df commit 7d970fd

File tree

1 file changed

+60
-58
lines changed

1 file changed

+60
-58
lines changed

‎main.tf‎

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11

22
locals {
3-
tmp_dir = "${path.cwd}/.tmp"
4-
ingress_host = "${var.hostname}-${var.releases_namespace}.${var.cluster_ingress_hostname}"
5-
ingress_url = "https://${local.ingress_host}"
6-
service_url = "http://sonarqube-sonarqube.${var.releases_namespace}:9000"
7-
secret_name = "sonarqube-access"
8-
config_name = "sonarqube-config"
3+
tmp_dir = "${path.cwd}/.tmp"
4+
ingress_host = "${var.hostname}-${var.releases_namespace}.${var.cluster_ingress_hostname}"
5+
ingress_url = "https://${local.ingress_host}"
6+
service_url = "http://sonarqube-sonarqube.${var.releases_namespace}:9000"
7+
secret_name = "sonarqube-access"
8+
config_name = "sonarqube-config"
99
config_sa_name = "sonarqube-job-sa"
10-
gitops_dir = var.gitops_dir != "" ? var.gitops_dir : "${path.cwd}/gitops"
11-
chart_dir = "${local.gitops_dir}/sonarqube"
12-
global_config = {
13-
storageClass = var.storage_class
14-
clusterType = var.cluster_type
10+
gitops_dir = var.gitops_dir != "" ? var.gitops_dir : "${path.cwd}/gitops"
11+
chart_dir = "${local.gitops_dir}/sonarqube"
12+
global_config = {
13+
storageClass = var.storage_class
14+
clusterType = var.cluster_type
1515
ingressSubdomain = var.cluster_ingress_hostname
1616
}
1717
sonarqube_config = {
1818
persistence = {
19-
enabled = false
19+
enabled = false
2020
storageClass = var.storage_class
2121
}
2222
serviceAccount = {
2323
create = true
24-
name = var.service_account_name
24+
name = var.service_account_name
2525
}
2626
postgresql = {
27-
enabled = !var.postgresql.external
28-
postgresqlServer = var.postgresql.external ? var.postgresql.hostname : ""
27+
enabled = !var.postgresql.external
28+
postgresqlServer = var.postgresql.external ? var.postgresql.hostname : ""
2929
postgresqlDatabase = var.postgresql.external ? var.postgresql.database_name : "sonarDB"
3030
postgresqlUsername = var.postgresql.external ? var.postgresql.username : "sonarUser"
3131
postgresqlPassword = var.postgresql.external ? var.postgresql.password : "sonarPass"
@@ -34,10 +34,10 @@ locals {
3434
}
3535
serviceAccount = {
3636
enabled = true
37-
name = var.service_account_name
37+
name = var.service_account_name
3838
}
3939
persistence = {
40-
enabled = false
40+
enabled = false
4141
storageClass = var.storage_class
4242
}
4343
volumePermissions = {
@@ -47,10 +47,10 @@ locals {
4747
ingress = {
4848
enabled = var.cluster_type == "kubernetes"
4949
annotations = {
50-
"kubernetes.io/ingress.class" = "nginx"
50+
"kubernetes.io/ingress.class" = "nginx"
5151
"nginx.ingress.kubernetes.io/proxy-body-size" = "20m"
52-
"ingress.kubernetes.io/proxy-body-size" = "20M"
53-
"ingress.bluemix.net/client-max-body-size" = "20m"
52+
"ingress.kubernetes.io/proxy-body-size" = "20M"
53+
"ingress.bluemix.net/client-max-body-size" = "20m"
5454
}
5555
hosts = [{
5656
name = local.ingress_host
@@ -67,9 +67,9 @@ locals {
6767
}
6868
}
6969
service_account_config = {
70-
name = var.service_account_name
70+
name = var.service_account_name
7171
create = false
72-
sccs = ["anyuid", "privileged"]
72+
sccs = ["anyuid", "privileged"]
7373
}
7474
config_service_account_config = {
7575
name = local.config_sa_name
@@ -88,72 +88,74 @@ locals {
8888
}
8989
]
9090
}
91-
ocp_route_config = {
92-
nameOverride = "sonarqube"
93-
targetPort = "http"
94-
app = "sonarqube"
95-
serviceName = "sonarqube-sonarqube"
96-
termination = "edge"
91+
ocp_route_config = {
92+
nameOverride = "sonarqube"
93+
targetPort = "http"
94+
app = "sonarqube"
95+
serviceName = "sonarqube-sonarqube"
96+
termination = "edge"
9797
insecurePolicy = "Redirect"
9898
consoleLink = {
99-
enabled = true
100-
section = "Cloud-Native Toolkit"
99+
enabled = true
100+
section = "Cloud-Native Toolkit"
101101
displayName = "SonarQube"
102-
imageUrl = "data:image/png;base64,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"
103-
category = "code-analysis"
102+
imageUrl = "data:image/png;base64,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"
103+
category = "code-analysis"
104104
}
105105
}
106106
tool_config = {
107-
name = "SonarQube"
107+
name = "SonarQube"
108108
privateUrl = local.service_url
109-
username = "admin"
110-
password = "admin"
109+
username = "admin"
110+
password = "admin"
111111
}
112-
job_config = {
113-
name = "sonarqube"
112+
job_config = {
113+
name = "sonarqube"
114114
serviceAccountName = local.config_sa_name
115-
command = "setup-sonarqube"
115+
command = "setup-sonarqube"
116116
secret = {
117117
name = local.secret_name
118118
key = "SONARQUBE_URL"
119119
}
120120
}
121121
}
122122

123-
module setup_clis {
123+
module "setup_clis" {
124124
source = "github.com/cloud-native-toolkit/terraform-util-clis.git"
125125

126126
clis = ["helm"]
127127
}
128128

129-
resource null_resource print_toolkit_namespace {
129+
resource "null_resource" "print_toolkit_namespace" {
130130
provisioner "local-exec" {
131131
command = "echo 'Toolkit namespace: ${var.toolkit_namespace}'"
132132
}
133133
}
134134

135-
resource null_resource setup-chart {
135+
resource "null_resource" "setup-chart" {
136136
depends_on = [null_resource.print_toolkit_namespace]
137137

138138
provisioner "local-exec" {
139139
command = "mkdir -p ${local.chart_dir} && cp -R ${path.module}/chart/sonarqube/* ${local.chart_dir}"
140140
}
141141
}
142142

143-
resource local_file sonarqube-values {
144-
content = yamlencode({
145-
global = local.global_config
146-
sonarqube = local.sonarqube_config
147-
service-account = local.service_account_config
143+
resource "local_file" "sonarqube-values" {
144+
depends_on = [null_resource.setup-chart]
145+
146+
content = yamlencode({
147+
global = local.global_config
148+
sonarqube = local.sonarqube_config
149+
service-account = local.service_account_config
148150
config-service-account = local.config_service_account_config
149-
ocp-route = local.ocp_route_config
150-
tool-config = local.tool_config
151-
setup-job = local.job_config
151+
ocp-route = local.ocp_route_config
152+
tool-config = local.tool_config
153+
setup-job = local.job_config
152154
})
153155
filename = "${local.chart_dir}/values.yaml"
154156
}
155157

156-
resource null_resource print-chart {
158+
resource "null_resource" "print-chart" {
157159
provisioner "local-exec" {
158160
command = "cat ${local_file.sonarqube-values.filename}"
159161
}
@@ -163,15 +165,15 @@ resource null_resource print-chart {
163165
}
164166
}
165167

166-
resource null_resource sonarqube_helm {
167-
depends_on = [local_file.sonarqube-values]
168-
count = var.mode != "setup" ? 1 : 0
168+
resource "null_resource" "sonarqube_helm" {
169+
depends_on = [local_file.sonarqube-values, null_resource.print-chart]
170+
count = var.mode != "setup" ? 1 : 0
169171

170172
triggers = {
171-
bin_dir = module.setup_clis.bin_dir
172-
namespace = var.releases_namespace
173+
bin_dir = module.setup_clis.bin_dir
174+
namespace = var.releases_namespace
173175
kubeconfig = var.cluster_config_file
174-
name = "sonarqube"
176+
name = "sonarqube"
175177
}
176178

177179
provisioner "local-exec" {
@@ -192,9 +194,9 @@ resource null_resource sonarqube_helm {
192194
}
193195
}
194196

195-
resource null_resource wait-for-config-job {
197+
resource "null_resource" "wait-for-config-job" {
196198
depends_on = [null_resource.sonarqube_helm]
197-
count = var.mode != "setup" ? 1 : 0
199+
count = var.mode != "setup" ? 1 : 0
198200

199201
provisioner "local-exec" {
200202
command = "kubectl wait -n ${var.releases_namespace} --for=condition=complete --timeout=30m job -l app=sonarqube"

0 commit comments

Comments
 (0)