diff --git a/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet index 479a7ee5f6ba1b4a0a6d7a789cdc514fd2d0b534..7c5b41661c1b6151172d00a6afa09d7c5fe8de65 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-custom-metrics.libsonnet +++ b/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; diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet index 97e41f81c2800a68de2a169fd8d258ee5d6dd27d..3ca13cf3af5c7fed1b7c826630eb9fe4284e3b3a 100644 --- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet +++ b/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+:: { diff --git a/manifests/prometheus-adapter-deployment.yaml b/manifests/prometheus-adapter-deployment.yaml index 2228106a9092e9d0b74afcf830d4dc22cea9059d..12745f7dfcb7d6f8a15f52cf5247e6b36182aff6 100644 --- a/manifests/prometheus-adapter-deployment.yaml +++ b/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