Skip to content

Commit 2df8026

Browse files
Bugfix: default replicatemplate (#5805) (#5806)
1 parent f35dc59 commit 2df8026

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* [ENHANCEMENT] On startup, first record for live store to consume is not older than two complete block timeouts [#5693](https://github.com/grafana/tempo/pull/5693) (@ruslan-mikhailov)
1010
* [ENHANCEMENT] Add secure connection support to tempo-cli [#5692](https://github.com/grafana/tempo/pull/5692) (@TheoBrigitte)
1111
* [ENHANCEMENT] Improve dashboards for livestore [#5755](https://github.com/grafana/tempo/pull/5755) (@javiermolinar)
12-
* [ENHANCEMENT] Add endpoints for partition downscaling for live-store [#5600](https://github.com/grafana/tempo/pull/5600) [#5738](https://github.com/grafana/tempo/pull/5738) (@ruslan-mikhailov, @mapno)
12+
* [ENHANCEMENT] Add endpoints for partition downscaling for live-store [#5600](https://github.com/grafana/tempo/pull/5600) [#5738](https://github.com/grafana/tempo/pull/5738) [#5805](https://github.com/grafana/tempo/pull/5805) (@ruslan-mikhailov, @mapno)
1313
* [ENHANCEMENT] Add config to enable instance label for spanmetrics series [#5706](https://github.com/grafana/tempo/pull/5706) (@ie-pham)
1414
* [ENHANCEMENT] Unsafe search hints for frontend performance tests [#5723](https://github.com/grafana/tempo/pull/5723) (@ruslan-mikhailov)
1515
* [ENHANCEMENT] Add new livestore alert to the tempo-mixin [#5752](https://github.com/grafana/tempo/pull/5752) (@javiermolinar)

operations/jsonnet-compiled/ReplicaTemplate-live-store.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ metadata:
55
namespace: tracing
66
spec:
77
labelSelector: rollout-group=live-store
8+
replicas: 0

operations/jsonnet-compiled/util/jsonnetfile.lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"subdir": "ksonnet-util"
99
}
1010
},
11-
"version": "21437d146bae2ba3475623a319b9fb0a9b9bc03d",
11+
"version": "9dbb57c65d2c0ad301695224687e6207dd631123",
1212
"sum": "0y3AFX9LQSpfWTxWKSwoLgbt0Wc9nnCwhMH2szKzHv0="
1313
},
1414
{
@@ -18,7 +18,7 @@
1818
"subdir": "memcached"
1919
}
2020
},
21-
"version": "21437d146bae2ba3475623a319b9fb0a9b9bc03d",
21+
"version": "9dbb57c65d2c0ad301695224687e6207dd631123",
2222
"sum": "zNTCDRaCqJUHjQSQRsxGR3jLrMP9tU7YNQb13dbm1bU="
2323
},
2424
{

operations/jsonnet/microservices/replica-template.libsonnet

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@
2121
spec: {
2222
// HPA requires that label selector exists and is valid, but it will not be used for target type of AverageValue.
2323
labelSelector: label_selector,
24-
} + (
25-
if replicas <= 0 then {
26-
replicas:: null, // Hide replicas field.
27-
} else {
28-
replicas: replicas,
29-
}
30-
),
24+
replicas: replicas,
25+
},
3126
},
3227
}

0 commit comments

Comments
 (0)