From b848bfdb4d8e7d5f4b91e436c457596437b570dc Mon Sep 17 00:00:00 2001 From: Adrian Haas Date: Wed, 24 Jul 2024 14:21:12 +0200 Subject: [PATCH] Update from template Template version: main (2ae1bc3) --- .cruft.json | 4 ++-- .github/workflows/test.yaml | 2 ++ Makefile.vars.mk | 2 +- .../openshift4-monitoring/apps/openshift4-monitoring.yaml | 0 tests/release-4.15.yml | 3 +++ 5 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 tests/golden/release-4.15/openshift4-monitoring/apps/openshift4-monitoring.yaml create mode 100644 tests/release-4.15.yml diff --git a/.cruft.json b/.cruft.json index 9bc5f5e8..42e35ca0 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,13 +1,13 @@ { "template": "https://github.com/projectsyn/commodore-component-template.git", - "commit": "26ee71e475cca036551c68a6c6b2285fe86139a0", + "commit": "2ae1bc3383f211eee5f20a963f5ac74725d85d5b", "checkout": "main", "context": { "cookiecutter": { "name": "OpenShift4 Monitoring", "slug": "openshift4-monitoring", "parameter_key": "openshift4_monitoring", - "test_cases": "capacity-alerts remote-write user-workload-monitoring capacity-alerts-with-node-labels vsphere custom-rules release-4.13 team-routing release-4.14 ovn-kubernetes", + "test_cases": "capacity-alerts remote-write user-workload-monitoring capacity-alerts-with-node-labels vsphere custom-rules release-4.13 team-routing release-4.14 ovn-kubernetes release-4.15", "add_lib": "y", "add_pp": "n", "add_golden": "y", diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e8c2834d..9fd18e9b 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -42,6 +42,7 @@ jobs: - team-routing - release-4.14 - ovn-kubernetes + - release-4.15 defaults: run: working-directory: ${{ env.COMPONENT_NAME }} @@ -66,6 +67,7 @@ jobs: - team-routing - release-4.14 - ovn-kubernetes + - release-4.15 defaults: run: working-directory: ${{ env.COMPONENT_NAME }} diff --git a/Makefile.vars.mk b/Makefile.vars.mk index b0342cc0..1ecc6a5f 100644 --- a/Makefile.vars.mk +++ b/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 ?= capacity-alerts -test_instances = tests/capacity-alerts.yml tests/remote-write.yml tests/user-workload-monitoring.yml tests/capacity-alerts-with-node-labels.yml tests/vsphere.yml tests/custom-rules.yml tests/release-4.13.yml tests/team-routing.yml tests/release-4.14.yml tests/ovn-kubernetes.yml +test_instances = tests/capacity-alerts.yml tests/remote-write.yml tests/user-workload-monitoring.yml tests/capacity-alerts-with-node-labels.yml tests/vsphere.yml tests/custom-rules.yml tests/release-4.13.yml tests/team-routing.yml tests/release-4.14.yml tests/ovn-kubernetes.yml tests/release-4.15.yml diff --git a/tests/golden/release-4.15/openshift4-monitoring/apps/openshift4-monitoring.yaml b/tests/golden/release-4.15/openshift4-monitoring/apps/openshift4-monitoring.yaml new file mode 100644 index 00000000..e69de29b diff --git a/tests/release-4.15.yml b/tests/release-4.15.yml new file mode 100644 index 00000000..a4da5b7b --- /dev/null +++ b/tests/release-4.15.yml @@ -0,0 +1,3 @@ +# Overwrite parameters here + +# parameters: {...}