Fix grafana missing var

TykTechnologies · Oct 18, 2024 · 58537fa · 58537fa
1 parent 82e5fa7
commit 58537fa
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 61 deletions.
diff --git a/.github/custom-tests/comparison/all/deployments.tf b/.github/custom-tests/comparison/all/deployments.tf
@@ -34,6 +34,4 @@ kong_deployment_type = "Deployment"
 gravitee_enabled         = true
 gravitee_version         = "4.4"
 gravitee_deployment_type = "Deployment"
-gravitee_nginx_enabled   = false
-
-grafana_service_type = "ClusterIP"
+gravitee_nginx_enabled   = false
diff --git a/.github/custom-tests/comparison/gravitee/deployments.tf b/.github/custom-tests/comparison/gravitee/deployments.tf
@@ -34,6 +34,4 @@ kong_deployment_type = "Deployment"
 gravitee_enabled         = true
 gravitee_version         = "4.4"
 gravitee_deployment_type = "Deployment"
-gravitee_nginx_enabled   = false
-
-grafana_service_type = "ClusterIP"
+gravitee_nginx_enabled   = false
diff --git a/.github/custom-tests/comparison/kong/deployments.tf b/.github/custom-tests/comparison/kong/deployments.tf
@@ -34,6 +34,4 @@ kong_deployment_type = "Deployment"
 gravitee_enabled         = false
 gravitee_version         = "4.4"
 gravitee_deployment_type = "Deployment"
-gravitee_nginx_enabled   = false
-
-grafana_service_type = "ClusterIP"
+gravitee_nginx_enabled   = false
diff --git a/.github/custom-tests/tyk-open-telemetry/deployments.tf b/.github/custom-tests/tyk-open-telemetry/deployments.tf
@@ -34,6 +34,4 @@ kong_deployment_type = "Deployment"
 
 gravitee_enabled         = false
 gravitee_version         = "4.4"
-gravitee_deployment_type = "Deployment"
-
-grafana_service_type = "ClusterIP"
+gravitee_deployment_type = "Deployment"
diff --git a/.github/workflows/AKS.yml b/.github/workflows/AKS.yml
@@ -92,7 +92,6 @@ jobs:
             --var-file=main.tfvars \
             --var="kubernetes_config_context=performance-testing" \
             --var="tyk_license=${{ secrets.DASH_LICENSE }}" \
-            --var="grafana_service_type=LoadBalancer" \
             --auto-approve
 
       - name: Destroy AKS cluster

diff --git a/.github/workflows/EKS.yml b/.github/workflows/EKS.yml
@@ -93,7 +93,6 @@ jobs:
             --var-file=main.tfvars \
             --var="kubernetes_config_context=performance-testing" \
             --var="tyk_license=${{ secrets.DASH_LICENSE }}" \
-            --var="grafana_service_type=LoadBalancer" \
             --auto-approve
 
       - name: Destroy EKS cluster

diff --git a/.github/workflows/GKE.yml b/.github/workflows/GKE.yml
@@ -100,7 +100,6 @@ jobs:
             --var-file=main.tfvars \
             --var="kubernetes_config_context=performance-testing" \
             --var="tyk_license=${{ secrets.DASH_LICENSE }}" \
-            --var="grafana_service_type=LoadBalancer" \
             --auto-approve
 
       - name: Destroy GKE cluster

diff --git a/.github/workflows/clean-up.yml b/.github/workflows/clean-up.yml
@@ -115,7 +115,6 @@ jobs:
             --var="kubernetes_config_context=performance-testing" \
             --var="tyk_version=${{ inputs.tyk_version }}" \
             --var="tyk_license=${{ secrets.DASH_LICENSE }}" \
-            --var="grafana_service_type=LoadBalancer" \
             --auto-approve
 
       - name: Destroy AKS cluster

diff --git a/.github/workflows/deployments.yml b/.github/workflows/deployments.yml
@@ -147,7 +147,6 @@ jobs:
             --var="rate_limit_enabled=${{ inputs.rate_limit_enabled }}" \
             --var="tyk_version=${{ inputs.tyk_version }}" \
             --var="tyk_license=${{ secrets.DASH_LICENSE }}" \
-            --var="grafana_service_type=LoadBalancer" \
             --var-file=main.tfvars \
             --auto-approve
 

diff --git a/.github/workflows/full_performance_test.yml b/.github/workflows/full_performance_test.yml
@@ -141,7 +141,6 @@ jobs:
             --var="kubernetes_config_context=performance-testing" \
             --var="tyk_version=${{ inputs.tyk_version }}" \
             --var="tyk_license=${{ secrets.DASH_LICENSE }}" \
-            --var="grafana_service_type=NodePort" \
             --auto-approve
 
       - name: Run Tests
@@ -169,7 +168,6 @@ jobs:
           terraform destroy \
             --var="kubernetes_config_context=performance-testing" \
             --var="tyk_license=${{ secrets.DASH_LICENSE }}" \
-            --var="grafana_service_type=LoadBalancer" \
             --auto-approve
 
       - name: Destroy AKS cluster

diff --git a/deployments/README.md b/deployments/README.md
@@ -12,43 +12,43 @@
 
 ## Inputs
 
-| Name | Description | Type | Default | Required |
-|------|-------------|------|---------|:--------:|
-| <a name="input_analytics_database_enabled"></a> [analytics\_database\_enabled](#input\_analytics\_database\_enabled) | Enables metrics collection on gateway services and stores them in gateways default database. | `bool` | `false` | no |
-| <a name="input_analytics_prometheus_enabled"></a> [analytics\_prometheus\_enabled](#input\_analytics\_prometheus\_enabled) | Enables metrics collection on gateway services and aggregates them on an endpoint for prometheus to scrape. | `bool` | `false` | no |
-| <a name="input_auth_enabled"></a> [auth\_enabled](#input\_auth\_enabled) | Enables authorization on gateway APIs. | `bool` | `false` | no |
-| <a name="input_auth_type"></a> [auth\_type](#input\_auth\_type) | Authorization type on gateway APIs. authToken or JWT. | `string` | `authToken` | no |
-| <a name="input_external_traffic_policy"></a> [external\_traffic\_policy](#input\_external\_traffic\_policy) | Gateway service external traffic policy. Set to 'local' when using 1 k8s node per gateway and 'cluster' when using multiple k8s nodes per gateway for optimal routing performance. | `string` | `"local"` | no |
-| <a name="input_grafana_service_type"></a> [grafana\_service\_type](#input\_grafana\_service\_type) | Grafana Dashboard service type. Set to 'LoadBalancer' type to be able to access Dashboard over the internet. | `string` | n/a | yes |
-| <a name="input_gravitee_deployment_type"></a> [gravitee\_deployment\_type](#input\_gravitee\_deployment\_type) | Gravitee Gateway deployment type. | `string` | `"Deployment"` | no |
-| <a name="input_gravitee_enabled"></a> [gravitee\_enabled](#input\_gravitee\_enabled) | Enable Gravitee services. | `bool` | `false` | no |
-| <a name="input_gravitee_nginx_enabled"></a> [gravitee\_nginx\_enabled](#input\_gravitee\_nginx\_enabled) | Gravitee Nginx controller for exposing UI and Portal. | `bool` | `false` | no |
-| <a name="input_gravitee_version"></a> [gravitee\_version](#input\_gravitee\_version) | Gravitee Gateway version. | `string` | `"4.4"` | no |
-| <a name="input_hpa_avg_cpu_util_percentage"></a> [hpa\_avg\_cpu\_util\_percentage](#input\_hpa\_avg\_cpu\_util\_percentage) | Gateways Horizontal Pod Autoscaler average CPU utilization percentage for scaling. | `number` | `80` | no |
-| <a name="input_hpa_enabled"></a> [hpa\_enabled](#input\_hpa\_enabled) | Option to enable gateways Horizontal Pod Autoscaler. | `bool` | `true` | no |
-| <a name="input_hpa_max_replica_count"></a> [hpa\_max\_replica\_count](#input\_hpa\_max\_replica\_count) | Gateways Horizontal Pod Autoscaler max replica count. | `number` | `4` | no |
-| <a name="input_kong_deployment_type"></a> [kong\_deployment\_type](#input\_kong\_deployment\_type) | Kong Gateway deployment type. | `string` | `"Deployment"` | no |
-| <a name="input_kong_enabled"></a> [kong\_enabled](#input\_kong\_enabled) | Enable Kong services. | `bool` | `false` | no |
-| <a name="input_kong_version"></a> [kong\_version](#input\_kong\_version) | Kong Gateway version. | `string` | `"3.6"` | no |
-| <a name="input_kubernetes_config_context"></a> [kubernetes\_config\_context](#input\_kubernetes\_config\_context) | Kubernetes config context. | `string` | `"minikube"` | no |
+| Name | Description | Type | Default            | Required |
+|------|-------------|------|--------------------|:--------:|
+| <a name="input_analytics_database_enabled"></a> [analytics\_database\_enabled](#input\_analytics\_database\_enabled) | Enables metrics collection on gateway services and stores them in gateways default database. | `bool` | `false`            | no |
+| <a name="input_analytics_prometheus_enabled"></a> [analytics\_prometheus\_enabled](#input\_analytics\_prometheus\_enabled) | Enables metrics collection on gateway services and aggregates them on an endpoint for prometheus to scrape. | `bool` | `false`            | no |
+| <a name="input_auth_enabled"></a> [auth\_enabled](#input\_auth\_enabled) | Enables authorization on gateway APIs. | `bool` | `false`            | no |
+| <a name="input_auth_type"></a> [auth\_type](#input\_auth\_type) | Authorization type on gateway APIs. authToken or JWT. | `string` | `authToken`        | no |
+| <a name="input_external_traffic_policy"></a> [external\_traffic\_policy](#input\_external\_traffic\_policy) | Gateway service external traffic policy. Set to 'local' when using 1 k8s node per gateway and 'cluster' when using multiple k8s nodes per gateway for optimal routing performance. | `string` | `"local"`          | no |
+| <a name="input_grafana_service_type"></a> [grafana\_service\_type](#input\_grafana\_service\_type) | Grafana Dashboard service type. Set to 'LoadBalancer' type to be able to access Dashboard over the internet. | `string` | `ClusterIP`        | yes |
+| <a name="input_gravitee_deployment_type"></a> [gravitee\_deployment\_type](#input\_gravitee\_deployment\_type) | Gravitee Gateway deployment type. | `string` | `"Deployment"`     | no |
+| <a name="input_gravitee_enabled"></a> [gravitee\_enabled](#input\_gravitee\_enabled) | Enable Gravitee services. | `bool` | `false`            | no |
+| <a name="input_gravitee_nginx_enabled"></a> [gravitee\_nginx\_enabled](#input\_gravitee\_nginx\_enabled) | Gravitee Nginx controller for exposing UI and Portal. | `bool` | `false`            | no |
+| <a name="input_gravitee_version"></a> [gravitee\_version](#input\_gravitee\_version) | Gravitee Gateway version. | `string` | `"4.4"`            | no |
+| <a name="input_hpa_avg_cpu_util_percentage"></a> [hpa\_avg\_cpu\_util\_percentage](#input\_hpa\_avg\_cpu\_util\_percentage) | Gateways Horizontal Pod Autoscaler average CPU utilization percentage for scaling. | `number` | `80`               | no |
+| <a name="input_hpa_enabled"></a> [hpa\_enabled](#input\_hpa\_enabled) | Option to enable gateways Horizontal Pod Autoscaler. | `bool` | `true`             | no |
+| <a name="input_hpa_max_replica_count"></a> [hpa\_max\_replica\_count](#input\_hpa\_max\_replica\_count) | Gateways Horizontal Pod Autoscaler max replica count. | `number` | `4`                | no |
+| <a name="input_kong_deployment_type"></a> [kong\_deployment\_type](#input\_kong\_deployment\_type) | Kong Gateway deployment type. | `string` | `"Deployment"`     | no |
+| <a name="input_kong_enabled"></a> [kong\_enabled](#input\_kong\_enabled) | Enable Kong services. | `bool` | `false`            | no |
+| <a name="input_kong_version"></a> [kong\_version](#input\_kong\_version) | Kong Gateway version. | `string` | `"3.6"`            | no |
+| <a name="input_kubernetes_config_context"></a> [kubernetes\_config\_context](#input\_kubernetes\_config\_context) | Kubernetes config context. | `string` | `"minikube"`       | no |
 | <a name="input_kubernetes_config_path"></a> [kubernetes\_config\_path](#input\_kubernetes\_config\_path) | Kubernetes config file path. | `string` | `"~/.kube/config"` | no |
-| <a name="input_node_labels"></a> [node\_labels](#input\_node\_labels) | Mapping for node labels to determine the values for node selectors for each deployment. | <pre>object({<br> dependencies = string<br> tyk = string<br> tyk-upstream = string<br> tyk-tests = string<br> tyk-resources = string<br> kong = string<br> kong-upstream = string<br> kong-tests = string<br> kong-resources = string<br> gravitee = string<br> gravitee-upstream = string<br> gravitee-tests = string<br> gravitee-resources = string<br> })</pre> | `null` | no |
-| <a name="input_open_telemetry_enabled"></a> [open\_telemetry\_enabled](#input\_open\_telemetry\_enabled) | Enable Open Telemetry and trace collection on gateway services. | `bool` | `false` | no |
-| <a name="input_open_telemetry_sampling_ratio"></a> [open\_telemetry\_sampling\_ratio](#input\_open\_telemetry\_sampling\_ratio) | Open Telemetry sampling ration 0 to 1.0 range. | `string` | `"0.5"` | no |
-| <a name="input_quota_enabled"></a> [quota\_enabled](#input\_quota\_enabled) | Enables quota management on gateway APIs. | `bool` | `false` | no |
-| <a name="input_quota_per"></a> [quota\_per](#input\_quota\_per) | Quota management reset interval in seconds. | `number` | `3600` | no |
-| <a name="input_quota_rate"></a> [quota\_rate](#input\_quota\_rate) | Quota management rate on gateway APIs. | `number` | `999999` | no |
-| <a name="input_rate_limit_enabled"></a> [rate\_limit\_enabled](#input\_rate\_limit\_enabled) | Enables rate limiting on gateway APIs. | `bool` | `false` | no |
-| <a name="input_rate_limit_per"></a> [rate\_limit\_per](#input\_rate\_limit\_per) | Rate Limit reset interval in seconds. | `number` | `60` | no |
-| <a name="input_rate_limit_rate"></a> [rate\_limit\_rate](#input\_rate\_limit\_rate) | Rate Limit rate on gateway APIs. | `number` | `999999` | no |
-| <a name="input_replica_count"></a> [replica\_count](#input\_replica\_count) | Gateway replica count. | `number` | `1` | no |
-| <a name="input_resources_limits_cpu"></a> [resources\_limits\_cpu](#input\_resources\_limits\_cpu) | Gateway CPU requests. | `string` | `"0"` | no |
-| <a name="input_resources_limits_memory"></a> [resources\_limits\_memory](#input\_resources\_limits\_memory) | Gateway memory requests. | `string` | `"0"` | no |
-| <a name="input_resources_requests_cpu"></a> [resources\_requests\_cpu](#input\_resources\_requests\_cpu) | Gateway CPU requests. | `string` | `"0"` | no |
-| <a name="input_resources_requests_memory"></a> [resources\_requests\_memory](#input\_resources\_requests\_memory) | Gateway memory requests. | `string` | `"0"` | no |
-| <a name="input_tyk_deployment_type"></a> [tyk\_deployment\_type](#input\_tyk\_deployment\_type) | Tyk Gateway deployment type. | `string` | `"Deployment"` | no |
-| <a name="input_tyk_enabled"></a> [tyk\_enabled](#input\_tyk\_enabled) | Enable Tyk services. | `bool` | `true` | no |
-| <a name="input_tyk_go_gc"></a> [tyk\_go\_gc](#input\_tyk\_go\_gc) | Target percentage for garbage collection execution in Go. | `number` | `1600` | no |
-| <a name="input_tyk_go_max_procs"></a> [tyk\_go\_max\_procs](#input\_tyk\_go\_max\_procs) | Limits the number of operating system threads that can execute user-level Go code simultaneously. Matching the value to threads * cpu limit allows for optimal performance. | `number` | `8` | no |
-| <a name="input_tyk_license"></a> [tyk\_license](#input\_tyk\_license) | Tyk self-managed license. | `string` | n/a | yes |
-| <a name="input_tyk_version"></a> [tyk\_version](#input\_tyk\_version) | Tyk Gateway version. | `string` | `"v5.6"` | no |
+| <a name="input_node_labels"></a> [node\_labels](#input\_node\_labels) | Mapping for node labels to determine the values for node selectors for each deployment. | <pre>object({<br> dependencies = string<br> tyk = string<br> tyk-upstream = string<br> tyk-tests = string<br> tyk-resources = string<br> kong = string<br> kong-upstream = string<br> kong-tests = string<br> kong-resources = string<br> gravitee = string<br> gravitee-upstream = string<br> gravitee-tests = string<br> gravitee-resources = string<br> })</pre> | `null`             | no |
+| <a name="input_open_telemetry_enabled"></a> [open\_telemetry\_enabled](#input\_open\_telemetry\_enabled) | Enable Open Telemetry and trace collection on gateway services. | `bool` | `false`            | no |
+| <a name="input_open_telemetry_sampling_ratio"></a> [open\_telemetry\_sampling\_ratio](#input\_open\_telemetry\_sampling\_ratio) | Open Telemetry sampling ration 0 to 1.0 range. | `string` | `"0.5"`            | no |
+| <a name="input_quota_enabled"></a> [quota\_enabled](#input\_quota\_enabled) | Enables quota management on gateway APIs. | `bool` | `false`            | no |
+| <a name="input_quota_per"></a> [quota\_per](#input\_quota\_per) | Quota management reset interval in seconds. | `number` | `3600`             | no |
+| <a name="input_quota_rate"></a> [quota\_rate](#input\_quota\_rate) | Quota management rate on gateway APIs. | `number` | `999999`           | no |
+| <a name="input_rate_limit_enabled"></a> [rate\_limit\_enabled](#input\_rate\_limit\_enabled) | Enables rate limiting on gateway APIs. | `bool` | `false`            | no |
+| <a name="input_rate_limit_per"></a> [rate\_limit\_per](#input\_rate\_limit\_per) | Rate Limit reset interval in seconds. | `number` | `60`               | no |
+| <a name="input_rate_limit_rate"></a> [rate\_limit\_rate](#input\_rate\_limit\_rate) | Rate Limit rate on gateway APIs. | `number` | `999999`           | no |
+| <a name="input_replica_count"></a> [replica\_count](#input\_replica\_count) | Gateway replica count. | `number` | `1`                | no |
+| <a name="input_resources_limits_cpu"></a> [resources\_limits\_cpu](#input\_resources\_limits\_cpu) | Gateway CPU requests. | `string` | `"0"`              | no |
+| <a name="input_resources_limits_memory"></a> [resources\_limits\_memory](#input\_resources\_limits\_memory) | Gateway memory requests. | `string` | `"0"`              | no |
+| <a name="input_resources_requests_cpu"></a> [resources\_requests\_cpu](#input\_resources\_requests\_cpu) | Gateway CPU requests. | `string` | `"0"`              | no |
+| <a name="input_resources_requests_memory"></a> [resources\_requests\_memory](#input\_resources\_requests\_memory) | Gateway memory requests. | `string` | `"0"`              | no |
+| <a name="input_tyk_deployment_type"></a> [tyk\_deployment\_type](#input\_tyk\_deployment\_type) | Tyk Gateway deployment type. | `string` | `"Deployment"`     | no |
+| <a name="input_tyk_enabled"></a> [tyk\_enabled](#input\_tyk\_enabled) | Enable Tyk services. | `bool` | `true`             | no |
+| <a name="input_tyk_go_gc"></a> [tyk\_go\_gc](#input\_tyk\_go\_gc) | Target percentage for garbage collection execution in Go. | `number` | `1600`             | no |
+| <a name="input_tyk_go_max_procs"></a> [tyk\_go\_max\_procs](#input\_tyk\_go\_max\_procs) | Limits the number of operating system threads that can execute user-level Go code simultaneously. Matching the value to threads * cpu limit allows for optimal performance. | `number` | `8`                | no |
+| <a name="input_tyk_license"></a> [tyk\_license](#input\_tyk\_license) | Tyk self-managed license. | `string` | n/a                | yes |
+| <a name="input_tyk_version"></a> [tyk\_version](#input\_tyk\_version) | Tyk Gateway version. | `string` | `"v5.6"`           | no |
diff --git a/deployments/main.tfvars.example b/deployments/main.tfvars.example
@@ -37,6 +37,4 @@ kong_deployment_type = "Deployment"
 gravitee_enabled         = false
 gravitee_version         = "4.4"
 gravitee_deployment_type = "Deployment"
-gravitee_nginx_enabled   = false
-
-grafana_service_type = "ClusterIP"
+gravitee_nginx_enabled   = false
diff --git a/deployments/vars.dependencies.tf b/deployments/vars.dependencies.tf
@@ -1,4 +1,5 @@
 variable "grafana_service_type" {
   type        = string
+  default     = "ClusterIP"
   description = "Grafana Dashboard service type. Set to 'LoadBalancer' type to be able to access Dashboard over the internet."
 }