Update API versions

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

View File

@ -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;

View File

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

View File

@ -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' };

View File

@ -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
), ),
} }