Merge pull request #108 from projectsyn/template-sync

Update from component template and remove K8s 1.25 test case

Author: Ronanc2797

.cruft.json

@@ -1,13 +1,13 @@
 {
   "template": "https://github.com/projectsyn/commodore-component-template.git",
-  "commit": "de1ad5aa829f6a478ba4d245c080056f9305e17e",
+  "commit": "84a7c63ca26492da555344c23ccddac302ba0bb2",
   "checkout": "main",
   "context": {
     "cookiecutter": {
       "name": "prometheus",
       "slug": "prometheus",
       "parameter_key": "prometheus",
-      "test_cases": "defaults multi rewrite-registries thanos cluster-monitoring additional_rules resourcequota kubernetes_1.25 grafana-ingress additional_nodeexporter_args additional_kubestatemetrics_args grafana-storage additional-netpols kubernetes_1.26 kubernetes_1.27 kubernetes_1.28 kubernetes_1.29 kubernetes_1.30 kubernetes_1.31 kubernetes_1.32 kubernetes_1.33",
+      "test_cases": "defaults multi rewrite-registries thanos cluster-monitoring additional_rules resourcequota grafana-ingress additional_nodeexporter_args additional_kubestatemetrics_args grafana-storage additional-netpols kubernetes_1.26 kubernetes_1.27 kubernetes_1.28 kubernetes_1.29 kubernetes_1.30 kubernetes_1.31 kubernetes_1.32 kubernetes_1.33",
       "add_lib": "y",
       "add_pp": "n",
       "add_golden": "y",
@@ -25,7 +25,7 @@
       "github_name": "component-prometheus",
       "github_url": "https://github.com/projectsyn/component-prometheus",
       "_template": "https://github.com/projectsyn/commodore-component-template.git",
-      "_commit": "de1ad5aa829f6a478ba4d245c080056f9305e17e"
+      "_commit": "84a7c63ca26492da555344c23ccddac302ba0bb2"
     }
   },
   "directory": null

.github/workflows/release.yaml

@@ -9,7 +9,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: "0"
       - name: Build changelog from PRs with labels

.github/workflows/test.yaml

@@ -17,13 +17,13 @@ jobs:
           - lint_yaml
           - lint_adoc
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Run ${{ matrix.command }}
         run: make ${{ matrix.command }}
   editorconfig:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: snow-actions/[email protected]
         with:
           args: 'check'
@@ -39,7 +39,6 @@ jobs:
           - cluster-monitoring
           - additional_rules
           - resourcequota
-          - kubernetes_1.25
           - grafana-ingress
           - additional_nodeexporter_args
           - additional_kubestatemetrics_args
@@ -57,7 +56,7 @@ jobs:
       run:
         working-directory: ${{ env.COMPONENT_NAME }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           path: ${{ env.COMPONENT_NAME }}
       - name: Compile component
@@ -74,7 +73,6 @@ jobs:
           - cluster-monitoring
           - additional_rules
           - resourcequota
-          - kubernetes_1.25
           - grafana-ingress
           - additional_nodeexporter_args
           - additional_kubestatemetrics_args
@@ -92,7 +90,7 @@ jobs:
       run:
         working-directory: ${{ env.COMPONENT_NAME }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           path: ${{ env.COMPONENT_NAME }}
       - name: Golden diff

Makefile.vars.mk

@@ -57,4 +57,4 @@ KUBENT_IMAGE    ?= ghcr.io/doitintl/kube-no-trouble:latest
 KUBENT_DOCKER   ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=/app/kubent $(KUBENT_IMAGE)
 
 instance ?= defaults
-test_instances = tests/defaults.yml tests/multi.yml tests/rewrite-registries.yml tests/thanos.yml tests/cluster-monitoring.yml tests/additional_rules.yml tests/resourcequota.yml tests/kubernetes_1.25.yml tests/grafana-ingress.yml tests/additional_nodeexporter_args.yml tests/grafana-storage.yml tests/additional-netpols.yml tests/kubernetes_1.26.yml tests/kubernetes_1.27.yml tests/kubernetes_1.28.yml tests/kubernetes_1.29.yml tests/kubernetes_1.30.yml tests/kubernetes_1.31.yml tests/kubernetes_1.32.yml tests/kubernetes_1.33.yml
+test_instances = tests/defaults.yml tests/multi.yml tests/rewrite-registries.yml tests/thanos.yml tests/cluster-monitoring.yml tests/additional_rules.yml tests/resourcequota.yml tests/grafana-ingress.yml tests/additional_nodeexporter_args.yml tests/additional_kubestatemetrics_args.yml tests/grafana-storage.yml tests/additional-netpols.yml tests/kubernetes_1.26.yml tests/kubernetes_1.27.yml tests/kubernetes_1.28.yml tests/kubernetes_1.29.yml tests/kubernetes_1.30.yml tests/kubernetes_1.31.yml tests/kubernetes_1.32.yml tests/kubernetes_1.33.yml