Skip to content

[jsonnet/microservices]: protect VPA config rendering field references #6281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zalegrala merged 3 commits into from
Jan 22, 2026
Merged

[jsonnet/microservices]: protect VPA config rendering field references #6281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5544de
Compile jsonnet
zalegrala Jan 22, 2026
a02c35b
[jsonnet/microservices]: protect VPA config rendering field references
zalegrala Jan 22, 2026
ad3fd30
Drop missing fields for lint
zalegrala Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions operations/jsonnet-compiled/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "ksonnet-util"
}
},
"version": "b679d0e38f3a7d3b924f312d578d8a6dca4c4e31",
"version": "7e85f545f8c3c67073a53679eefb1adf15b39a73",
"sum": "0y3AFX9LQSpfWTxWKSwoLgbt0Wc9nnCwhMH2szKzHv0="
},
{
Expand All @@ -18,7 +18,7 @@
"subdir": "memcached"
}
},
"version": "b679d0e38f3a7d3b924f312d578d8a6dca4c4e31",
"version": "7e85f545f8c3c67073a53679eefb1adf15b39a73",
"sum": "zNTCDRaCqJUHjQSQRsxGR3jLrMP9tU7YNQb13dbm1bU="
},
{
Expand Down
7 changes: 5 additions & 2 deletions operations/jsonnet/microservices/vertical-pod-autoscaler.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions tempodb/backend/block_meta_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Loading