diff --git a/arm_exporter.jsonnet b/arm_exporter.jsonnet index af6a1fc..4ad5a53 100644 --- a/arm_exporter.jsonnet +++ b/arm_exporter.jsonnet @@ -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; diff --git a/manifests/smtp-server-deployment.yaml b/manifests/smtp-server-deployment.yaml index 3839e25..1d20da0 100644 --- a/manifests/smtp-server-deployment.yaml +++ b/manifests/smtp-server-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: diff --git a/smtp_server.jsonnet b/smtp_server.jsonnet index 773ff78..5d7e16b 100644 --- a/smtp_server.jsonnet +++ b/smtp_server.jsonnet @@ -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' }; diff --git a/utils.libsonnet b/utils.libsonnet index fc32ae3..d9adc49 100644 --- a/utils.libsonnet +++ b/utils.libsonnet @@ -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 ), } \ No newline at end of file