mirror of
https://github.com/carlosedp/cluster-monitoring.git
synced 2024-11-20 19:07:17 +01:00
Update API versions
This commit is contained in:
parent
fb08cda75e
commit
42ffee2d4c
@ -56,7 +56,7 @@ local utils = import 'utils.libsonnet';
|
|||||||
serviceAccount.mixin.metadata.withNamespace($._config.namespace),
|
serviceAccount.mixin.metadata.withNamespace($._config.namespace),
|
||||||
|
|
||||||
daemonset:
|
daemonset:
|
||||||
local daemonset = k.apps.v1beta2.daemonSet;
|
local daemonset = k.apps.v1.daemonSet;
|
||||||
local container = daemonset.mixin.spec.template.spec.containersType;
|
local container = daemonset.mixin.spec.template.spec.containersType;
|
||||||
local containerPort = container.portsType;
|
local containerPort = container.portsType;
|
||||||
local containerEnv = container.envType;
|
local containerEnv = container.envType;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
apiVersion: apps/v1beta2
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -15,8 +15,8 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
|
|||||||
|
|
||||||
smtpServer+:: {
|
smtpServer+:: {
|
||||||
deployment:
|
deployment:
|
||||||
local deployment = k.apps.v1beta2.deployment;
|
local deployment = k.apps.v1.deployment;
|
||||||
local container = k.apps.v1beta2.deployment.mixin.spec.template.spec.containersType;
|
local container = k.apps.v1.deployment.mixin.spec.template.spec.containersType;
|
||||||
local containerPort = container.portsType;
|
local containerPort = container.portsType;
|
||||||
|
|
||||||
local podLabels = { run: 'smtp-server' };
|
local podLabels = { run: 'smtp-server' };
|
||||||
|
@ -58,7 +58,7 @@ local vars = import 'vars.jsonnet';
|
|||||||
),
|
),
|
||||||
|
|
||||||
// Creates http ServiceMonitor objects
|
// 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',
|
apiVersion: 'monitoring.coreos.com/v1',
|
||||||
kind: 'ServiceMonitor',
|
kind: 'ServiceMonitor',
|
||||||
@ -105,6 +105,7 @@ local vars = import 'vars.jsonnet';
|
|||||||
}],
|
}],
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
s + t
|
std.mergePatch(s, t)
|
||||||
|
// s + t
|
||||||
),
|
),
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user