Skip to content
Snippets Groups Projects
Commit 07188b25 authored by Derek Wilson's avatar Derek Wilson
Browse files

enable alternate namespace for prometheus adapter

because choice is nice to have
parent 4bbc92bf
Branches
Tags
No related merge requests found
...@@ -14,8 +14,9 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -14,8 +14,9 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
prometheusAdapter+:: { prometheusAdapter+:: {
name: 'prometheus-adapter', name: 'prometheus-adapter',
namespace: $._config.namespace,
labels: { name: $._config.prometheusAdapter.name }, labels: { name: $._config.prometheusAdapter.name },
prometheusURL: 'http://prometheus-' + $._config.prometheus.name + '.' + $._config.namespace + '.svc.cluster.local:9090/', prometheusURL: 'http://prometheus-' + $._config.prometheus.name + '.' + $._config.prometheusAdapter.namespace + '.svc.cluster.local:9090/',
config: { config: {
resourceRules: { resourceRules: {
cpu: { cpu: {
...@@ -71,7 +72,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -71,7 +72,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
spec: { spec: {
service: { service: {
name: $.prometheusAdapter.service.metadata.name, name: $.prometheusAdapter.service.metadata.name,
namespace: $._config.namespace, namespace: $._config.prometheusAdapter.namespace,
}, },
group: 'metrics.k8s.io', group: 'metrics.k8s.io',
version: 'v1beta1', version: 'v1beta1',
...@@ -85,7 +86,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -85,7 +86,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
local configmap = k.core.v1.configMap; local configmap = k.core.v1.configMap;
configmap.new('adapter-config', { 'config.yaml': std.manifestYamlDoc($._config.prometheusAdapter.config) }) + configmap.new('adapter-config', { 'config.yaml': std.manifestYamlDoc($._config.prometheusAdapter.config) }) +
configmap.mixin.metadata.withNamespace($._config.namespace), configmap.mixin.metadata.withNamespace($._config.prometheusAdapter.namespace),
serviceMonitor: serviceMonitor:
{ {
...@@ -93,7 +94,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -93,7 +94,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
kind: 'ServiceMonitor', kind: 'ServiceMonitor',
metadata: { metadata: {
name: $._config.prometheusAdapter.name, name: $._config.prometheusAdapter.name,
namespace: $._config.namespace, namespace: $._config.prometheusAdapter.namespace,
labels: $._config.prometheusAdapter.labels, labels: $._config.prometheusAdapter.labels,
}, },
spec: { spec: {
...@@ -123,7 +124,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -123,7 +124,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
$._config.prometheusAdapter.labels, $._config.prometheusAdapter.labels,
servicePort.newNamed('https', 443, 6443), servicePort.newNamed('https', 443, 6443),
) + ) +
service.mixin.metadata.withNamespace($._config.namespace) + service.mixin.metadata.withNamespace($._config.prometheusAdapter.namespace) +
service.mixin.metadata.withLabels($._config.prometheusAdapter.labels), service.mixin.metadata.withLabels($._config.prometheusAdapter.labels),
deployment: deployment:
...@@ -150,7 +151,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -150,7 +151,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
],); ],);
deployment.new($._config.prometheusAdapter.name, 1, c, $._config.prometheusAdapter.labels) + deployment.new($._config.prometheusAdapter.name, 1, c, $._config.prometheusAdapter.labels) +
deployment.mixin.metadata.withNamespace($._config.namespace) + deployment.mixin.metadata.withNamespace($._config.prometheusAdapter.namespace) +
deployment.mixin.spec.selector.withMatchLabels($._config.prometheusAdapter.labels) + deployment.mixin.spec.selector.withMatchLabels($._config.prometheusAdapter.labels) +
deployment.mixin.spec.template.spec.withServiceAccountName($.prometheusAdapter.serviceAccount.metadata.name) + deployment.mixin.spec.template.spec.withServiceAccountName($.prometheusAdapter.serviceAccount.metadata.name) +
deployment.mixin.spec.template.spec.withNodeSelector({ 'kubernetes.io/os': 'linux' }) + deployment.mixin.spec.template.spec.withNodeSelector({ 'kubernetes.io/os': 'linux' }) +
...@@ -166,7 +167,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -166,7 +167,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
local serviceAccount = k.core.v1.serviceAccount; local serviceAccount = k.core.v1.serviceAccount;
serviceAccount.new($._config.prometheusAdapter.name) + serviceAccount.new($._config.prometheusAdapter.name) +
serviceAccount.mixin.metadata.withNamespace($._config.namespace), serviceAccount.mixin.metadata.withNamespace($._config.prometheusAdapter.namespace),
clusterRole: clusterRole:
local clusterRole = k.rbac.v1.clusterRole; local clusterRole = k.rbac.v1.clusterRole;
...@@ -193,7 +194,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -193,7 +194,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
clusterRoleBinding.withSubjects([{ clusterRoleBinding.withSubjects([{
kind: 'ServiceAccount', kind: 'ServiceAccount',
name: $.prometheusAdapter.serviceAccount.metadata.name, name: $.prometheusAdapter.serviceAccount.metadata.name,
namespace: $._config.namespace, namespace: $._config.prometheusAdapter.namespace,
}]), }]),
clusterRoleBindingDelegator: clusterRoleBindingDelegator:
...@@ -207,7 +208,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -207,7 +208,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
clusterRoleBinding.withSubjects([{ clusterRoleBinding.withSubjects([{
kind: 'ServiceAccount', kind: 'ServiceAccount',
name: $.prometheusAdapter.serviceAccount.metadata.name, name: $.prometheusAdapter.serviceAccount.metadata.name,
namespace: $._config.namespace, namespace: $._config.prometheusAdapter.namespace,
}]), }]),
clusterRoleServerResources: clusterRoleServerResources:
...@@ -255,7 +256,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; ...@@ -255,7 +256,7 @@ local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
roleBinding.withSubjects([{ roleBinding.withSubjects([{
kind: 'ServiceAccount', kind: 'ServiceAccount',
name: $.prometheusAdapter.serviceAccount.metadata.name, name: $.prometheusAdapter.serviceAccount.metadata.name,
namespace: $._config.namespace, namespace: $._config.prometheusAdapter.namespace,
}]), }]),
}, },
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment