Mirrors/rpi.carlosedp.cluster-monitoring
1
0
Fork 0
mirror of https://github.com/carlosedp/cluster-monitoring.git synced 2024-11-20 19:07:17 +01:00
Code Issues Projects Releases Wiki Activity

Update API versions

Browse Source
This commit is contained in:
Carlos de Paula 2019-10-09 11:26:42 -03:00
parent fb08cda75e
commit 42ffee2d4c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arm_exporter.jsonnet
View File

@ -56,7 +56,7 @@ local utils = import 'utils.libsonnet';
serviceAccount.mixin.metadata.withNamespace($._config.namespace),
daemonset:
local daemonset = k.apps.v1beta2.daemonSet;
local daemonset = k.apps.v1.daemonSet;
local container = daemonset.mixin.spec.template.spec.containersType;
local containerPort = container.portsType;
local containerEnv = container.envType;

2
manifests/smtp-server-deployment.yaml
View File

@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
labels:

4
smtp_server.jsonnet
View File

@ -15,8 +15,8 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
smtpServer+:: {
deployment:
local deployment = k.apps.v1beta2.deployment;
local container = k.apps.v1beta2.deployment.mixin.spec.template.spec.containersType;
local deployment = k.apps.v1.deployment;
local container = k.apps.v1.deployment.mixin.spec.template.spec.containersType;
local containerPort = container.portsType;
local podLabels = { run: 'smtp-server' };

5
utils.libsonnet
View File

@ -58,7 +58,7 @@ local vars = import 'vars.jsonnet';
),
// Creates http ServiceMonitor objects
newServiceMonitor(name, namespace, matchLabel, matchNamespace, portName, portScheme):: (
newServiceMonitor(name, namespace, matchLabel, matchNamespace, portName, portScheme, path='metrics'):: (
{
apiVersion: 'monitoring.coreos.com/v1',
kind: 'ServiceMonitor',
@ -105,6 +105,7 @@ local vars = import 'vars.jsonnet';
}],
}
};
s + t
std.mergePatch(s, t)
// s + t
),
}