Merge pull request #122 from rajatvig/master

Fix Thanos deployment and service for ksonnet.beta.4
This commit is contained in:
Matthias Loibl
2019-06-14 10:13:34 +02:00
committed by GitHub

View File

@@ -33,8 +33,8 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
}, },
thanosPeerService: thanosPeerService:
service.new('thanos-peers', { 'thanos-peers': 'true' }, [ service.new('thanos-peers', { 'thanos-peers': 'true' }, [
servicePort.newNamed('cluster', 10900, 'cluster'), servicePort.newNamed('cluster', 10900, 10900),
servicePort.newNamed('http', 10902, 'http'), servicePort.newNamed('http', 10902, 10902),
]) + ]) +
service.mixin.metadata.withNamespace($._config.namespace) + service.mixin.metadata.withNamespace($._config.namespace) +
service.mixin.metadata.withLabels({ 'thanos-peers': 'true' }) + service.mixin.metadata.withLabels({ 'thanos-peers': 'true' }) +
@@ -75,9 +75,9 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
local thanosQueryContainer = local thanosQueryContainer =
container.new('thanos-query', $._config.imageRepos.thanos + ':' + $._config.versions.thanos) + container.new('thanos-query', $._config.imageRepos.thanos + ':' + $._config.versions.thanos) +
container.withPorts([ container.withPorts([
containerPort.newNamed('http', 10902), containerPort.newNamed(10902, 'http'),
containerPort.newNamed('grpc', 10901), containerPort.newNamed(10901, 'grpc'),
containerPort.newNamed('cluster', 10900), containerPort.newNamed(10900, 'cluster'),
]) + ]) +
container.withArgs([ container.withArgs([
'query', 'query',