From e66db6b9accc416d1c0052fbea040cc55f30cec0 Mon Sep 17 00:00:00 2001 From: Aline Abler Date: Wed, 30 Oct 2024 15:57:22 +0100 Subject: [PATCH] Update from template Template version: main (0aba6c3) --- .cruft.json | 4 ++-- .github/workflows/test.yaml | 2 ++ Makefile.vars.mk | 2 +- .../openshift4-logging/apps/openshift4-logging.yaml | 0 tests/log-forwarding.yml | 3 +++ 5 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 tests/golden/log-forwarding/openshift4-logging/apps/openshift4-logging.yaml create mode 100644 tests/log-forwarding.yml diff --git a/.cruft.json b/.cruft.json index 12d154e..5102268 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,13 +1,13 @@ { "template": "https://github.com/projectsyn/commodore-component-template.git", - "commit": "8840f87d25d97ce0d4bfed75d40173caaf4100fc", + "commit": "0aba6c3dc0f4bcbe81aab1cdcc977f32b00f1cb2", "checkout": "main", "context": { "cookiecutter": { "name": "OpenShift4 Logging", "slug": "openshift4-logging", "parameter_key": "openshift4_logging", - "test_cases": "defaults master elasticsearch multilineerr forwardingonly legacy", + "test_cases": "defaults master elasticsearch multilineerr forwardingonly legacy log-forwarding", "add_lib": "n", "add_pp": "n", "add_golden": "y", diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 647a541..5a3656d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -39,6 +39,7 @@ jobs: - multilineerr - forwardingonly - legacy + - log-forwarding defaults: run: working-directory: ${{ env.COMPONENT_NAME }} @@ -59,6 +60,7 @@ jobs: - multilineerr - forwardingonly - legacy + - log-forwarding defaults: run: working-directory: ${{ env.COMPONENT_NAME }} diff --git a/Makefile.vars.mk b/Makefile.vars.mk index 538e4d0..2cac468 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 ?= defaults -test_instances = tests/defaults.yml tests/master.yml tests/elasticsearch.yml tests/multilineerr.yml tests/forwardingonly.yml tests/legacy.yml +test_instances = tests/defaults.yml tests/master.yml tests/elasticsearch.yml tests/multilineerr.yml tests/forwardingonly.yml tests/legacy.yml tests/log-forwarding.yml diff --git a/tests/golden/log-forwarding/openshift4-logging/apps/openshift4-logging.yaml b/tests/golden/log-forwarding/openshift4-logging/apps/openshift4-logging.yaml new file mode 100644 index 0000000..e69de29 diff --git a/tests/log-forwarding.yml b/tests/log-forwarding.yml new file mode 100644 index 0000000..a4da5b7 --- /dev/null +++ b/tests/log-forwarding.yml @@ -0,0 +1,3 @@ +# Overwrite parameters here + +# parameters: {...}