chore(templates): simpler alert file naming (#12)

* chore(templates): simpler alert file naming * chore(gh-actions): remove chart tests * Automatic application of license header * fix(gh-action): chart dir * fix(values.yaml): trailing spaces * chore(Chart.yaml): remove source --------- Co-authored-by: License Bot <[email protected]>
cloudoperators · Oct 17, 2024 · 55d7046 · 55d7046
1 parent e112789
commit 55d7046
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 18 deletions.
diff --git a/.github/configs/helm-lint.yaml b/.github/configs/helm-lint.yaml
@@ -7,4 +7,4 @@ target-branch: main
 validate-maintainers: false
 check-version-increment: false
 chart-dirs:
-  - charts/kubernetes-operations
+  - charts
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
@@ -39,14 +39,6 @@ jobs:
         if: steps.list-changed.outputs.changed == 'true'
         run: ct lint --config .github/configs/helm-lint.yaml --target-branch ${{ github.event.repository.default_branch }}
 
-      - name: Run chart-testing (list-changed)
-        id: chart-test-list-changed
-        run: |
-          changed=$(ct list-changed --config .github/configs/helm-test.yaml --target-branch ${{ github.event.repository.default_branch }})
-          if [[ -n "$changed" ]]; then
-            echo "changed=true" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: Check version bump
         id: check-bump
         if: steps.list-changed.outputs.changed == 'true'

diff --git a/charts/kubernetes-operations/Chart.yaml b/charts/kubernetes-operations/Chart.yaml
@@ -3,13 +3,11 @@
 
 apiVersion: v2
 name: kubernetes-operations
-version: 1.0.0
+version: 1.1.0
 description: A set of Plutono dashboards and Prometheus alerting rules combined with playbooks to ensure effective operations of Kubernetes.
 maintainers:
   - name: Richard Tief (I520251)
     email: [email protected]
-sources:
-  - ghcr.io/cloudoperators/kubernetes-operations
 keywords:
   - Helm Chart
   - Kubernetes operations

diff --git a/...ns/alerts/kubernetes-apiserver.alerts.tpl → ...erations/alerts/kubernetes-apiserver.yaml b/...ns/alerts/kubernetes-apiserver.alerts.tpl → ...erations/alerts/kubernetes-apiserver.yaml
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
+# SPDX-License-Identifier: Apache-2.0
+
 groups:
 - name: kubernetes-apiserver
   rules:

diff --git a/...tions/alerts/kubernetes-health.alerts.tpl → ...-operations/alerts/kubernetes-health.yaml b/...tions/alerts/kubernetes-health.alerts.tpl → ...-operations/alerts/kubernetes-health.yaml
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
+# SPDX-License-Identifier: Apache-2.0
+
 groups:
 - name: kubernetes-health
   rules:

diff --git a/...ions/alerts/kubernetes-kubelet.alerts.tpl → ...operations/alerts/kubernetes-kubelet.yaml b/...ions/alerts/kubernetes-kubelet.alerts.tpl → ...operations/alerts/kubernetes-kubelet.yaml
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
+# SPDX-License-Identifier: Apache-2.0
+
 groups:
 - name: kubernetes-kubelet
   rules:

diff --git a/...rations/alerts/kubernetes-node.alerts.tpl → ...es-operations/alerts/kubernetes-node.yaml b/...rations/alerts/kubernetes-node.alerts.tpl → ...es-operations/alerts/kubernetes-node.yaml
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
+# SPDX-License-Identifier: Apache-2.0
+
 groups:
 - name: kubernetes-node
   rules:

diff --git a/charts/kubernetes-operations/plugindefinition.yaml b/charts/kubernetes-operations/plugindefinition.yaml
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and Greenhouse contributors
+# SPDX-License-Identifier: Apache-2.0
+
 # SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company and cobaltcore-dev contributors
 # SPDX-License-Identifier: Apache-2.0
 
@@ -6,15 +9,15 @@ kind: PluginDefinition
 metadata:
   name: kubernetes-operations
 spec:
-  version: 1.0.0
+  version: 1.1.0
   displayName: Kubernetes operations bundle
   description: Operations bundle for Kubernetes
   docMarkDownUrl: https://raw.githubusercontent.com/cloudoperators/kubernetes-operations/main/README.md
   icon: https://raw.githubusercontent.com/cloudoperators/kubernetes-operations/main/charts/kubernetes-operations/kubernetes-logo.png
   helmChart:
     name: kubernetes-operations
     repository: oci://ghcr.io/cloudoperators/kubernetes-operations/charts
-    version: 1.0.0
+    version: 1.1.0
   options:
     - name: prometheusRules.create
       description: Create Prometheus rules

diff --git a/charts/kubernetes-operations/templates/alerts.yaml b/charts/kubernetes-operations/templates/alerts.yaml
@@ -1,10 +1,10 @@
 {{- if .Values.prometheusRules.create -}}
 {{- $root := . -}}
-{{- range $path, $bytes := .Files.Glob "alerts/*.alerts.tpl" }}
+{{- range $path, $bytes := .Files.Glob "alerts/*.yaml" }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ printf "%s-%s" $.Release.Name $path | replace "/" "-" | replace "." "-" | trimSuffix "-tpl" | replace "-alerts-" "-" | trunc 63 }}
+  name: {{ printf "%s-%s" $.Release.Name $path | replace "/" "-" | trimSuffix "-yaml" | trunc 63 }}
   labels:
 {{ include "kubernetes-operations.ruleSelectorLabels" (list $path $root) | indent 4 }} 
 {{ include "kubernetes-operations.labels" (list $path $root) | indent 4 }}

diff --git a/charts/kubernetes-operations/values.yaml b/charts/kubernetes-operations/values.yaml
@@ -9,8 +9,8 @@ global:
 ## C default rules for monitoring the cluster
 ##
 prometheusRules:
-  
-  ## Enables PrometheusRule resources to be created 
+
+  ## Enables PrometheusRule resources to be created
   create: true
 
   ## Label selectors for the Prometheus rules to be picked up by Prometheus.