Jie Yu 87c90e6b1f [stable/prometheus-adapter] conditionally register external metrics API (#13716) (#14389) ...

* [stable/prometheus-adapter] conditionally register external metrics API (#13716)

The prometheus-adapter will NOT serve external metrics API if
`externalRules` section is not specified. See this code:
https://github.com/DirectXMan12/k8s-prometheus-adapter/blob/v0.5.0/cmd/adapter/adapter.go#L177

In that case, we cannot bindly register the external metrics API.
Otherwise, we might see issues described in #13716. This patch fixed the
issue by conditionally register the external metrics API.

Fixes #13716

Signed-off-by: Jie Yu <yujie.jay@gmail.com>

* [stable/prometheus-adapter] bump chart version to 1.0.3

Bump the chart version to 1.0.3 due to the fix of #13716.

Signed-off-by: Jie Yu <yujie.jay@gmail.com>

* [stable/prometheus-adapter] use 'and' to combine template directives

To address the review comments.

Signed-off-by: Jie Yu <yujie.jay@gmail.com>

* [stable/prometheus-adapter] add ci test values

To improve the test coverage.

Signed-off-by: Jie Yu <yujie.jay@gmail.com>

2019-06-01 19:04:13 -07:00

0 lines

0 B

YAML

Raw Permalink Blame History

The file is empty.