Skip to content

Commit cc37cbf

Browse files
franklinpashokfranklinpashok
committed
rearrange variable sequence and seperate local variables
1 parent 76eef34 commit cc37cbf

File tree

3 files changed

+124
-125
lines changed

3 files changed

+124
-125
lines changed

‎locals.tf

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
locals {
2+
values = {
3+
prometheus_image_repository = var.prometheus_image_repository
4+
prometheus_image_tag = var.prometheus_image_tag
5+
prometheus_host_url = var.prometheus_host_url
6+
7+
prometheus_ingress_enabled = var.prometheus_ingress_enabled
8+
prometheus_ingress_annotations = jsonencode(var.prometheus_ingress_annotations)
9+
prometheus_ingress_labels = jsonencode(var.prometheus_ingress_labels)
10+
prometheus_ingress_hosts = jsonencode(var.prometheus_ingress_hosts)
11+
prometheus_ingress_tls = jsonencode(var.prometheus_ingress_tls)
12+
13+
prometheus_operator_image_repository = var.prometheus_operator_image_repository
14+
prometheus_operator_image_tag = var.prometheus_operator_image_tag
15+
promethues_operator_nodeSelector = var.promethues_operator_nodeSelector
16+
prometheus_alertmanagerSpec_nodeSelector = var.prometheus_alertmanagerSpec_nodeSelector
17+
prometheusSpec_nodeSelector = var.prometheusSpec_nodeSelector
18+
19+
################################
20+
######## GRAFANA LOCALS ########
21+
################################
22+
replicas = var.replicas
23+
grafana_image_repository = var.grafana_image_repository
24+
grafana_image_tag = var.grafana_image_tag
25+
grafana_image_pull_policy = var.grafana_image_pull_policy
26+
27+
grafana_service_account = var.grafana_service_account
28+
grafana_service_account_annotations = jsonencode(var.grafana_service_account_annotations)
29+
30+
grafana_psp_enable = var.grafana_psp_enable
31+
grafana_psp_use_app_armor = var.grafana_psp_use_app_armor
32+
grafana_pdb = jsonencode(var.grafana_pdb)
33+
grafana_command = jsonencode(var.grafana_command)
34+
35+
grafana_extra_configmap_mounts = jsonencode(var.grafana_extra_configmap_mounts)
36+
grafana_extra_empty_dir_mounts = jsonencode(var.grafana_extra_empty_dir_mounts)
37+
38+
grafana_priority_class_name = var.grafana_priority_class_name
39+
40+
grafana_pod_annotations = jsonencode(var.grafana_pod_annotations)
41+
grafana_annotations = jsonencode(var.grafana_annotations)
42+
grafana_resources = jsonencode(var.grafana_resources)
43+
grafana_node_selector = jsonencode(var.grafana_node_selector)
44+
grafana_tolerations = jsonencode(var.grafana_tolerations)
45+
grafana_affinity = jsonencode(var.grafana_affinity)
46+
grafana_security_context = jsonencode(var.grafana_security_context)
47+
48+
grafana_env = jsonencode(var.grafana_env)
49+
grafana_env_from_secret = var.grafana_env_from_secret
50+
grafana_extra_secret_mounts = jsonencode(var.grafana_extra_secret_mounts)
51+
grafana_extra_volume_mounts = jsonencode(var.grafana_extra_volume_mounts)
52+
53+
grafana_enable_service_links = var.grafana_enable_service_links
54+
55+
grafana_service_type = var.grafana_service_type
56+
grafana_service_port = var.grafana_service_port
57+
grafana_service_target_port = var.grafana_service_target_port
58+
grafana_service_annotations = jsonencode(var.grafana_service_annotations)
59+
grafana_service_labels = jsonencode(var.grafana_service_labels)
60+
61+
grafana_ingress_enabled = var.grafana_ingress_enabled
62+
grafana_ingress_annotations = jsonencode(var.grafana_ingress_annotations)
63+
grafana_ingress_labels = jsonencode(var.grafana_ingress_labels)
64+
grafana_ingress_hosts = jsonencode(var.grafana_ingress_hosts)
65+
grafana_ingress_tls = jsonencode(var.grafana_ingress_tls)
66+
67+
grafana_extra_init_containers = jsonencode(var.grafana_extra_init_containers)
68+
grafana_extra_containers = jsonencode(var.grafana_extra_containers)
69+
70+
grafana_persistence_enabled = var.grafana_persistence_enabled
71+
grafana_persistence_size = var.grafana_persistence_size
72+
grafana_persistence_storage_class_name = var.grafana_persistence_storage_class_name
73+
grafana_persistence_annotations = jsonencode(var.grafana_persistence_annotations)
74+
grafana_persistence_existing_claim = var.grafana_persistence_existing_claim
75+
76+
grafana_init_chown_data_enabled = var.grafana_init_chown_data_enabled
77+
grafana_init_chown_data_resources = jsonencode(var.grafana_init_chown_data_resources)
78+
79+
grafana_plugins = jsonencode(var.grafana_plugins)
80+
81+
grafana_datasources = indent(2, var.grafana_datasources)
82+
grafana_notifiers = indent(2, var.grafana_notifiers)
83+
grafana_dashboard_providers = indent(2, var.grafana_dashboard_providers)
84+
grafana_dashboards = indent(2, var.grafana_dashboards)
85+
grafana_dashboards_config_maps = indent(2, var.grafana_dashboards_config_maps)
86+
87+
grafana_main_config = indent(2, var.grafana_main_config)
88+
grafana_db_config = indent(2, var.grafana_db_config)
89+
grafana_okta_config = indent(2, var.grafana_okta_config)
90+
grafana_okta_enabled = var.grafana_okta_enabled
91+
grafana_oauth_client_id = var.grafana_oauth_client_id
92+
grafana_oauth_client_secret = var.grafana_oauth_client_secret
93+
94+
grafana_image_repository = var.grafana_image_repository
95+
grafana_image_tag = var.grafana_image_tag
96+
97+
cluster_name = var.cluster_name
98+
cluster_oidc_issuer_url = var.cluster_oidc_issuer_url
99+
cluster_oidc_issuer_arn = var.cluster_oidc_issuer_arn
100+
101+
grafana_ldap_existing_secret = var.grafana_ldap_existing_secret
102+
grafana_ldap_config = jsonencode(var.grafana_ldap_config)
103+
104+
grafana_smtp_existing_secret = var.grafana_smtp_existing_secret
105+
grafana_smtp_user_key = var.grafana_smtp_user_key
106+
grafana_smtp_password_key = var.grafana_smtp_password_key
107+
108+
grafana_admin_password_key = var.grafana_admin_password_key
109+
110+
image_renderer_enabled = var.image_renderer_enabled
111+
image_renderer_replicas = var.image_renderer_replicas
112+
image_renderer_image_repository = var.image_renderer_image_repository
113+
image_renderer_image_tag = var.image_renderer_image_tag
114+
image_renderer_service_account = var.image_renderer_service_account
115+
image_renderer_port = var.image_renderer_port
116+
image_renderer_target_port = var.image_renderer_target_port
117+
image_renderer_priority_class_name = var.image_renderer_priority_class_name
118+
image_renderer_env = jsonencode(var.image_renderer_env)
119+
image_renderer_annotations = jsonencode(var.image_renderer_annotations)
120+
image_renderer_pod_annotations = jsonencode(var.image_renderer_pod_annotations)
121+
image_renderer_security_context = jsonencode(var.image_renderer_security_context)
122+
image_renderer_resources = jsonencode(var.image_renderer_resources)
123+
}
124+
}

‎main.tf

Lines changed: 0 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,3 @@
1-
locals {
2-
values = {
3-
prometheus_image_repository = var.prometheus_image_repository
4-
prometheus_image_tag = var.prometheus_image_tag
5-
prometheus_host_url = var.prometheus_host_url
6-
7-
prometheus_ingress_enabled = var.prometheus_ingress_enabled
8-
prometheus_ingress_annotations = jsonencode(var.prometheus_ingress_annotations)
9-
prometheus_ingress_labels = jsonencode(var.prometheus_ingress_labels)
10-
prometheus_ingress_hosts = jsonencode(var.prometheus_ingress_hosts)
11-
prometheus_ingress_tls = jsonencode(var.prometheus_ingress_tls)
12-
13-
prometheus_operator_image_repository = var.prometheus_operator_image_repository
14-
prometheus_operator_image_tag = var.prometheus_operator_image_tag
15-
promethues_operator_nodeSelector = var.promethues_operator_nodeSelector
16-
prometheus_alertmanagerSpec_nodeSelector = var.prometheus_alertmanagerSpec_nodeSelector
17-
prometheusSpec_nodeSelector = var.prometheusSpec_nodeSelector
18-
19-
################################
20-
######## GRAFANA LOCALS ########
21-
################################
22-
replicas = var.replicas
23-
grafana_image_repository = var.grafana_image_repository
24-
grafana_image_tag = var.grafana_image_tag
25-
grafana_image_pull_policy = var.grafana_image_pull_policy
26-
27-
grafana_service_account = var.grafana_service_account
28-
grafana_service_account_annotations = jsonencode(var.grafana_service_account_annotations)
29-
30-
grafana_psp_enable = var.grafana_psp_enable
31-
grafana_psp_use_app_armor = var.grafana_psp_use_app_armor
32-
grafana_pdb = jsonencode(var.grafana_pdb)
33-
grafana_command = jsonencode(var.grafana_command)
34-
35-
grafana_extra_configmap_mounts = jsonencode(var.grafana_extra_configmap_mounts)
36-
grafana_extra_empty_dir_mounts = jsonencode(var.grafana_extra_empty_dir_mounts)
37-
38-
grafana_priority_class_name = var.grafana_priority_class_name
39-
40-
grafana_pod_annotations = jsonencode(var.grafana_pod_annotations)
41-
grafana_annotations = jsonencode(var.grafana_annotations)
42-
grafana_resources = jsonencode(var.grafana_resources)
43-
grafana_node_selector = jsonencode(var.grafana_node_selector)
44-
grafana_tolerations = jsonencode(var.grafana_tolerations)
45-
grafana_affinity = jsonencode(var.grafana_affinity)
46-
grafana_security_context = jsonencode(var.grafana_security_context)
47-
48-
grafana_env = jsonencode(var.grafana_env)
49-
grafana_env_from_secret = var.grafana_env_from_secret
50-
grafana_extra_secret_mounts = jsonencode(var.grafana_extra_secret_mounts)
51-
grafana_extra_volume_mounts = jsonencode(var.grafana_extra_volume_mounts)
52-
53-
grafana_enable_service_links = var.grafana_enable_service_links
54-
55-
grafana_service_type = var.grafana_service_type
56-
grafana_service_port = var.grafana_service_port
57-
grafana_service_target_port = var.grafana_service_target_port
58-
grafana_service_annotations = jsonencode(var.grafana_service_annotations)
59-
grafana_service_labels = jsonencode(var.grafana_service_labels)
60-
61-
grafana_ingress_enabled = var.grafana_ingress_enabled
62-
grafana_ingress_annotations = jsonencode(var.grafana_ingress_annotations)
63-
grafana_ingress_labels = jsonencode(var.grafana_ingress_labels)
64-
grafana_ingress_hosts = jsonencode(var.grafana_ingress_hosts)
65-
grafana_ingress_tls = jsonencode(var.grafana_ingress_tls)
66-
67-
grafana_extra_init_containers = jsonencode(var.grafana_extra_init_containers)
68-
grafana_extra_containers = jsonencode(var.grafana_extra_containers)
69-
70-
grafana_persistence_enabled = var.grafana_persistence_enabled
71-
grafana_persistence_size = var.grafana_persistence_size
72-
grafana_persistence_storage_class_name = var.grafana_persistence_storage_class_name
73-
grafana_persistence_annotations = jsonencode(var.grafana_persistence_annotations)
74-
grafana_persistence_existing_claim = var.grafana_persistence_existing_claim
75-
76-
grafana_init_chown_data_enabled = var.grafana_init_chown_data_enabled
77-
grafana_init_chown_data_resources = jsonencode(var.grafana_init_chown_data_resources)
78-
79-
grafana_plugins = jsonencode(var.grafana_plugins)
80-
81-
grafana_datasources = indent(2, var.grafana_datasources)
82-
grafana_notifiers = indent(2, var.grafana_notifiers)
83-
grafana_dashboard_providers = indent(2, var.grafana_dashboard_providers)
84-
grafana_dashboards = indent(2, var.grafana_dashboards)
85-
grafana_dashboards_config_maps = indent(2, var.grafana_dashboards_config_maps)
86-
87-
grafana_main_config = indent(2, var.grafana_main_config)
88-
grafana_db_config = indent(2, var.grafana_db_config)
89-
grafana_okta_config = indent(2, var.grafana_okta_config)
90-
grafana_okta_enabled = var.grafana_okta_enabled
91-
grafana_oauth_client_id = var.grafana_oauth_client_id
92-
grafana_oauth_client_secret = var.grafana_oauth_client_secret
93-
94-
grafana_image_repository = var.grafana_image_repository
95-
grafana_image_tag = var.grafana_image_tag
96-
97-
cluster_name = var.cluster_name
98-
cluster_oidc_issuer_url = var.cluster_oidc_issuer_url
99-
cluster_oidc_issuer_arn = var.cluster_oidc_issuer_arn
100-
101-
grafana_ldap_existing_secret = var.grafana_ldap_existing_secret
102-
grafana_ldap_config = jsonencode(var.grafana_ldap_config)
103-
104-
grafana_smtp_existing_secret = var.grafana_smtp_existing_secret
105-
grafana_smtp_user_key = var.grafana_smtp_user_key
106-
grafana_smtp_password_key = var.grafana_smtp_password_key
107-
108-
grafana_admin_password_key = var.grafana_admin_password_key
109-
110-
image_renderer_enabled = var.image_renderer_enabled
111-
image_renderer_replicas = var.image_renderer_replicas
112-
image_renderer_image_repository = var.image_renderer_image_repository
113-
image_renderer_image_tag = var.image_renderer_image_tag
114-
image_renderer_service_account = var.image_renderer_service_account
115-
image_renderer_port = var.image_renderer_port
116-
image_renderer_target_port = var.image_renderer_target_port
117-
image_renderer_priority_class_name = var.image_renderer_priority_class_name
118-
image_renderer_env = jsonencode(var.image_renderer_env)
119-
image_renderer_annotations = jsonencode(var.image_renderer_annotations)
120-
image_renderer_pod_annotations = jsonencode(var.image_renderer_pod_annotations)
121-
image_renderer_security_context = jsonencode(var.image_renderer_security_context)
122-
image_renderer_resources = jsonencode(var.image_renderer_resources)
123-
}
124-
}
125-
1261
resource "helm_release" "kube_prometheus_stack" {
1272
name = var.release_name
1283
chart = var.chart_name

‎outputs.tf

Whitespace-only changes.

0 commit comments

Comments
 (0)