diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index 133c4c7c34a7c686a05314ea24cf5a938606ab8b..62523699f199b30cc3d46caee9d7ae2852556770 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json index ac201dd27f35ac325eb189d6a4e64f3293d6c051..dfc04788860e99d34a022b7c8ef6249f2caea2c2 100644 --- a/jsonnet/kube-prometheus/jsonnetfile.json +++ b/jsonnet/kube-prometheus/jsonnetfile.json @@ -49,6 +49,16 @@ } }, "version": "master" + }, + { + "name": "ksonnet4", + "source": { + "git": { + "remote": "https://github.com/metalmatze/ksonnet-lib", + "subdir": "" + } + }, + "version": "ksonnet.beta.4" } ] } diff --git a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet index 6956e3db64ec4ff6926b985cd526a9ab7a601766..6cb6eab1dfb7f14e40d55a40a558a683ad9a417d 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet @@ -1,5 +1,5 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; -local statefulSet = k.apps.v1beta2.statefulSet; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local statefulSet = k.apps.v1.statefulSet; local affinity = statefulSet.mixin.spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecutionType; local matchExpression = affinity.mixin.podAffinityTerm.labelSelector.matchExpressionsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet index a9cf3bb32c74d6086be838f668fae2655904ed19..0d2422619ad561cec11f53d29d4ee2edd581a084 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet index 4c61087263dc4ce5a6c7485d821b8c1d0428baa2..0eda00f56dcbdd27bbb0181e0218ffc6d143c809 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet index 556fa85639a83f44f916f9ff6b74eaadb41d8fa2..7dbc34db39bd82a7e1c05b7da6cd788aec358926 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet index 8a69d2156010f5070049ed7bd1d1d984affc19c3..abdd764ec242b9b3c5ca146161e274f4e15705a8 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet index a249d1dbfc77984e7892fb7caf4b631f00c5ce6f..e0ddeb856a3575fb211185357bf4e7dea5f4f889 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet index 01ecab325e6e95b01374a9ac9ff9814a58a8349c..7ce075fd030d0a7fe6c3a76123cb4d2cb34d9d62 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet index 48df7478aeb2db4e0c39d797aa3b68eafe599769..e34877b0256ecf18639a1cabccc5c6d241f3cc54 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-node-ports.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; diff --git a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet index 573e809c7b3eedc5b65737f5f0f629c8564f82f7..6a2b9552aa598fe292cb534db63a89f9d2bd8c3e 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; (import 'etcd-mixin/mixin.libsonnet') + { _config+:: { diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet index 4b20b814a58ba415931c1a3a52437ad6902f9675..a74aa9e29757bf2107ff8f39555464d247484d83 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-thanos.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; local service = k.core.v1.service; local servicePort = k.core.v1.service.mixin.spec.portsType; @@ -68,8 +68,8 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; }, }, thanosQueryDeployment: - 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 thanosQueryContainer = @@ -99,7 +99,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; service.mixin.metadata.withLabels({ app: 'thanos-query' }), thanosStoreStatefulset: - local statefulSet = k.apps.v1beta2.statefulSet; + local statefulSet = k.apps.v1.statefulSet; local volume = statefulSet.mixin.spec.template.spec.volumesType; local container = statefulSet.mixin.spec.template.spec.containersType; local containerEnv = container.envType; @@ -177,7 +177,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; service.mixin.metadata.withLabels({ app: 'thanos-compactor' }), thanosCompactorStatefulset: - local statefulSet = k.apps.v1beta2.statefulSet; + local statefulSet = k.apps.v1.statefulSet; local volume = statefulSet.mixin.spec.template.spec.volumesType; local container = statefulSet.mixin.spec.template.spec.containersType; local containerEnv = container.envType; diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index f51ae49ac1aad5a2bb004c83ed6aff2e28bb9d3d..ca1772c0cc50024e10e237b3cb82d59fc10704d2 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -1,5 +1,6 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; -local configMapList = k.core.v1.configMapList; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local configMapList = k3.core.v1.configMapList; (import 'grafana/grafana.libsonnet') + (import 'kube-state-metrics/kube-state-metrics.libsonnet') + diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet index 5172fb9427c37fcd9af4ba4a2ecac848cfe85212..99e7e5f10347576ef5295af569f86660d4368ca4 100644 --- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; { _config+:: { @@ -122,9 +122,9 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; clusterRole.mixin.metadata.withName('kube-state-metrics') + clusterRole.withRules(rules), deployment: - local deployment = k.apps.v1beta2.deployment; - local container = k.apps.v1beta2.deployment.mixin.spec.template.spec.containersType; - local volume = k.apps.v1beta2.deployment.mixin.spec.template.spec.volumesType; + local deployment = k.apps.v1.deployment; + local container = deployment.mixin.spec.template.spec.containersType; + local volume = deployment.mixin.spec.template.spec.volumesType; local containerPort = container.portsType; local containerVolumeMount = container.volumeMountsType; 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), '--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.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), '--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.withLimits({ cpu: '20m', memory: '40Mi' }); @@ -259,7 +259,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; 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 ksmServicePortSelf = servicePort.newNamed('https-self', 9443, 'https-self'); diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index bc69347d47c95edccfb4a422f535851a9e477a3f..c04f6ed46c1a41861a3e037c0bba4c8de989740a 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; { _config+:: { @@ -55,7 +55,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; clusterRole.withRules(rules), daemonset: - local daemonset = k.apps.v1beta2.daemonSet; + local daemonset = k.apps.v1.daemonSet; local container = daemonset.mixin.spec.template.spec.containersType; local volume = daemonset.mixin.spec.template.spec.volumesType; local containerPort = container.portsType; diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet index b233625976c68cc005dd7965a1dce4d666cc6e28..fb3b6753c21928325522bd34ec994bf50a14d4f8 100644 --- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet +++ b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet @@ -1,4 +1,4 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; { _config+:: { @@ -87,7 +87,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; service.mixin.metadata.withLabels($._config.prometheusAdapter.labels), deployment: - local deployment = k.apps.v1beta2.deployment; + local deployment = k.apps.v1.deployment; local volume = deployment.mixin.spec.template.spec.volumesType; local container = deployment.mixin.spec.template.spec.containersType; local containerVolumeMount = container.volumeMountsType; diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 57c541095cee761671e942f2d2add5286dd02b3d..7ebeb1a51d0efb0d59f300fac0b1ea4efa3b0cba 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -1,4 +1,5 @@ -local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; +local k = import 'ksonnet4/ksonnet.beta.4/k.libsonnet'; +local k3 = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; { _config+:: { @@ -69,7 +70,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; roleBinding.mixin.roleRef.mixinInstance({ kind: 'Role' }) + 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]), 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.withRules(coreRule); - local roleList = k.rbac.v1.roleList; + local roleList = k3.rbac.v1.roleList; roleList.new([newSpecificRole(x) for x in $._config.prometheus.namespaces]), prometheus: - local statefulSet = k.apps.v1beta2.statefulSet; + local statefulSet = k.apps.v1.statefulSet; local container = statefulSet.mixin.spec.template.spec.containersType; local resourceRequirements = container.mixin.resourcesType; local selector = statefulSet.mixin.spec.selectorType; diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index c78b87c226e574d19e41782238e40cc478b3a45b..c1122146e7c7ff918effebb70e22cfc5cc173fa9 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -20,6 +20,16 @@ }, "version": "d03da231d6c8bd74437b74a1e9e8b966f13dffa2" }, + { + "name": "ksonnet4", + "source": { + "git": { + "remote": "https://github.com/metalmatze/ksonnet-lib", + "subdir": "" + } + }, + "version": "3e10db7d0dce7c175ac03be631001489b5578744" + }, { "name": "kubernetes-mixin", "source": {