draft: test latest Vector v0.57

Makefile

@@ -28,7 +28,7 @@ export VERSION=$(LOGGING_VERSION).0
 export NAMESPACE?=openshift-logging
 export LOKI_OPERATOR_CHANNEL?=stable-6.4
 
-IMAGE_LOGGING_VECTOR?=quay.io/openshift-logging/vector:v0.54.0
+IMAGE_LOGGING_VECTOR=quay.io/vparfono/vector:v0.57.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
@@ -243,7 +243,7 @@ test-env: ## Echo test environment, useful for running tests outside of the Make
 
 .PHONY: test-functional
 test-functional: test-functional-benchmarker-vector
-	RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \
+	RELATED_IMAGE_VECTOR="quay.io/vparfono/vector:v0.57.0" \
 	IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) \
 	RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
 	go test -race \
@@ -262,11 +262,11 @@ 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) 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
+	@out=$$(RELATED_IMAGE_VECTOR="quay.io/vparfono/vector:v0.57.0" 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) \
+	RELATED_IMAGE_VECTOR="quay.io/vparfono/vector:v0.57.0" \
 	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)'`
@@ -336,7 +336,7 @@ test-upgrade: $(JUNITREPORT)
 
 .PHONY: test-e2e-from-ci-bundle
 test-e2e-from-ci-bundle: $(JUNITREPORT)
-	RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \
+	RELATED_IMAGE_VECTOR="quay.io/vparfono/vector:v0.57.0" \
 	IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) \
 	RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
 	IMAGE_LOGGING_EVENTROUTER=$(IMAGE_LOGGING_EVENTROUTER) \
@@ -345,7 +345,7 @@ test-e2e-from-ci-bundle: $(JUNITREPORT)
 
 .PHONY: test-e2e
 test-e2e: $(JUNITREPORT)
-	RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \
+	RELATED_IMAGE_VECTOR="quay.io/vparfono/vector:v0.57.0" \
 	IMAGE_VECTOR_RECEIVER=$(IMAGE_VECTOR_RECEIVER) \
 	RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \
 	IMAGE_LOGGING_EVENTROUTER=$(IMAGE_LOGGING_EVENTROUTER) \

bundle/image-references

@@ -6,7 +6,7 @@ spec:
   - name: vector-rhel9
     from:
       kind: DockerImage
-      name: quay.io/openshift-logging/vector:v0.54.0
+      name: quay.io/vparfono/vector:v0.57.0
   - name: log-file-metric-exporter-rhel9
     from:
       kind: DockerImage

bundle/manifests/cluster-logging.clusterserviceversion.yaml

@@ -2660,7 +2660,7 @@ spec:
                 - name: KUBE_FEATURE_WatchListClient
                   value: "false"
                 - name: RELATED_IMAGE_VECTOR
-                  value: quay.io/openshift-logging/vector:v0.54.0
+                  value: quay.io/vparfono/vector:v0.57.0
                 - name: RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER
                   value: quay.io/openshift-logging/log-file-metric-exporter:latest
                 image: quay.io/openshift-logging/cluster-logging-operator:latest
@@ -2716,7 +2716,7 @@ spec:
   provider:
     name: Red Hat
   relatedImages:
-  - image: quay.io/openshift-logging/vector:v0.54.0
+  - image: quay.io/vparfono/vector:v0.57.0
     name: vector
   - image: quay.io/openshift-logging/log-file-metric-exporter:latest
     name: log-file-metric-exporter

config/manager/manager.yaml

@@ -52,6 +52,6 @@ spec:
           - name: KUBE_FEATURE_WatchListClient
             value: "false"
           - name: RELATED_IMAGE_VECTOR
-            value: quay.io/openshift-logging/vector:v0.54.0
+            value: quay.io/vparfono/vector:v0.57.0
           - name: RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER
             value: quay.io/openshift-logging/log-file-metric-exporter:latest

internal/cmd/functional-benchmarker/config/options.go

@@ -17,7 +17,7 @@ import (
 
 const (
 	LogStressorImage = "quay.io/openshift-logging/cluster-logging-load-client:0.2"
-	imageVector      = "quay.io/openshift-logging/vector:v0.54.0"
+	imageVector      = "quay.io/vparfono/vector:v0.57.0"
 )
 
 type Options struct {

internal/generator/vector/api/api.go

@@ -4,5 +4,4 @@ package api
 type Api struct {
 	Enabled    bool   `json:"enabled,omitempty" yaml:"enabled,omitempty" toml:"enabled,omitempty"`
 	Address    string `json:"address,omitempty" yaml:"address,omitempty" toml:"address,omitempty"`
-	Playground bool   `json:"playground" yaml:"playground" toml:"playground"`
 }

internal/generator/vector/api/config_test.go

@@ -45,7 +45,6 @@ data_dir: "/var/lib/vector/openshift-logging/collector"
 api:
   enabled: true
   address: "127.0.0.1:8686"
-  playground: false
 log_schema:
   host_key: "hostname"
 secret:

internal/generator/vector/conf/global.go

@@ -12,7 +12,7 @@ func Global(c *api.Config, namespace, forwarderName string) *api.Config {
 	if dataDir == vector.DefaultDataPath {
 		dataDir = ""
 	}
-	c.Api = &api.Api{Enabled: true, Address: "127.0.0.1:8686", Playground: false}
+	c.Api = &api.Api{Enabled: true, Address: "127.0.0.1:8686"}
 	c.LogSchema = &api.LogSchema{HostKey: "hostname"}
 	c.Global = api.Global{
 		ExpireMetricsSec: 60,

olm_deploy/scripts/env.sh

@@ -3,7 +3,7 @@ set -eou pipefail
 
 LOGGING_VERSION=${LOGGING_VERSION:-6.1}
 
-LOGGING_VECTOR_VERSION=${LOGGING_VECTOR_VERSION:-v0.54.0}
+LOGGING_VECTOR_VERSION=quay.io/vparfonov/vector:v0.57.0
 LOGGING_LOG_FILE_METRIC_EXPORTER_VERSION=${LOGGING_LOG_FILE_METRIC_EXPORTER_VERSION:-latest}
 
 LOGGING_IS=${LOGGING_IS:-openshift-logging}