diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index 133c4c7c..404f9516 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 'ksonnet/ksonnet.beta.4/k.libsonnet'; { _config+:: { diff --git a/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet index 6956e3db..dafe4ec9 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 'ksonnet/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 a9cf3bb3..3e2094a5 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 'ksonnet/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 4c610872..8a309d28 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 'ksonnet/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 556fa856..01b6e2e7 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 'ksonnet/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 8a69d215..23b33c9f 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 'ksonnet/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 a249d1db..9e497cd6 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 'ksonnet/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 01ecab32..4cfde11e 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 'ksonnet/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 48df7478..b10a1bb4 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 'ksonnet/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 573e809c..63094f15 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 'ksonnet/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 4b20b814..68deb4f0 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 'ksonnet/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 f51ae49a..72142b0a 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 'ksonnet/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 5172fb94..0e981974 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 'ksonnet/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 bc69347d..f4aa9f47 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 'ksonnet/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 b2336259..da0570d6 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 'ksonnet/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 57c54109..9a52f38b 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 'ksonnet/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 c78b87c2..8512ebf0 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "6562f95c143531d09d8c3d8629d8de98ab65a43d" + "version": "107028fff38b6e3dce3e1ef110222474fb01b31c" }, { "name": "ksonnet", @@ -18,7 +18,7 @@ "subdir": "" } }, - "version": "d03da231d6c8bd74437b74a1e9e8b966f13dffa2" + "version": "0d2f82676817bbf9e4acf6495b2090205f323b9f" }, { "name": "kubernetes-mixin", diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml index d57ea12d..8ac51b23 100644 --- a/manifests/kube-state-metrics-deployment.yaml +++ b/manifests/kube-state-metrics-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml index 913f90ee..8213bc11 100644 --- a/manifests/node-exporter-daemonset.yaml +++ b/manifests/node-exporter-daemonset.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: DaemonSet metadata: labels: diff --git a/manifests/prometheus-adapter-deployment.yaml b/manifests/prometheus-adapter-deployment.yaml index b0c20198..fce0fd4e 100644 --- a/manifests/prometheus-adapter-deployment.yaml +++ b/manifests/prometheus-adapter-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: prometheus-adapter