Skip to content

chore(tests): use vector devel image for vector receivers #3426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Aug 25, 2026
Merged

chore(tests): use vector devel image for vector receivers #3426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export NAMESPACE?=openshift-logging
export LOKI_OPERATOR_CHANNEL?=stable-6.4

IMAGE_LOGGING_VECTOR?=quay.io/openshift-logging/vector:v0.54.0
IMAGE_VECTOR_RECEIVER?=quay.io/openshift-logging/vector:v0.54.0-devel
IMAGE_LOGFILEMETRICEXPORTER?=quay.io/openshift-logging/log-file-metric-exporter:latest
IMAGE_LOGGING_EVENTROUTER?=quay.io/openshift-logging/eventrouter:v0.5.0
IMAGE_TLS_SCANNER?=quay.io/openshift/tls-scanner:latest
Expand Down Expand Up @@ -230,12 +231,14 @@ deploy-catalog:
test-env: ## Echo test environment, useful for running tests outside of the Makefile.
@echo \
RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \
IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) \
RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
IMAGE_TLS_SCANNER=$(IMAGE_TLS_SCANNER) \

.PHONY: test-functional
test-functional: test-functional-benchmarker-vector
RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \
IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) \
RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
go test -race \
./test/functional/... \
Expand All @@ -253,11 +256,12 @@ test-forwarder-generator: bin/forwarder-generator

test-functional-benchmarker-vector: bin/functional-benchmarker
@rm -rf /tmp/benchmark-test-vector
@out=$$(RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) bin/functional-benchmarker --image=$(IMAGE_LOGGING_VECTOR) --artifact-dir=/tmp/benchmark-test-vector 2>&1); if [ "$$?" != "0" ] ; then echo "$$out"; exit 1; fi
@out=$$(RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) bin/functional-benchmarker --image=$(IMAGE_LOGGING_VECTOR) --artifact-dir=/tmp/benchmark-test-vector 2>&1); if [ "$$?" != "0" ] ; then echo "$$out"; exit 1; fi

.PHONY: test-unit
test-unit: test-forwarder-generator test-unit-api
RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \
IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) \
RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
go test -coverprofile=test.cov -race ./api/... ./internal/... `go list ./test/... | grep -Ev 'test/(e2e|functional|framework|client|helpers)'`

Expand Down Expand Up @@ -319,13 +323,15 @@ apply: namespace $(OPERATOR_SDK) ## Install kustomized resources directly to the
.PHONY: test-upgrade
test-upgrade: $(JUNITREPORT)
RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \
IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) \
RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
IMAGE_LOGGING_EVENTROUTER=$(IMAGE_LOGGING_EVENTROUTER) \
exit 0

.PHONY: test-e2e
test-e2e: $(JUNITREPORT)
RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \
IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) \
RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
IMAGE_LOGGING_EVENTROUTER=$(IMAGE_LOGGING_EVENTROUTER) \
IMAGE_TLS_SCANNER=$(IMAGE_TLS_SCANNER) \
Expand All @@ -336,6 +342,7 @@ test-e2e-local: $(JUNITREPORT) deploy-image
LOG_LEVEL=3 \
LOKI_OPERATOR_CHANNEL=$(LOKI_OPERATOR_CHANNEL) \
RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \
IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) \
RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
IMAGE_LOGGING_EVENTROUTER=$(IMAGE_LOGGING_EVENTROUTER) \
IMAGE_TLS_SCANNER=$(IMAGE_TLS_SCANNER) \
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/functional-benchmarker/runners/cluster/cluster_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func (r *ClusterRunner) Deploy() {
})
}
collectorBuilder.Update()
return r.framework.AddBenchmarkForwardOutput(b, r.framework.Forwarder.Spec.Outputs[0], utils.GetComponentImage(constants.VectorName))
return r.framework.AddBenchmarkForwardOutput(b, r.framework.Forwarder.Spec.Outputs[0], utils.GetComponentImage(constants.VectorReceiverName))
},
})
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions internal/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const (
TrustedCABundleMountDir = "/etc/pki/ca-trust/extracted/pem/"
ElasticsearchName = "elasticsearch"
VectorName = "vector"
VectorReceiverName = "vector-receiver"
KibanaName = "kibana"
LogfilesmetricexporterName = "logfilesmetricexporter"
LogfilesmetricexporterPort = int32(2112)
Expand All @@ -64,6 +65,7 @@ const (
CollectorTrustedCAName = "collector-trusted-ca-bundle"

VectorImageEnvVar = "RELATED_IMAGE_VECTOR"
VectorReceiverImageEnvVar = "IMAGE_VECTOR_RECEIVER"
LogfilesmetricImageEnvVar = "RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER"

ContainerLogDir = "/var/log/containers"
Expand Down
1 change: 1 addition & 0 deletions internal/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ var (
// COMPONENT_IMAGES are keys based on the "container name" + "-{image,version}"
var COMPONENT_IMAGES = map[string]string{
constants.VectorName: constants.VectorImageEnvVar,
constants.VectorReceiverName: constants.VectorReceiverImageEnvVar,
constants.LogfilesmetricexporterName: constants.LogfilesmetricImageEnvVar,
}

Expand Down
2 changes: 1 addition & 1 deletion test/framework/e2e/http_vector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (tc *E2ETestFramework) DeployHttpReceiver(ns string) (deployment *VectorHtt
}
container := corev1.Container{
Name: HttpReceiver,
Image: utils.GetComponentImage(constants.VectorName),
Image: utils.GetComponentImage(constants.VectorReceiverName),
Ports: []corev1.ContainerPort{
{Name: "http", ContainerPort: 8090},
},
Expand Down
2 changes: 1 addition & 1 deletion test/framework/functional/output_http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func (f *CollectorFunctionalFramework) AddVectorHttpOutputWithConfig(b *runtime.
}

log.V(2).Info("Adding vector container", "name", name)
containerBuilder := b.AddContainer(name, utils.GetComponentImage(constants.VectorName)).
containerBuilder := b.AddContainer(name, utils.GetComponentImage(constants.VectorReceiverName)).
AddVolumeMount(config.Name, "/tmp/config", "", false).
AddEnvVar("VECTOR_LOG", common.AdaptLogLevel()).
AddEnvVar("VECTOR_INTERNAL_LOG_RATE_LIMIT", "0").
Expand Down
Loading