diff --git a/examples/example-app/example-app.yaml b/examples/example-app/example-app.yaml index 708e8afabb50fc4fd7d2c0fcf9623dd92fd328be..69a2ab7e9cee86c940abc61c9dcf905f14849de1 100644 --- a/examples/example-app/example-app.yaml +++ b/examples/example-app/example-app.yaml @@ -14,12 +14,16 @@ spec: port: 8080 targetPort: web --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: example-app namespace: default spec: + selector: + matchLabels: + app: example-app + version: 1.1.3 replicas: 4 template: metadata: diff --git a/experimental/metrics-server/metrics-server-cluster-role.yaml b/experimental/metrics-server/metrics-server-cluster-role.yaml index 38844d9a69d82ed6eed956d14467becd10b91714..f34ea8fd0d20c8b2282e14cda2ea138952f0ca86 100644 --- a/experimental/metrics-server/metrics-server-cluster-role.yaml +++ b/experimental/metrics-server/metrics-server-cluster-role.yaml @@ -14,6 +14,14 @@ rules: - get - list - watch +- apiGroups: + - "apps" + resources: + - deployments + verbs: + - get + - list + - watch - apiGroups: - "extensions" resources: diff --git a/experimental/metrics-server/metrics-server-deployment.yaml b/experimental/metrics-server/metrics-server-deployment.yaml index 386740dac39554becdafeb85e56201607f763729..0dbd2b2cd8a28f80c81685098eb81bc1b5591d01 100644 --- a/experimental/metrics-server/metrics-server-deployment.yaml +++ b/experimental/metrics-server/metrics-server-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: metrics-server diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index 06a7397fce1bb75beb66e4f4805ade2ae50546f1..58fc06c1d175a6bcd16144c6a93d9af6062e069f 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -168,7 +168,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; { port: 'https', scheme: 'https', - interval: '30s', + interval: '15s', bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', relabelings: [ { diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index d97e7f93b581ae7af37bf2e590fcaa6d9903ce49..6cbd0aae4bddef693029250575f015fcf52d9fc4 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -26,7 +26,7 @@ "name": "grafana-builder", "source": { "git": { - "remote": "https://github.com/grafana/jsonnet-libs", + "remote": "https://github.com/kausalco/public", "subdir": "grafana-builder" } }, diff --git a/manifests/node-exporter-serviceMonitor.yaml b/manifests/node-exporter-serviceMonitor.yaml index 590c875af8472bbb5047f766677e279cbe7893ec..3ceed6c94caf90412db3fc0e6f7acca2b3ab3d10 100644 --- a/manifests/node-exporter-serviceMonitor.yaml +++ b/manifests/node-exporter-serviceMonitor.yaml @@ -8,7 +8,7 @@ metadata: spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - interval: 30s + interval: 15s port: https relabelings: - action: replace