Merge remote-tracking branch 'upstream/master'

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:

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:

experimental/metrics-server/metrics-server-deployment.yaml

-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: metrics-server

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: [
                 {

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"
         }
       },

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