feat: create a dedicated pool for prometheus and beef up the instance

Altinn · Jan 17, 2025 · dd388aa · dd388aa
1 parent aca73d4
commit dd388aa
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/infrastructure/adminservices-test/altinn-monitor-test-rg/k6_tests_rg_k8s.tf b/infrastructure/adminservices-test/altinn-monitor-test-rg/k6_tests_rg_k8s.tf
@@ -54,3 +54,22 @@ resource "azurerm_kubernetes_cluster_node_pool" "spot" {
     "kubernetes.azure.com/scalesetpriority=spot:NoSchedule", # Automatically added by Azure
   ]
 }
+
+resource "azurerm_kubernetes_cluster_node_pool" "prometheus" {
+  name                  = "prometheus"
+  kubernetes_cluster_id = azurerm_kubernetes_cluster.k6tests.id
+  vm_size               = "Standard_D3_v2"
+  auto_scaling_enabled  = false
+  node_count            = 1
+  priority              = "Spot" # Spot since we are still testing
+  eviction_policy       = "Delete"
+  spot_max_price        = -1 # (the current on-demand price for a Virtual Machine)
+  node_labels = {
+    "kubernetes.azure.com/scalesetpriority" : "spot", # Automatically added by Azure
+    prometheus : true
+  }
+  node_taints = [
+    "kubernetes.azure.com/scalesetpriority=spot:NoSchedule", # Automatically added by Azure
+    "workload=prometheus:NoSchedule",
+  ]
+}
diff --git a/.../adminservices-test/altinn-monitor-test-rg/k6_tests_rg_kube_prometheus_stack_values.tftpl b/.../adminservices-test/altinn-monitor-test-rg/k6_tests_rg_kube_prometheus_stack_values.tftpl
@@ -22,11 +22,23 @@ prometheus:
           cloud: "AzurePublic"
           sdk:
             tenantId: "${tenant_id}"
+    tolerations:
+      - key: "kubernetes.azure.com/scalesetpriority"
+        operator: "Equal"
+        value: "spot"
+        effect: "NoSchedule"
+      - key: "workload"
+        operator: "Equal"
+        value: "prometheus"
+        effect: "NoSchedule"
+    resources:
+      requests:
+        memory: 8Gi
     priorityClassName: "system-cluster-critical"
     retention: 1d
     storageSpec:
       volumeClaimTemplate:
         spec:
           resources:
             requests:
-              storage: 5Gi
+              storage: 15Gi