v0.7.1: render alert rules on DKP without operator-prometheus-crd
helm_lib_prometheus_rules only renders when "operator-prometheus-crd" is an enabled module; on DKP 1.76 that module doesn't exist (the CRDs come with operator-prometheus), so the two alerts were silently dropped on a live install. Gate on the PrometheusRule API instead. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
1bd2006125
commit
1df5d3559a
+1
-1
@@ -1,5 +1,5 @@
|
||||
name: cluster-map
|
||||
version: 0.7.0
|
||||
version: 0.7.1
|
||||
dependencies:
|
||||
- name: deckhouse_lib_helm
|
||||
version: 1.72.24
|
||||
|
||||
@@ -27,7 +27,7 @@ WERF ?= werf
|
||||
BUILD_REGISTRY ?= localhost:5555
|
||||
BUILD_REPO ?= $(BUILD_REGISTRY)/$(MODULE)
|
||||
DMT ?= dmt
|
||||
API_VERSIONS ?= --api-versions autoscaling.k8s.io/v1/VerticalPodAutoscaler --api-versions monitoring.coreos.com/v1/PodMonitor
|
||||
API_VERSIONS ?= --api-versions autoscaling.k8s.io/v1/VerticalPodAutoscaler --api-versions monitoring.coreos.com/v1/PodMonitor --api-versions monitoring.coreos.com/v1/PrometheusRule
|
||||
|
||||
.PHONY: test lint render base-images build-registry build publish release
|
||||
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
v0.7.1:
|
||||
fixes:
|
||||
- Alert rules are rendered on DKP versions without the operator-prometheus-crd module.
|
||||
v0.7.0:
|
||||
features:
|
||||
- First release as a Deckhouse module (ModuleSource, release channels, lib-helm templates).
|
||||
|
||||
@@ -27,4 +27,10 @@ spec:
|
||||
regex: "true"
|
||||
action: keep
|
||||
{{- end }}
|
||||
{{- include "helm_lib_prometheus_rules" (list . "d8-cluster-map") }}
|
||||
{{- /* helm_lib_prometheus_rules only renders when "operator-prometheus-crd"
|
||||
is among enabled modules; on DKP 1.76 the CRDs ship with
|
||||
operator-prometheus and that module name no longer exists, so the
|
||||
rules were silently dropped. Gate on the API itself instead. */}}
|
||||
{{- if (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/PrometheusRule") }}
|
||||
{{- include "helm_lib_prometheus_rules_recursion" (list . "d8-cluster-map" "monitoring/prometheus-rules") }}
|
||||
{{- end }}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# CertManager https, cilium-hubble installed. Used by `make render`.
|
||||
global:
|
||||
clusterIsBootstrapped: true
|
||||
enabledModules: ["user-authn", "cert-manager", "vertical-pod-autoscaler", "operator-prometheus-crd", "cilium-hubble"]
|
||||
enabledModules: ["user-authn", "cert-manager", "vertical-pod-autoscaler", "operator-prometheus", "cilium-hubble"]
|
||||
discovery:
|
||||
clusterDomain: cluster.local
|
||||
clusterControlPlaneIsHighlyAvailable: false
|
||||
|
||||
Reference in New Issue
Block a user