Cleanup values

Author: niroz89

locals.tf

@@ -13,17 +13,14 @@ locals {
     prometheus_ingress_hosts       = jsonencode(var.prometheus_ingress_hosts)
     prometheus_ingress_tls         = jsonencode(var.prometheus_ingress_tls)
 
-    prometheus_operator_image_repository     = var.prometheus_operator_image_repository
-    prometheus_operator_image_tag            = var.prometheus_operator_image_tag
-    promethues_operator_nodeSelector         = var.promethues_operator_nodeSelector
-    prometheus_alertmanagerSpec_nodeSelector = var.prometheus_alertmanagerSpec_nodeSelector
-    prometheusSpec_nodeSelector              = var.prometheusSpec_nodeSelector
+    prometheus_operator_image_repository = var.prometheus_operator_image_repository
+    prometheus_operator_image_tag        = var.prometheus_operator_image_tag
+    promethues_operator_nodeselector     = var.promethues_operator_nodeselector
+    prometheus_alertmanager_nodeselector = var.prometheus_alertmanager_nodeselector
+    prometheus_nodeselector              = var.prometheus_nodeselector
   }
 
   grafana_values = {
-    ################################
-    ######## GRAFANA LOCALS ########
-    ################################
     replicas                  = var.replicas
     grafana_image_repository  = var.grafana_image_repository
     grafana_image_tag         = var.grafana_image_tag
@@ -91,10 +88,6 @@ locals {
 
     grafana_main_config = indent(2, var.grafana_main_config)
 
-    grafana_okta_enabled        = var.grafana_okta_enabled
-    grafana_oauth_client_id     = var.grafana_oauth_client_id
-    grafana_oauth_client_secret = var.grafana_oauth_client_secret
-
     grafana_image_repository = var.grafana_image_repository
     grafana_image_tag        = var.grafana_image_tag
 

templates/values.yaml

@@ -2431,7 +2431,7 @@ prometheus:
     ## Define which Nodes the Pods are scheduled on.
     ## ref: https://kubernetes.io/docs/user-guide/node-selection/
     ##
-    nodeSelector: ${prometheusSpec_nodeSelector}
+    nodeSelector: ${prometheus_nodeselector}
 
     ## Secrets is a list of Secrets in the same namespace as the Prometheus object, which shall be mounted into the Prometheus Pods.
     ## The Secrets are mounted into /etc/prometheus/secrets/. Secrets changes after initial creation of a Prometheus object are not

variables.tf

@@ -133,19 +133,19 @@ variable "prometheus_operator_image_tag" {
   default     = "v0.60.1"
 }
 
-variable "promethues_operator_nodeSelector" {
+variable "promethues_operator_nodeselector" {
   description = "Promethues Operator node selector"
   type        = any
   default     = ""
 }
 
-variable "prometheus_alertmanagerSpec_nodeSelector" {
+variable "prometheus_alertmanager_nodeselector" {
   description = "Alertmanager Spec node selector"
   type        = any
   default     = ""
 }
 
-variable "prometheusSpec_nodeSelector" {
+variable "prometheus_nodeselector" {
   description = "prometheus Spec node selector"
   type        = any
   default     = ""
@@ -482,24 +482,6 @@ grafana_net:
 EOF
 }
 
-variable "grafana_okta_enabled" {
-  description = "okta config to enable"
-  type        = bool
-  default     = false
-}
-
-variable "grafana_oauth_client_id" {
-  description = "client_id of the App"
-  type        = string
-  default     = ""
-}
-
-variable "grafana_oauth_client_secret" {
-  description = "client_secret between app and authorisation server"
-  type        = string
-  default     = ""
-}
-
 ### CLUSTER Config where grafana is deployed ###
 variable "cluster_name" {
   description = "Cluster Name where Grafana is deployed"