Skip to content
Snippets Groups Projects
Unverified Commit ea51bdb6 authored by Frederic Branczyk's avatar Frederic Branczyk Committed by GitHub
Browse files

Merge pull request #764 from kakkoyun/ksonnet_no_more_7 

Remove ksonnet from several libs
parents ef04c0c1 116a42ae
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 147 additions and 86 deletions
jsonnet/kube-prometheus/kube-prometheus-insecure-kubelet.libsonnet
+ 2
− 8
View file @ ea51bdb6
...@@ -10,10 +10,7 @@ ...@@ -10,10 +10,7 @@
interval: '30s', interval: '30s',
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
relabelings: [ relabelings: [
{ { sourceLabels: ['__metrics_path__'], targetLabel: 'metrics_path' },
sourceLabels: ['__metrics_path__'],
targetLabel: 'metrics_path'
},
], ],
}, },
{ {
...@@ -24,10 +21,7 @@ ...@@ -24,10 +21,7 @@
honorLabels: true, honorLabels: true,
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
relabelings: [ relabelings: [
{ { sourceLabels: ['__metrics_path__'], targetLabel: 'metrics_path' },
sourceLabels: ['__metrics_path__'],
targetLabel: 'metrics_path'
},
], ],
metricRelabelings: [ metricRelabelings: [
// Drop a bunch of metrics which are disabled but still sent, see // Drop a bunch of metrics which are disabled but still sent, see
......
jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet
+ 16
− 9
View file @ ea51bdb6
local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType;
{ {
prometheus+:: { prometheus+:: {
kubeDnsPrometheusDiscoveryService: kubeDnsPrometheusDiscoveryService: {
service.new('kube-dns-prometheus-discovery', { 'k8s-app': 'kube-dns' }, [servicePort.newNamed('metrics', 9153, 9153)]) + apiVersion: 'v1',
service.mixin.metadata.withNamespace('kube-system') + kind: 'Service',
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-dns' }) + metadata: {
service.mixin.spec.withClusterIp('None'), name: 'kube-dns-prometheus-discovery',
namespace: 'kube-system',
labels: { 'k8s-app': 'kube-dns' },
},
spec: {
ports: [
{ name: 'metrics', port: 9153, targetPort: 9153 },
],
selector: { 'k8s-app': 'kube-dns' },
cluserAPI: 'None',
},
},
}, },
} }
jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet
+ 35
− 18
View file @ ea51bdb6
local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service(name, namespace, labels, selector, ports) = {
local service = k.core.v1.service; apiVersion: 'v1',
local servicePort = k.core.v1.service.mixin.spec.portsType; kind: 'Service',
metadata: {
name: name,
namespace: namespace,
labels: labels,
},
spec: {
ports+: ports,
selector: selector,
clusterIP: 'None',
},
};
{ {
prometheus+:: { prometheus+:: {
kubeControllerManagerPrometheusDiscoveryService: kubeControllerManagerPrometheusDiscoveryService: service(
service.new('kube-controller-manager-prometheus-discovery', { 'k8s-app': 'kube-controller-manager' }, servicePort.newNamed('https-metrics', 10257, 10257)) + 'kube-controller-manager-prometheus-discovery',
service.mixin.metadata.withNamespace('kube-system') + 'kube-system',
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-controller-manager' }) + { 'k8s-app': 'kube-controller-manager' },
service.mixin.spec.withClusterIp('None'), { 'k8s-app': 'kube-controller-manager' },
kubeSchedulerPrometheusDiscoveryService: [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
service.new('kube-scheduler-prometheus-discovery', { 'k8s-app': 'kube-scheduler' }, servicePort.newNamed('https-metrics', 10259, 10259)) + ),
service.mixin.metadata.withNamespace('kube-system') + kubeSchedulerPrometheusDiscoveryService: service(
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-scheduler' }) + 'kube-controller-manager-prometheus-discovery',
service.mixin.spec.withClusterIp('None'), 'kube-system',
kubeDnsPrometheusDiscoveryService: { 'k8s-app': 'kube-scheduler' },
service.new('kube-dns-prometheus-discovery', { 'k8s-app': 'kube-dns' }, [servicePort.newNamed('metrics', 10055, 10055), servicePort.newNamed('http-metrics-dnsmasq', 10054, 10054)]) + { 'k8s-app': 'kube-scheduler' },
service.mixin.metadata.withNamespace('kube-system') + [{ name: 'https-metrics', port: 10259, targetPort: 10259 }]
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-dns' }) + ),
service.mixin.spec.withClusterIp('None'), kubeDnsPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery',
'kube-system',
{ 'k8s-app': 'kube-dns' },
{ 'k8s-app': 'kube-dns' },
[{ name: 'metrics', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }]
),
}, },
} }
jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet
+ 28
− 13
View file @ ea51bdb6
local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service(name, namespace, labels, selector, ports) = {
local service = k.core.v1.service; apiVersion: 'v1',
local servicePort = k.core.v1.service.mixin.spec.portsType; kind: 'Service',
metadata: {
name: name,
namespace: namespace,
labels: labels,
},
spec: {
ports+: ports,
selector: selector,
clusterIP: 'None',
},
};
{ {
prometheus+: { prometheus+: {
kubeControllerManagerPrometheusDiscoveryService: kubeControllerManagerPrometheusDiscoveryService: service(
service.new('kube-controller-manager-prometheus-discovery', { 'k8s-app': 'kube-controller-manager' }, servicePort.newNamed('https-metrics', 10257, 10257)) + 'kube-controller-manager-prometheus-discovery',
service.mixin.metadata.withNamespace('kube-system') + 'kube-system',
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-controller-manager' }) + { 'k8s-app': 'kube-controller-manager' },
service.mixin.spec.withClusterIp('None'), { 'k8s-app': 'kube-controller-manager' },
kubeSchedulerPrometheusDiscoveryService: [{ name: 'https-metrics', port: 10257, targetPort: 10257 }],
service.new('kube-scheduler-prometheus-discovery', { 'k8s-app': 'kube-scheduler' }, servicePort.newNamed('https-metrics', 10259, 10259)) + ),
service.mixin.metadata.withNamespace('kube-system') + kubeSchedulerPrometheusDiscoveryService: service(
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-scheduler' }) + 'kube-scheduler-prometheus-discovery',
service.mixin.spec.withClusterIp('None'), 'kube-system',
{ 'k8s-app': 'kube-scheduler' },
{ 'k8s-app': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
),
}, },
} }
jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
+ 28
− 13
View file @ ea51bdb6
local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service(name, namespace, labels, selector, ports) = {
local service = k.core.v1.service; apiVersion: 'v1',
local servicePort = k.core.v1.service.mixin.spec.portsType; kind: 'Service',
metadata: {
name: name,
namespace: namespace,
labels: labels,
},
spec: {
ports+: ports,
selector: selector,
clusterIP: 'None',
},
};
{ {
prometheus+: { prometheus+: {
kubeControllerManagerPrometheusDiscoveryService: kubeControllerManagerPrometheusDiscoveryService: service(
service.new('kube-controller-manager-prometheus-discovery', { component: 'kube-controller-manager' }, servicePort.newNamed('https-metrics', 10257, 10257)) + 'kube-controller-manager-prometheus-discovery',
service.mixin.metadata.withNamespace('kube-system') + 'kube-system',
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-controller-manager' }) + { 'k8s-app': 'kube-controller-manager' },
service.mixin.spec.withClusterIp('None'), { 'k8s-app': 'kube-controller-manager' },
kubeSchedulerPrometheusDiscoveryService: [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
service.new('kube-scheduler-prometheus-discovery', { component: 'kube-scheduler' }, servicePort.newNamed('https-metrics', 10259, 10259)) + ),
service.mixin.metadata.withNamespace('kube-system') + kubeSchedulerPrometheusDiscoveryService: service(
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-scheduler' }) + 'kube-scheduler-prometheus-discovery',
service.mixin.spec.withClusterIp('None'), 'kube-system',
{ 'k8s-app': 'kube-scheduler' },
{ 'k8s-app': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
),
}, },
} }
jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet
+ 29
− 13
View file @ ea51bdb6
local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local service(name, namespace, labels, selector, ports) = {
local service = k.core.v1.service; apiVersion: 'v1',
local servicePort = k.core.v1.service.mixin.spec.portsType; kind: 'Service',
metadata: {
name: name,
namespace: namespace,
labels: labels,
},
spec: {
ports+: ports,
selector: selector,
clusterIP: 'None',
},
};
{ {
prometheus+: { prometheus+: {
kubeControllerManagerPrometheusDiscoveryService: kubeControllerManagerPrometheusDiscoveryService: service(
service.new('kube-controller-manager-prometheus-discovery', { 'component': 'kube-controller-manager' }, servicePort.newNamed('https-metrics', 10257, 10257)) + 'kube-controller-manager-prometheus-discovery',
service.mixin.metadata.withNamespace('kube-system') + 'kube-system',
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-controller-manager' }) + { 'k8s-app': 'kube-controller-manager' },
service.mixin.spec.withClusterIp('None'), { 'k8s-app': 'kube-controller-manager' },
kubeSchedulerPrometheusDiscoveryService: [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
service.new('kube-scheduler-prometheus-discovery', { 'component': 'kube-scheduler' }, servicePort.newNamed('https-metrics', 10259, 10259)) + ),
service.mixin.metadata.withNamespace('kube-system') +
service.mixin.metadata.withLabels({ 'k8s-app': 'kube-scheduler' }) + kubeSchedulerPrometheusDiscoveryService: service(
service.mixin.spec.withClusterIp('None'), 'kube-scheduler-prometheus-discovery',
'kube-system',
{ 'k8s-app': 'kube-scheduler' },
{ 'k8s-app': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
),
serviceMonitorKubeScheduler+: { serviceMonitorKubeScheduler+: {
spec+: { spec+: {
......
jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet
+ 9
− 12
View file @ ea51bdb6
local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local patch(ports) = {
local service = k.core.v1.service; spec+: {
local servicePort = k.core.v1.service.mixin.spec.portsType; ports+: ports,
type: 'NodePort',
},
};
{ {
prometheus+: { prometheus+: {
service+: service+: patch([{ name: 'web', port: 9090, targetPort: 'web', nodePort: 30900 }]),
service.mixin.spec.withPorts(servicePort.newNamed('web', 9090, 'web') + servicePort.withNodePort(30900)) +
service.mixin.spec.withType('NodePort'),
}, },
alertmanager+: { alertmanager+: {
service+: service+: patch([{ name: 'web', port: 9093, targetPort: 'web', nodePort: 30903 }]),
service.mixin.spec.withPorts(servicePort.newNamed('web', 9093, 'web') + servicePort.withNodePort(30903)) +
service.mixin.spec.withType('NodePort'),
}, },
grafana+: { grafana+: {
service+: service+: patch([{ name: 'http', port: 3000, targetPort: 'http', nodePort: 30902 }]),
service.mixin.spec.withPorts(servicePort.newNamed('http', 3000, 'http') + servicePort.withNodePort(30902)) +
service.mixin.spec.withType('NodePort'),
}, },
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment