diff --git a/Makefile b/Makefile index 0dc662e7f..ef9f1b411 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ export LOGGING_VERSION?=6.4 export VERSION=$(LOGGING_VERSION).0 export NAMESPACE?=openshift-logging -IMAGE_LOGGING_VECTOR?=quay.io/openshift-logging/vector:v0.47.0 +IMAGE_LOGGING_VECTOR?=quay.io/vparfono/vector:v0.50.0-rh IMAGE_LOGFILEMETRICEXPORTER?=quay.io/openshift-logging/log-file-metric-exporter:6.1 IMAGE_LOGGING_EVENTROUTER?=quay.io/openshift-logging/eventrouter:0.3 @@ -117,7 +117,7 @@ run: @ls ./bundle/manifests/logging.openshift.io_*.yaml | xargs -n1 oc apply -f @mkdir -p $(CURDIR)/tmp LOG_LEVEL=$(LOG_LEVEL) \ - RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \ + RELATED_IMAGE_VECTOR=quay.io/vparfono/vector:v0.50.0-rh \ RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \ OPERATOR_NAME=$(OPERATOR_NAME) \ WATCH_NAMESPACE="" \ @@ -212,12 +212,12 @@ deploy-catalog: # env $(make -s test-env) go test ./my/packages test-env: ## Echo test environment, useful for running tests outside of the Makefile. @echo \ - RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \ + RELATED_IMAGE_VECTOR=quay.io/vparfono/vector:v0.50.0-rh \ RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \ .PHONY: test-functional test-functional: test-functional-benchmarker-vector - RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \ + RELATED_IMAGE_VECTOR=quay.io/vparfono/vector:v0.50.0-rh \ RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \ go test -race \ ./test/functional/... \ @@ -229,11 +229,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) 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.50.0-rh 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.50.0-rh \ 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)'` @@ -295,7 +295,7 @@ apply: namespace $(OPERATOR_SDK) ## Install kustomized resources directly to the .PHONY: test-upgrade test-upgrade: $(JUNITREPORT) - RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \ + RELATED_IMAGE_VECTOR=quay.io/vparfono/vector:v0.50.0-rh \ RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \ IMAGE_LOGGING_EVENTROUTER=$(IMAGE_LOGGING_EVENTROUTER) \ exit 0 @@ -303,7 +303,7 @@ test-upgrade: $(JUNITREPORT) .PHONY: test-e2e test-e2e: $(JUNITREPORT) - RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \ + RELATED_IMAGE_VECTOR=quay.io/vparfono/vector:v0.50.0-rh \ RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \ IMAGE_LOGGING_EVENTROUTER=$(IMAGE_LOGGING_EVENTROUTER) \ EXCLUDES="$(E2E_TEST_EXCLUDES)" CLF_EXCLUDES="$(CLF_TEST_EXCLUDES)" LOG_LEVEL=3 hack/test-e2e-olm.sh @@ -311,7 +311,7 @@ test-e2e: $(JUNITREPORT) .PHONY: test-e2e-local test-e2e-local: $(JUNITREPORT) deploy-image LOG_LEVEL=3 \ - RELATED_IMAGE_VECTOR=$(IMAGE_LOGGING_VECTOR) \ + RELATED_IMAGE_VECTOR=quay.io/vparfono/vector:v0.50.0-rh \ RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER=$(IMAGE_LOGFILEMETRICEXPORTER) \ IMAGE_LOGGING_EVENTROUTER=$(IMAGE_LOGGING_EVENTROUTER) \ CLF_INCLUDES=$(CLF_TEST_INCLUDES) \ diff --git a/bundle/manifests/cluster-logging.clusterserviceversion.yaml b/bundle/manifests/cluster-logging.clusterserviceversion.yaml index 00f8433db..e3fa1a91f 100644 --- a/bundle/manifests/cluster-logging.clusterserviceversion.yaml +++ b/bundle/manifests/cluster-logging.clusterserviceversion.yaml @@ -2137,7 +2137,7 @@ spec: - name: OPERATOR_NAME value: cluster-logging-operator - name: RELATED_IMAGE_VECTOR - value: quay.io/openshift-logging/vector:v0.47.0 + value: quay.io/vparfono/vector:v0.50.0-rh - name: RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER value: quay.io/openshift-logging/log-file-metric-exporter:6.1 image: quay.io/openshift-logging/cluster-logging-operator:latest @@ -2184,7 +2184,7 @@ spec: provider: name: Red Hat relatedImages: - - image: quay.io/openshift-logging/vector:v0.47.0 + - image: quay.io/vparfono/vector:v0.50.0-rh name: vector - image: quay.io/openshift-logging/log-file-metric-exporter:6.1 name: log-file-metric-exporter diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 5c39230c3..f957bb3fb 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -48,6 +48,6 @@ spec: - name: OPERATOR_NAME value: "cluster-logging-operator" - name: RELATED_IMAGE_VECTOR - value: quay.io/openshift-logging/vector:v0.47.0 + value: quay.io/vparfono/vector:v0.50.0-rh - name: RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER value: quay.io/openshift-logging/log-file-metric-exporter:6.1 diff --git a/internal/cmd/functional-benchmarker/config/options.go b/internal/cmd/functional-benchmarker/config/options.go index 08571f69c..ad49bab34 100644 --- a/internal/cmd/functional-benchmarker/config/options.go +++ b/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.47.0" + imageVector = "quay.io/vparfono/vector:v0.50.0-rh" ) type Options struct { diff --git a/olm_deploy/scripts/env.sh b/olm_deploy/scripts/env.sh index 32d2e5735..90f439cf2 100755 --- a/olm_deploy/scripts/env.sh +++ b/olm_deploy/scripts/env.sh @@ -9,7 +9,7 @@ LOGGING_LOG_FILE_METRIC_EXPORTER_VERSION=${LOGGING_LOG_FILE_METRIC_EXPORTER_VERS LOGGING_IS=${LOGGING_IS:-openshift-logging} export IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY=${IMAGE_CLUSTER_LOGGING_OPERATOR_REGISTRY:-quay.io/${LOGGING_IS}/cluster-logging-operator-registry:${LOGGING_VERSION}} export IMAGE_CLUSTER_LOGGING_OPERATOR=${IMAGE_CLUSTER_LOGGING_OPERATOR:-quay.io/${LOGGING_IS}/cluster-logging-operator:${LOGGING_VERSION}} -export IMAGE_LOGGING_VECTOR=${IMAGE_LOGGING_VECTOR:-quay.io/${LOGGING_IS}/vector:${LOGGING_VECTOR_VERSION}} +export IMAGE_LOGGING_VECTOR=quay.io/vparfono/vector:v0.50.0-rh export IMAGE_LOG_FILE_METRIC_EXPORTER=${IMAGE_LOG_FILE_METRIC_EXPORTER:-quay.io/${LOGGING_IS}/log-file-metric-exporter:${LOGGING_LOG_FILE_METRIC_EXPORTER_VERSION}} export CLUSTER_LOGGING_OPERATOR_NAMESPACE=${CLUSTER_LOGGING_OPERATOR_NAMESPACE:-openshift-logging}