From a5544de982f2963fc9643cfb25fc9e9416c25bfe Mon Sep 17 00:00:00 2001
From: Zach Leslie <zach.leslie@grafana.com>
Date: Thu, 22 Jan 2026 17:26:31 +0000
Subject: [PATCH 1/3] Compile jsonnet

---
 operations/jsonnet-compiled/jsonnetfile.lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/operations/jsonnet-compiled/jsonnetfile.lock.json b/operations/jsonnet-compiled/jsonnetfile.lock.json
index b52b936a044..350cc5da1f0 100644
--- a/operations/jsonnet-compiled/jsonnetfile.lock.json
+++ b/operations/jsonnet-compiled/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
           "subdir": "ksonnet-util"
         }
       },
-      "version": "b679d0e38f3a7d3b924f312d578d8a6dca4c4e31",
+      "version": "7e85f545f8c3c67073a53679eefb1adf15b39a73",
       "sum": "0y3AFX9LQSpfWTxWKSwoLgbt0Wc9nnCwhMH2szKzHv0="
     },
     {
@@ -18,7 +18,7 @@
           "subdir": "memcached"
         }
       },
-      "version": "b679d0e38f3a7d3b924f312d578d8a6dca4c4e31",
+      "version": "7e85f545f8c3c67073a53679eefb1adf15b39a73",
       "sum": "zNTCDRaCqJUHjQSQRsxGR3jLrMP9tU7YNQb13dbm1bU="
     },
     {

From a02c35b6317ad4af8cc6ecd38f10c34b46931525 Mon Sep 17 00:00:00 2001
From: Zach Leslie <zach.leslie@grafana.com>
Date: Thu, 22 Jan 2026 16:45:39 +0000
Subject: [PATCH 2/3] [jsonnet/microservices]: protect VPA config rendering
 field references

---
 .../microservices/vertical-pod-autoscaler.libsonnet        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/operations/jsonnet/microservices/vertical-pod-autoscaler.libsonnet b/operations/jsonnet/microservices/vertical-pod-autoscaler.libsonnet
index 4eda0dfb58d..8205bfa6a81 100644
--- a/operations/jsonnet/microservices/vertical-pod-autoscaler.libsonnet
+++ b/operations/jsonnet/microservices/vertical-pod-autoscaler.libsonnet
@@ -139,7 +139,8 @@
 
   },
 
-  local vpa = import 'vpa.libsonnet',
+  local vpa = import 'github.com/jsonnet-libs/vertical-pod-autoscaler-libsonnet/1.0.0/main.libsonnet',
+
   local verticalPodAutoscaler = vpa.autoscaling.v1.verticalPodAutoscaler,
   vpaForController(controller, configKey)::
     assert controller.kind == 'Deployment'
@@ -149,9 +150,11 @@
 
     assert std.objectHas($._config, configKey) : '$._config must have key ' + configKey;
 
+    assert std.objectHas($._config[configKey], 'vpa') : '$._config.%s must have key "vpa"' % configKey;
+
     local vpaConfig = $._config[configKey].vpa;
 
-    if !vpaConfig.enabled then
+    if std.objectHas(vpaConfig, 'enabled') && !vpaConfig.enabled then
       {}
     else
       verticalPodAutoscaler.new(controller.metadata.name)

From ad3fd30460a07a66e30e78002340161b8718c8b4 Mon Sep 17 00:00:00 2001
From: Zach Leslie <zach.leslie@grafana.com>
Date: Thu, 22 Jan 2026 17:38:02 +0000
Subject: [PATCH 3/3] Drop missing fields for lint

---
 tempodb/backend/block_meta_test.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tempodb/backend/block_meta_test.go b/tempodb/backend/block_meta_test.go
index 7b8a85904ab..3db6a8f1bef 100644
--- a/tempodb/backend/block_meta_test.go
+++ b/tempodb/backend/block_meta_test.go
@@ -174,10 +174,8 @@ func BenchmarkBlockMetaMarshalUnmarshal(b *testing.B) {
 		TotalObjects:    10,
 		Size_:           12345,
 		CompactionLevel: 1,
-		Encoding:        EncZstd,
 		IndexPageSize:   250000,
 		TotalRecords:    124356,
-		DataEncoding:    "",
 		BloomShardCount: 244,
 		FooterSize:      15775,
 		DedicatedColumns: DedicatedColumns{