Merge pull request #508 from johanneswuerbach/custom-metrics-b2

custom metrics v1beta2 api with k8s-prometheus-adapter v0.7.0

jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet

@@ -134,6 +134,24 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
         versionPriority: 100,
       },
     },
+    customMetricsApiServiceV1Beta2: {
+      apiVersion: 'apiregistration.k8s.io/v1',
+      kind: 'APIService',
+      metadata: {
+        name: 'v1beta2.custom.metrics.k8s.io',
+      },
+      spec: {
+        service: {
+          name: $.prometheusAdapter.service.metadata.name,
+          namespace: $._config.namespace,
+        },
+        group: 'custom.metrics.k8s.io',
+        version: 'v1beta2',
+        insecureSkipTLSVerify: true,
+        groupPriorityMinimum: 100,
+        versionPriority: 200,
+      },
+    },
     customMetricsClusterRoleServerResources:
       local clusterRole = k.rbac.v1.clusterRole;
       local policyRule = clusterRole.rulesType;

jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet

@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
     namespace: 'default',
 
     versions+:: {
-      prometheusAdapter: 'v0.5.0',
+      prometheusAdapter: 'v0.7.0',
     },
 
     imageRepos+:: {

manifests/prometheus-adapter-deployment.yaml

@@ -25,7 +25,7 @@ spec:
         - --metrics-relist-interval=1m
         - --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/
         - --secure-port=6443
-        image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.5.0
+        image: quay.io/coreos/k8s-prometheus-adapter-amd64:v0.7.0
         name: prometheus-adapter
         ports:
         - containerPort: 6443