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

Merge pull request #87 from metalmatze/ksonnet.beta.4

Browse Source 
Use ksonnet.beta.4 with updated Kubernetes 1.14
This commit is contained in:
Frederic Branczyk
2019-06-04 15:56:20 +02:00
committed by GitHub
parent e7d077937c f7f9bdea91
commit 50d3e774a5
20 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
{ {
_config+:: { _config+:: {

4
jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet
View File

@@ -1,5 +1,5 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local statefulSet = k.apps.v1beta2.statefulSet; local statefulSet = k.apps.v1.statefulSet;
local affinity = statefulSet.mixin.spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecutionType; local affinity = statefulSet.mixin.spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecutionType;
local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpressionsType; local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpressionsType;

2
jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;

2
jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;

2
jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;

2
jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;

2
jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;

2
jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;

2
jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;

2
jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
(import 'etcd-mixin/mixin.libsonnet') + { (import 'etcd-mixin/mixin.libsonnet') + {
_config+:: { _config+:: {

10
jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = k.core.v1.service.mixin.spec.portsType;
@@ -68,8 +68,8 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
}, },
}, },
thanosQueryDeployment: thanosQueryDeployment:
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 thanosQueryContainer = local thanosQueryContainer =
@@ -99,7 +99,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
service.mixin.metadata.withLabels({ app: 'thanos-query' }), service.mixin.metadata.withLabels({ app: 'thanos-query' }),
thanosStoreStatefulset: thanosStoreStatefulset:
local statefulSet = k.apps.v1beta2.statefulSet; local statefulSet = k.apps.v1.statefulSet;
local volume = statefulSet.mixin.spec.template.spec.volumesType; local volume = statefulSet.mixin.spec.template.spec.volumesType;
local container = statefulSet.mixin.spec.template.spec.containersType; local container = statefulSet.mixin.spec.template.spec.containersType;
local containerEnv = container.envType; local containerEnv = container.envType;
@@ -177,7 +177,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType;
service.mixin.metadata.withLabels({ app: 'thanos-compactor' }), service.mixin.metadata.withLabels({ app: 'thanos-compactor' }),
thanosCompactorStatefulset: thanosCompactorStatefulset:
local statefulSet = k.apps.v1beta2.statefulSet; local statefulSet = k.apps.v1.statefulSet;
local volume = statefulSet.mixin.spec.template.spec.volumesType; local volume = statefulSet.mixin.spec.template.spec.volumesType;
local container = statefulSet.mixin.spec.template.spec.containersType; local container = statefulSet.mixin.spec.template.spec.containersType;
local containerEnv = container.envType; local containerEnv = container.envType;

5
jsonnet/kube-prometheus/kube-prometheus.libsonnet
View File

@@ -1,5 +1,6 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local configMapList = k.core.v1.configMapList; local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
local configMapList = k3.core.v1.configMapList;
(import 'grafana/grafana.libsonnet') + (import 'grafana/grafana.libsonnet') +
(import 'kube-state-metrics/kube-state-metrics.libsonnet') + (import 'kube-state-metrics/kube-state-metrics.libsonnet') +

14
jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
{ {
_config+:: { _config+:: {
@@ -122,9 +122,9 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
clusterRole.mixin.metadata.withName('kube-state-metrics') + clusterRole.mixin.metadata.withName('kube-state-metrics') +
clusterRole.withRules(rules), clusterRole.withRules(rules),
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 = deployment.mixin.spec.template.spec.containersType;
local volume = k.apps.v1beta2.deployment.mixin.spec.template.spec.volumesType; local volume = deployment.mixin.spec.template.spec.volumesType;
local containerPort = container.portsType; local containerPort = container.portsType;
local containerVolumeMount = container.volumeMountsType; local containerVolumeMount = container.volumeMountsType;
local podSelector = deployment.mixin.spec.template.spec.selectorType; local podSelector = deployment.mixin.spec.template.spec.selectorType;
@@ -139,7 +139,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
'--tls-cipher-suites=' + std.join(',', $._config.tlsCipherSuites), '--tls-cipher-suites=' + std.join(',', $._config.tlsCipherSuites),
'--upstream=http://127.0.0.1:8081/', '--upstream=http://127.0.0.1:8081/',
]) + ]) +
container.withPorts(containerPort.newNamed('https-main', 8443)) + container.withPorts(containerPort.newNamed(8443, 'https-main',)) +
container.mixin.resources.withRequests({ cpu: '10m', memory: '20Mi' }) + container.mixin.resources.withRequests({ cpu: '10m', memory: '20Mi' }) +
container.mixin.resources.withLimits({ cpu: '20m', memory: '40Mi' }); container.mixin.resources.withLimits({ cpu: '20m', memory: '40Mi' });
@@ -151,7 +151,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
'--tls-cipher-suites=' + std.join(',', $._config.tlsCipherSuites), '--tls-cipher-suites=' + std.join(',', $._config.tlsCipherSuites),
'--upstream=http://127.0.0.1:8082/', '--upstream=http://127.0.0.1:8082/',
]) + ]) +
container.withPorts(containerPort.newNamed('https-self', 9443)) + container.withPorts(containerPort.newNamed(9443, 'https-self',)) +
container.mixin.resources.withRequests({ cpu: '10m', memory: '20Mi' }) + container.mixin.resources.withRequests({ cpu: '10m', memory: '20Mi' }) +
container.mixin.resources.withLimits({ cpu: '20m', memory: '40Mi' }); container.mixin.resources.withLimits({ cpu: '20m', memory: '40Mi' });
@@ -259,7 +259,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
service: service:
local service = k.core.v1.service; local service = k.core.v1.service;
local servicePort = k.core.v1.service.mixin.spec.portsType; local servicePort = service.mixin.spec.portsType;
local ksmServicePortMain = servicePort.newNamed('https-main', 8443, 'https-main'); local ksmServicePortMain = servicePort.newNamed('https-main', 8443, 'https-main');
local ksmServicePortSelf = servicePort.newNamed('https-self', 9443, 'https-self'); local ksmServicePortSelf = servicePort.newNamed('https-self', 9443, 'https-self');

4
jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet
View File

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
{ {
_config+:: { _config+:: {
@@ -55,7 +55,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
clusterRole.withRules(rules), clusterRole.withRules(rules),
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 volume = daemonset.mixin.spec.template.spec.volumesType; local volume = daemonset.mixin.spec.template.spec.volumesType;
local containerPort = container.portsType; local containerPort = container.portsType;

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

@@ -1,4 +1,4 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
{ {
_config+:: { _config+:: {
@@ -87,7 +87,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
service.mixin.metadata.withLabels($._config.prometheusAdapter.labels), service.mixin.metadata.withLabels($._config.prometheusAdapter.labels),
deployment: deployment:
local deployment = k.apps.v1beta2.deployment; local deployment = k.apps.v1.deployment;
local volume = deployment.mixin.spec.template.spec.volumesType; local volume = deployment.mixin.spec.template.spec.volumesType;
local container = deployment.mixin.spec.template.spec.containersType; local container = deployment.mixin.spec.template.spec.containersType;
local containerVolumeMount = container.volumeMountsType; local containerVolumeMount = container.volumeMountsType;

9
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View File

@@ -1,4 +1,5 @@
local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
{ {
_config+:: { _config+:: {
@@ -69,7 +70,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
roleBinding.mixin.roleRef.mixinInstance({ kind: 'Role' }) + roleBinding.mixin.roleRef.mixinInstance({ kind: 'Role' }) +
roleBinding.withSubjects([{ kind: 'ServiceAccount', name: 'prometheus-' + $._config.prometheus.name, namespace: $._config.namespace }]); roleBinding.withSubjects([{ kind: 'ServiceAccount', name: 'prometheus-' + $._config.prometheus.name, namespace: $._config.namespace }]);
local roleBindigList = k.rbac.v1.roleBindingList; local roleBindigList = k3.rbac.v1.roleBindingList;
roleBindigList.new([newSpecificRoleBinding(x) for x in $._config.prometheus.namespaces]), roleBindigList.new([newSpecificRoleBinding(x) for x in $._config.prometheus.namespaces]),
clusterRole: clusterRole:
local clusterRole = k.rbac.v1.clusterRole; local clusterRole = k.rbac.v1.clusterRole;
@@ -141,10 +142,10 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
role.mixin.metadata.withNamespace(namespace) + role.mixin.metadata.withNamespace(namespace) +
role.withRules(coreRule); role.withRules(coreRule);
local roleList = k.rbac.v1.roleList; local roleList = k3.rbac.v1.roleList;
roleList.new([newSpecificRole(x) for x in $._config.prometheus.namespaces]), roleList.new([newSpecificRole(x) for x in $._config.prometheus.namespaces]),
prometheus: prometheus:
local statefulSet = k.apps.v1beta2.statefulSet; local statefulSet = k.apps.v1.statefulSet;
local container = statefulSet.mixin.spec.template.spec.containersType; local container = statefulSet.mixin.spec.template.spec.containersType;
local resourceRequirements = container.mixin.resourcesType; local resourceRequirements = container.mixin.resourcesType;
local selector = statefulSet.mixin.spec.selectorType; local selector = statefulSet.mixin.spec.selectorType;

4
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "jsonnet/kube-prometheus" "subdir": "jsonnet/kube-prometheus"
} }
}, },
"version": "6562f95c143531d09d8c3d8629d8de98ab65a43d" "version": "107028fff38b6e3dce3e1ef110222474fb01b31c"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
@@ -18,7 +18,7 @@
"subdir": "" "subdir": ""
} }
}, },
"version": "d03da231d6c8bd74437b74a1e9e8b966f13dffa2" "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f"
}, },
{ {
"name": "kubernetes-mixin", "name": "kubernetes-mixin",

2
manifests/kube-state-metrics-deployment.yaml
View File

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

2
manifests/node-exporter-daemonset.yaml
View File

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

2
manifests/prometheus-adapter-deployment.yaml
View File

@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: prometheus-adapter name: prometheus-adapter