Pinned grafana version, updated memory requests and limits for thanos…

… storagegateway new version of the stack uses more memory
ministryofjustice · May 29, 2024 · 4382488 · 4382488
1 parent 96aaca3
commit 4382488
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/.thanos-storagegateway-o-pod.yaml.swp b/.thanos-storagegateway-o-pod.yaml.swp
diff --git a/Makefile b/Makefile
@@ -128,6 +128,10 @@ lock: ## terraform providers lock (reset hashes after upgrades prior to commit)
 	rm .terraform.lock.hcl
 	$(DOCKER_RUN) terraform providers lock -platform=windows_amd64 -platform=darwin_amd64 -platform=linux_amd64
 
+.PHONY: unlock
+unlock: ## terraform unlock e.g. (make unlock IMPORT_ARGUMENT=LOCK_ID)
+	$(DOCKER_RUN) terraform force-unlock $$IMPORT_ARGUMENT
+
 .PHONY: clean
 clean: ## clean terraform cached providers etc
 	rm -rf .terraform/ terraform.tfstate* .env .env.tmp

diff --git a/k8s-values/values.thanos-stack.yaml b/k8s-values/values.thanos-stack.yaml
@@ -5,6 +5,11 @@ queryFrontend:
   enabled: false
 storegateway:
   enabled: true
+  resources:
+    limits:
+      memory: "2Gi"
+    requests:
+      memory: "1Gi"
 compactor:
   enabled: true
 receive:

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -230,6 +230,7 @@ deploy_grafana() {
   helm repo add grafana https://grafana.github.io/helm-charts
   helm repo update
   helm upgrade --install grafana grafana/grafana \
+    --version 7.3.0 \
     -f ./k8s-values/values.grafana.yaml \
     -n grafana \
     --create-namespace \