Skip to content

Commit

Permalink
jsonnet fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
manohar-koukuntla committed Dec 6, 2022
1 parent 7687060 commit 880c8ff
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 58 deletions.
10 changes: 5 additions & 5 deletions operations/jsonnet/microservices/compactor.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
local tempo_data_volume = 'tempo-data',
local tempo_overrides_config_volume = 'overrides',

tempo_compactor_ports:: [ containerPort.new('prom-metrics', $._config.port)],
tempo_compactor_ports:: [containerPort.new('prom-metrics', $._config.port)],
tempo_compactor_args:: {
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},

tempo_compactor_container::
container.new(target_name, $._images.tempo) +
Expand Down
10 changes: 5 additions & 5 deletions operations/jsonnet/microservices/distributor.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
local tempo_config_volume = 'tempo-conf',
local tempo_overrides_config_volume = 'overrides',

tempo_distributor_ports:: [ containerPort.new('prom-metrics', $._config.port)],
tempo_distributor_ports:: [containerPort.new('prom-metrics', $._config.port)],
tempo_distributor_args:: {
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},

tempo_distributor_container::
container.new(target_name, $._images.tempo) +
Expand Down
10 changes: 5 additions & 5 deletions operations/jsonnet/microservices/frontend.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
local tempo_data_volume = 'tempo-data',
local tempo_overrides_config_volume = 'overrides',

tempo_query_frontend_ports:: [ containerPort.new('prom-metrics', $._config.port)],
tempo_query_frontend_ports:: [containerPort.new('prom-metrics', $._config.port)],
tempo_query_frontend_args:: {
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},

tempo_query_frontend_container::
container.new(target_name, $._images.tempo) +
Expand Down
10 changes: 5 additions & 5 deletions operations/jsonnet/microservices/generator.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
local tempo_generator_wal_volume = 'metrics-generator-wal-data',
local tempo_overrides_config_volume = 'overrides',

tempo_metrics_generator_ports:: [ containerPort.new('prom-metrics', $._config.port)],
tempo_metrics_generator_ports:: [containerPort.new('prom-metrics', $._config.port)],
tempo_metrics_generator_args:: {
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},

tempo_metrics_generator_container::
container.new(target_name, $._images.tempo) +
Expand Down
56 changes: 28 additions & 28 deletions operations/jsonnet/microservices/ingester.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
local tempo_data_volume = 'ingester-data',
local tempo_overrides_config_volume = 'overrides',

tempo_ingester_ports:: [ containerPort.new('prom-metrics', $._config.port)],
tempo_ingester_ports:: [containerPort.new('prom-metrics', $._config.port)],
tempo_ingester_args:: {
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},

tempo_ingester_pvc::
pvc.new()
Expand All @@ -45,29 +45,29 @@
(if $._config.variables_expansion then container.withArgsMixin(['-config.expand-env=true']) else {}),

newIngesterStatefulSet(name, container, with_anti_affinity=true)::
statefulset.new(
name,
3,
container,
self.tempo_ingester_pvc,
{
app: target_name,
[$._config.gossip_member_label]: 'true',
},
)
+ k.util.antiAffinityStatefulSet
+ statefulset.mixin.spec.withServiceName(target_name)
+ statefulset.mixin.spec.template.metadata.withAnnotations({
config_hash: std.md5(std.toString($.tempo_ingester_configmap.data['tempo.yaml'])),
})
+ statefulset.mixin.spec.template.spec.withVolumes([
volume.fromConfigMap(tempo_config_volume, $.tempo_ingester_configmap.metadata.name),
volume.fromConfigMap(tempo_overrides_config_volume, $._config.overrides_configmap_name),
]) +
statefulset.mixin.spec.withPodManagementPolicy('Parallel')+
statefulset.mixin.spec.template.spec.withTerminationGracePeriodSeconds(1200) +
$.util.podPriority('high') +
(if with_anti_affinity then $.util.antiAffinity else {}),
statefulset.new(
name,
3,
container,
self.tempo_ingester_pvc,
{
app: target_name,
[$._config.gossip_member_label]: 'true',
},
)
+ k.util.antiAffinityStatefulSet
+ statefulset.mixin.spec.withServiceName(target_name)
+ statefulset.mixin.spec.template.metadata.withAnnotations({
config_hash: std.md5(std.toString($.tempo_ingester_configmap.data['tempo.yaml'])),
})
+ statefulset.mixin.spec.template.spec.withVolumes([
volume.fromConfigMap(tempo_config_volume, $.tempo_ingester_configmap.metadata.name),
volume.fromConfigMap(tempo_overrides_config_volume, $._config.overrides_configmap_name),
]) +
statefulset.mixin.spec.withPodManagementPolicy('Parallel') +
statefulset.mixin.spec.template.spec.withTerminationGracePeriodSeconds(1200) +
$.util.podPriority('high') +
(if with_anti_affinity then $.util.antiAffinity else {}),

tempo_ingester_statefulset: $.newIngesterStatefulSet(target_name, self.tempo_ingester_container) + statefulset.mixin.spec.withReplicas($._config.ingester.replicas),

Expand Down
2 changes: 1 addition & 1 deletion operations/jsonnet/microservices/memberlist.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
servicePort.newNamed('gossip-ring', $._config.gossip_ring_port, $._config.gossip_ring_port) +
servicePort.withProtocol('TCP'),
],
) + service.mixin.spec.withClusterIp('None')
) + service.mixin.spec.withClusterIp('None'),
}
8 changes: 4 additions & 4 deletions operations/jsonnet/microservices/multi-zone.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
},

tempo_config+: {
ingester+: {
ingester+: {
lifecycler+: {
ring+: (if $._config.multi_zone_ingester_enabled then { zone_awareness_enabled: $._config.multi_zone_ingester_enabled } else {}),
} + (if $._config.multi_zone_ingester_enabled then { availability_zone: '${AVAILABILITY_ZONE}' } else {}),
}
},
},

//
Expand All @@ -40,9 +40,9 @@

$.tempo_ingester_container +
container.withArgs($.util.mapToFlags(
$.tempo_ingester_args + zone_args
$.tempo_ingester_args + zone_args
)) +
container.withEnvMixin([{name: 'AVAILABILITY_ZONE', value: zone_name}]) +
container.withEnvMixin([{ name: 'AVAILABILITY_ZONE', value: zone_name }]) +
(if $._config.variables_expansion then container.withArgsMixin(['-config.expand-env=true']) else {}),

newIngesterZoneStatefulSet(zone, container)::
Expand Down
10 changes: 5 additions & 5 deletions operations/jsonnet/microservices/querier.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
local tempo_config_volume = 'tempo-conf',
local tempo_overrides_config_volume = 'overrides',

tempo_querier_ports:: [ containerPort.new('prom-metrics', $._config.port)],
tempo_querier_ports:: [containerPort.new('prom-metrics', $._config.port)],
tempo_querier_args:: {
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},
target: target_name,
'config.file': '/conf/tempo.yaml',
'mem-ballast-size-mbs': $._config.ballast_size_mbs,
},

tempo_querier_container::
container.new(target_name, $._images.tempo) +
Expand Down

0 comments on commit 880c8ff

Please sign in to comment.