remove default eks version to allow eks to use defaults without us to…

… have to update them for every release

.github/custom-tests/comparison/all/cluster.tf

@@ -0,0 +1,10 @@
+cluster_machine_type      = "c2-standard-4"
+upstream_machine_type     = "c2-standard-8"
+tests_machine_type        = "c2-standard-8"
+dependencies_machine_type = "c2-standard-8"
+
+dependencies_nodes_count = 2
+
+tyk_enabled      = true
+kong_enabled     = true
+gravitee_enabled = true

.github/custom-tests/comparison/all/deployments.tf

@@ -0,0 +1,37 @@
+analytics_database_enabled    = true
+analytics_prometheus_enabled  = true
+auth_enabled                  = true
+auth_type                     = "authToken"
+quota_enabled                 = false
+quota_rate                    = 999999
+quota_per                     = 3600
+rate_limit_enabled            = true
+rate_limit_rate               = 999999
+rate_limit_per                = 60
+open_telemetry_enabled        = false
+open_telemetry_sampling_ratio = "0.5"
+
+hpa_enabled                 = false
+hpa_max_replica_count       = 10
+replica_count               = 4
+hpa_avg_cpu_util_percentage = 80
+external_traffic_policy     = "local"
+resources_requests_cpu      = "750m"
+resources_requests_memory   = "2048Mi"
+resources_limits_cpu        = "750m"
+resources_limits_memory     = "2048Mi"
+
+tyk_enabled         = true
+tyk_version         = "v5.6"
+tyk_deployment_type = "Deployment"
+tyk_go_gc           = 1600
+tyk_go_max_procs    = 8
+
+kong_enabled         = true
+kong_version         = "3.8"
+kong_deployment_type = "Deployment"
+
+gravitee_enabled         = true
+gravitee_version         = "4.5"
+gravitee_deployment_type = "Deployment"
+gravitee_nginx_enabled   = false

.github/custom-tests/comparison/all/tests.tf

@@ -0,0 +1,12 @@
+tyk_enabled      = true
+kong_enabled     = true
+gravitee_enabled = true
+
+tests_fortio_options = "size=2000"
+tests_executor       = "constant-arrival-rate"
+tests_auth_key_count = 10
+tests_ramping_steps  = 10
+tests_duration       = 120
+tests_rate           = 5000
+tests_virtual_users  = 500
+tests_parallelism    = 4

.github/custom-tests/comparison/gravitee/cluster.tf

@@ -0,0 +1,9 @@
+cluster_machine_type      = "c2-standard-4"
+upstream_machine_type     = "c2-standard-8"
+tests_machine_type        = "c2-standard-8"
+dependencies_machine_type = "c2-standard-8"
+
+dependencies_nodes_count = 2
+
+tyk_enabled      = true
+gravitee_enabled = true

.github/custom-tests/comparison/gravitee/deployments.tf

@@ -0,0 +1,37 @@
+analytics_database_enabled    = true
+analytics_prometheus_enabled  = true
+auth_enabled                  = true
+auth_type                     = "authToken"
+quota_enabled                 = false
+quota_rate                    = 999999
+quota_per                     = 3600
+rate_limit_enabled            = true
+rate_limit_rate               = 999999
+rate_limit_per                = 60
+open_telemetry_enabled        = false
+open_telemetry_sampling_ratio = "0.5"
+
+hpa_enabled                 = false
+hpa_max_replica_count       = 10
+replica_count               = 4
+hpa_avg_cpu_util_percentage = 80
+external_traffic_policy     = "local"
+resources_requests_cpu      = "750m"
+resources_requests_memory   = "2048Mi"
+resources_limits_cpu        = "750m"
+resources_limits_memory     = "2048Mi"
+
+tyk_enabled         = true
+tyk_version         = "v5.6"
+tyk_deployment_type = "Deployment"
+tyk_go_gc           = 1600
+tyk_go_max_procs    = 8
+
+kong_enabled         = false
+kong_version         = "3.8"
+kong_deployment_type = "Deployment"
+
+gravitee_enabled         = true
+gravitee_version         = "4.5"
+gravitee_deployment_type = "Deployment"
+gravitee_nginx_enabled   = false

.github/custom-tests/comparison/gravitee/tests.tf

@@ -0,0 +1,12 @@
+tyk_enabled      = true
+kong_enabled     = false
+gravitee_enabled = true
+
+tests_fortio_options = "size=2000"
+tests_executor       = "constant-arrival-rate"
+tests_auth_key_count = 10
+tests_ramping_steps  = 10
+tests_duration       = 120
+tests_rate           = 5000
+tests_virtual_users  = 500
+tests_parallelism    = 4

.github/custom-tests/comparison/kong/cluster.tf

@@ -0,0 +1,9 @@
+cluster_machine_type      = "c2-standard-4"
+upstream_machine_type     = "c2-standard-8"
+tests_machine_type        = "c2-standard-8"
+dependencies_machine_type = "c2-standard-8"
+
+dependencies_nodes_count = 2
+
+tyk_enabled      = true
+kong_enabled     = true

.github/custom-tests/comparison/kong/deployments.tf

@@ -0,0 +1,37 @@
+analytics_database_enabled    = false
+analytics_prometheus_enabled  = true
+auth_enabled                  = true
+auth_type                     = "authToken"
+quota_enabled                 = false
+quota_rate                    = 999999
+quota_per                     = 3600
+rate_limit_enabled            = true
+rate_limit_rate               = 999999
+rate_limit_per                = 60
+open_telemetry_enabled        = true
+open_telemetry_sampling_ratio = "0.75"
+
+hpa_enabled                 = false
+hpa_max_replica_count       = 10
+replica_count               = 4
+hpa_avg_cpu_util_percentage = 80
+external_traffic_policy     = "local"
+resources_requests_cpu      = "750m"
+resources_requests_memory   = "2048Mi"
+resources_limits_cpu        = "750m"
+resources_limits_memory     = "2048Mi"
+
+tyk_enabled         = true
+tyk_version         = "v5.6"
+tyk_deployment_type = "Deployment"
+tyk_go_gc           = 1600
+tyk_go_max_procs    = 8
+
+kong_enabled         = true
+kong_version         = "3.8"
+kong_deployment_type = "Deployment"
+
+gravitee_enabled         = false
+gravitee_version         = "4.5"
+gravitee_deployment_type = "Deployment"
+gravitee_nginx_enabled   = false

.github/custom-tests/comparison/kong/tests.tf

@@ -0,0 +1,12 @@
+tyk_enabled      = true
+kong_enabled     = true
+gravitee_enabled = false
+
+tests_fortio_options = "size=2000"
+tests_executor       = "constant-arrival-rate"
+tests_auth_key_count = 10
+tests_ramping_steps  = 10
+tests_duration       = 120
+tests_rate           = 5000
+tests_virtual_users  = 500
+tests_parallelism    = 4

.github/custom-tests/tyk-open-telemetry/cluster.tf

@@ -1,5 +1,4 @@
 cluster_location          = "westus"
-aks_version               = "1.29"
 cluster_machine_type      = "Standard_F8s_v2"
 service_machine_type      = ""
 upstream_machine_type     = ""

.github/custom-tests/tyk-open-telemetry/deployments.tf

@@ -29,11 +29,9 @@ tyk_go_gc           = 1600
 tyk_go_max_procs    = 8
 
 kong_enabled         = false
-kong_version         = "3.6"
+kong_version         = "3.8"
 kong_deployment_type = "Deployment"
 
 gravitee_enabled         = false
-gravitee_version         = "4.4"
-gravitee_deployment_type = "Deployment"
-
-grafana_service_type = "ClusterIP"
+gravitee_version         = "4.5"
+gravitee_deployment_type = "Deployment"

.github/workflows/AKS.yml

@@ -4,7 +4,7 @@ on:
     types: [ closed ]
 
 concurrency:
-  group: "AKS"
+  group: "Azure"
 
 jobs:
   azure:
@@ -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

.github/workflows/EKS.yml

@@ -4,7 +4,7 @@ on:
     types: [ closed ]
 
 concurrency:
-  group: "EKS"
+  group: "AWS"
 
 jobs:
   aws:
@@ -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

.github/workflows/GKE.yml

@@ -4,7 +4,7 @@ on:
     types: [ closed ]
 
 concurrency:
-  group: "GKE"
+  group: "GCP"
 
 jobs:
   gcp:
@@ -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

.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

.github/workflows/cluster.yml

@@ -85,11 +85,11 @@ jobs:
           cd aks
           terraform init
           terraform ${{ inputs.action }} \
-            --var-file=main.tfvars \
             --var="cluster_location=${{ vars.AZURE_CLUSTER_LOCATION }}" \
             --var="cluster_machine_type=${{ vars.AZURE_CLUSTER_MACHINE_TYPE }}" \
             --var="upstream_machine_type=${{ vars.AZURE_UPSTREAM_MACHINE_TYPE }}" \
             --var="tests_machine_type=${{ vars.AZURE_TEST_MACHINE_TYPE }}" \
+            --var-file=main.tfvars \
             --auto-approve
 
       - name: EKS cluster ${{ inputs.action }}
@@ -98,11 +98,11 @@ jobs:
           cd eks
           terraform init
           terraform ${{ inputs.action }} \
-            --var-file=main.tfvars \
             --var="cluster_location=${{ vars.AWS_CLUSTER_LOCATION }}" \
             --var="cluster_machine_type=${{ vars.AWS_CLUSTER_MACHINE_TYPE }}" \
             --var="upstream_machine_type=${{ vars.AWS_UPSTREAM_MACHINE_TYPE }}" \
             --var="tests_machine_type=${{ vars.AWS_TEST_MACHINE_TYPE }}" \
+            --var-file=main.tfvars \
             --auto-approve
 
       - name: GKE cluster ${{ inputs.action }}
@@ -111,10 +111,10 @@ jobs:
           cd gke
           terraform init
           terraform ${{ inputs.action }} \
-            --var-file=main.tfvars \
             --var="project=${{ secrets.GCP_PROJECT }}" \
             --var="cluster_location=${{ vars.GCP_CLUSTER_LOCATION }}" \
             --var="cluster_machine_type=${{ vars.GCP_CLUSTER_MACHINE_TYPE }}" \
             --var="upstream_machine_type=${{ vars.GCP_UPSTREAM_MACHINE_TYPE }}" \
             --var="tests_machine_type=${{ vars.GCP_TEST_MACHINE_TYPE }}" \
+            --var-file=main.tfvars \
             --auto-approve