refactor

Author: videlov

charts/controlplane-operations/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: controlplane-operations
-version: 1.0.4
+version: 1.0.5
 description: A set of Plutono dashboards and Prometheus alerting rules combined with playbooks to ensure effective operations of Controlplane clusters.
 maintainers:
   - name: Vladimir Videlov (d051408)

charts/controlplane-operations/alerts/controlplane-bond.yaml

@@ -8,7 +8,7 @@ groups:
     labels:
       severity: {{ dig "NodeBondDegradedMain" "severity" "warning" .Values.prometheusRules }}
       playbook: https://github.com/cobaltcore-dev/controlplane-operations/playbooks/NodeBondDegradedMain.md
-      {{ include "controlplane-operations.additionalRuleLabels" . | nindent 6 }}
+      {{ include "controlplane-operations.additionalRuleLabels" . }}
     annotations:
       description: Bond `{{`{{ $labels.master }}`}}` on `{{`{{ $labels.node }}`}}` is degraded. Imminent network outage for this node.
       summary: Bond `{{`{{ $labels.master }}`}}` is degraded. Node network connectivity is not HA. Switch failover or upgrade will cause an outage!
@@ -21,7 +21,7 @@ groups:
     labels:
       severity: {{ dig "NodeVirtualInterfaceDown" "severity" "warning" .Values.prometheusRules }}
       playbook: https://github.com/cobaltcore-dev/controlplane-operations/playbooks/NodeVirtualInterfaceDown.md
-      {{ include "controlplane-operations.additionalRuleLabels" . | nindent 6 }}
+      {{ include "controlplane-operations.additionalRuleLabels" . }}
     annotations:
       description: Interface `{{`{{ $labels.device }}`}}` on `{{`{{ $labels.node }}`}}` is down. Tenant network outage for this node.
       summary: Interface `{{`{{ $labels.device }}`}}` is down. Node network connectivity is degraded.

charts/controlplane-operations/alerts/controlplane-node.yaml

@@ -8,7 +8,7 @@ groups:
     labels:
       severity: {{ dig "KubernetesNodeBridgeFilterVLANTagged" "severity" "info" .Values.prometheusRules }}
       playbook: https://github.com/cobaltcore-dev/controlplane-operations/playbooks/KubernetesNodeBridgeFilterVLANTagged.md
-      {{ include "controlplane-operations.additionalRuleLabels" . | nindent 6 }}
+      {{ include "controlplane-operations.additionalRuleLabels" . }}
     annotations:
       description: VLAN-tagged ARP/IP traffic is filtered by ARPtables/IPtables on `{{`{{ $labels.node }}`}}`. Network datapath threatened!
       summary: Bridged VLAN-tagged traffic is filtered by IPtables.

charts/controlplane-operations/alerts/controlplane-pvc.yaml

@@ -13,7 +13,7 @@ groups:
     labels:
       severity: {{ dig "KubernetesPVCNoSpaceLeft" "severity" "info" .Values.prometheusRules }}
       playbook: https://github.com/cobaltcore-dev/controlplane-operations/playbooks/KubernetesPVCNoSpaceLeft.md
-      {{ include "controlplane-operations.additionalRuleLabels" . | nindent 6 }}
+      {{ include "controlplane-operations.additionalRuleLabels" . }}
     annotations:
       description: "The PVC `{{`{{ $labels.namespace }}`}}`/`{{`{{ $labels.persistentvolumeclaim }}`}}` is almost full. Increase or delete files."
       summary: "PVC `{{`{{ $labels.namespace }}`}}`/`{{`{{ $labels.persistentvolumeclaim }}`}}` free space is less than 10%."
@@ -26,7 +26,7 @@ groups:
     labels:
       severity: {{ dig "KubernetesPVCNoSpaceLeft" "severity" "warning" .Values.prometheusRules }}
       playbook: https://github.com/cobaltcore-dev/controlplane-operations/playbooks/KubernetesPVCNoSpaceLeft.md
-      {{ include "controlplane-operations.additionalRuleLabels" . | nindent 6 }}
+      {{ include "controlplane-operations.additionalRuleLabels" . }}
     annotations:
       description: "The PVC `{{`{{ $labels.namespace }}`}}`/`{{`{{ $labels.persistentvolumeclaim }}`}}` is full. Programs will stop working if relying upon free storage."
       summary: "PVC `{{`{{ $labels.namespace }}`}}`/`{{`{{ $labels.persistentvolumeclaim }}`}}` usage is over 98%."

charts/controlplane-operations/alerts/controlplane-remote.yaml

@@ -10,7 +10,7 @@ groups:
     labels:
       severity: {{ dig "ArgoraUpdateInError" "severity" "warning" .Values.prometheusRules }}
       playbook: https://github.com/cobaltcore-dev/controlplane-operations/playbooks/ArgoraUpdateInError.md
-      {{ include "controlplane-operations.additionalRuleLabels" . | nindent 6 }}
+      {{ include "controlplane-operations.additionalRuleLabels" . }}
     annotations:
       description: "Argora Update CR status is in Error state for more than 1 minute."
       summary: "Update CR in Error state."

charts/controlplane-operations/plugindefinition.yaml

@@ -3,15 +3,15 @@ kind: PluginDefinition
 metadata:
   name: controlplane-operations
 spec:
-  version: 1.0.4
+  version: 1.0.5
   displayName: Controlplane operations bundle
   description: Operations bundle for Controlane clusters
   docMarkDownUrl: https://raw.githubusercontent.com/cloudoperators/controlplane-operations/main/README.md
   icon: https://raw.githubusercontent.com/cloudoperators/controlplane-operations/main/charts/controlplane-operations/kubernetes-logo.png
   helmChart:
     name: controlplane-operations
     repository: oci://ghcr.io/cloudoperators/controlplane-operations/charts
-    version: 1.0.4
+    version: 1.0.5
   options:
     - name: prometheusRules.create
       description: Create Prometheus rules

charts/controlplane-operations/templates/_helpers.tpl

@@ -22,7 +22,7 @@ plugin: {{ $root.Release.Name }}
 
 {{- define "controlplane-operations.additionalRuleLabels" }}
 {{- if .Values.prometheusRules.additionalRuleLabels }}
-{{- toYaml .Values.prometheusRules.additionalRuleLabels }}
+{{- toYaml .Values.prometheusRules.additionalRuleLabels | nindent 6 }}
 {{- end }}
 {{- if .Values.global.commonLabels }}
 {{ tpl (toYaml .Values.global.commonLabels) . }}