Skip to content

Commit 985343b

Browse files
fix the variable type and remove oauth config
1 parent 29bb0a0 commit 985343b

File tree

2 files changed

+13
-27
lines changed

2 files changed

+13
-27
lines changed

templates/okta_config.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

variables.tf

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,9 @@ variable "grafana_s3_image_bucket_region" {
123123
variable "recreate_pods" {
124124
description = "Recreate the pods with every helm update"
125125
type = bool
126-
default = "false"
126+
default = false
127127
}
128128

129-
130129
variable "grafana_service_account" {
131130
description = "Name of the Service Account for Grafana"
132131
type = string
@@ -201,14 +200,14 @@ variable "grafana_service_type" {
201200

202201
variable "grafana_service_port" {
203202
description = "Port of the service"
204-
type = string
205-
default = "80"
203+
type = number
204+
default = 80
206205
}
207206

208207
variable "grafana_service_target_port" {
209208
description = "Port in container to expose service"
210-
type = string
211-
default = "3000"
209+
type = number
210+
default = 3000
212211
}
213212

214213
variable "grafana_service_annotations" {
@@ -454,14 +453,14 @@ variable "grafana_okta_enabled" {
454453
default = false
455454
}
456455

457-
variable "GRAFANA_OAUTH_CLIENT_ID" {
458-
description = "GRAFANA_OAUTH_CLIENT_ID"
456+
variable "grafana_oauth_client_id" {
457+
description = "client_id of the App"
459458
type = string
460459
default = ""
461460
}
462461

463-
variable "GRAFANA_OAUTH_CLIENT_SECRET" {
464-
description = "GRAFANA_OAUTH_CLIENT_SECRET"
462+
variable "grafana_oauth_client_secret" {
463+
description = "client_secret between app and authorisation server"
465464
type = string
466465
default = ""
467466
}
@@ -591,14 +590,14 @@ variable "image_renderer_security_context" {
591590

592591
variable "image_renderer_port" {
593592
description = "image-renderer service port used by both service and deployment"
594-
type = string
595-
default = "8081"
593+
type = number
594+
default = 8081
596595
}
597596

598597
variable "image_renderer_target_port" {
599598
description = "image-renderer service targetPort used by both service and deployment"
600-
type = string
601-
default = "8081"
599+
type = number
600+
default = 8081
602601
}
603602

604603
variable "image_renderer_resources" {

0 commit comments

Comments
 (0)