easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #740 from underrun/prom_adapter_ns_change

Browse Source 
enable alternate namespace for prometheus adapter
This commit is contained in:
Frederic Branczyk
2020-11-11 16:44:04 +01:00
committed by GitHub
parent 4bbc92bf15 170296603a
commit 6f7cf5cf72
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet
View File

@@ -4,6 +4,7 @@
{ {
_config+:: { _config+:: {
prometheusAdapter+:: { prometheusAdapter+:: {
namespace: $._config.namespace,
// Rules for custom-metrics // Rules for custom-metrics
config+:: { config+:: {
rules+: [ rules+: [
@@ -87,7 +88,7 @@
spec: { spec: {
service: { service: {
name: $.prometheusAdapter.service.metadata.name, name: $.prometheusAdapter.service.metadata.name,
namespace: $._config.namespace, namespace: $._config.prometheusAdapter.namespace,
}, },
group: 'custom.metrics.k8s.io', group: 'custom.metrics.k8s.io',
version: 'v1beta1', version: 'v1beta1',
@@ -105,7 +106,7 @@
spec: { spec: {
service: { service: {
name: $.prometheusAdapter.service.metadata.name, name: $.prometheusAdapter.service.metadata.name,
namespace: $._config.namespace, namespace: $._config.prometheusAdapter.namespace,
}, },
group: 'custom.metrics.k8s.io', group: 'custom.metrics.k8s.io',
version: 'v1beta2', version: 'v1beta2',
@@ -141,7 +142,7 @@
subjects: [{ subjects: [{
kind: 'ServiceAccount', kind: 'ServiceAccount',
name: $.prometheusAdapter.serviceAccount.metadata.name, name: $.prometheusAdapter.serviceAccount.metadata.name,
namespace: $._config.namespace, namespace: $._config.prometheusAdapter.namespace,
}], }],
}, },
customMetricsClusterRoleBindingHPA: { customMetricsClusterRoleBindingHPA: {

19
jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
View File

@@ -14,6 +14,7 @@ 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.namespace + '.svc.cluster.local:9090/',
config: { config: {
@@ -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';
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';
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';
$._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';
],); ],);
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';
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';
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';
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';
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,
}]), }]),
}, },
} }