Skip to content

Update CLO code to use Vector v0.47.0 #3161

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

Draft
wants to merge 2 commits into
base: release-6.2
Choose a base branch
from
Draft

Update CLO code to use Vector v0.47.0 #3161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82e6ab7
Update CLO code to use Vector v0.47.0
vparfonov Jul 8, 2025
81b33c3
hardset IMAGE_LOGGING_VECTOR to quay.io/openshift-logging/vector:v0.47.0
vparfonov Nov 21, 2025
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export LOGGING_VERSION?=6.2
export VERSION=$(LOGGING_VERSION).0
export NAMESPACE?=openshift-logging

IMAGE_LOGGING_VECTOR?=quay.io/openshift-logging/vector:v0.37.1
IMAGE_LOGGING_VECTOR=quay.io/openshift-logging/vector:v0.47.0
IMAGE_LOGFILEMETRICEXPORTER?=quay.io/openshift-logging/log-file-metric-exporter:6.1
IMAGE_LOGGING_EVENTROUTER?=quay.io/openshift-logging/eventrouter:0.3

Expand Down
4 changes: 2 additions & 2 deletions bundle/manifests/cluster-logging.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2224,7 +2224,7 @@ spec:
- name: OPERATOR_NAME
value: cluster-logging-operator
- name: RELATED_IMAGE_VECTOR
value: quay.io/openshift-logging/vector:v0.37.1
value: quay.io/openshift-logging/vector:v0.47.0
- 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
Expand Down Expand Up @@ -2271,7 +2271,7 @@ spec:
provider:
name: Red Hat
relatedImages:
- image: quay.io/openshift-logging/vector:v0.37.1
- image: quay.io/openshift-logging/vector:v0.47.0
name: vector
- image: quay.io/openshift-logging/log-file-metric-exporter:6.1
name: log-file-metric-exporter
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ spec:
- name: OPERATOR_NAME
value: "cluster-logging-operator"
- name: RELATED_IMAGE_VECTOR
value: quay.io/openshift-logging/vector:v0.37.1
value: quay.io/openshift-logging/vector:v0.47.0
- name: RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER
value: quay.io/openshift-logging/log-file-metric-exporter:6.1
2 changes: 1 addition & 1 deletion internal/cmd/functional-benchmarker/config/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

const (
LogStressorImage = "quay.io/openshift-logging/cluster-logging-load-client:0.2"
imageVector = "quay.io/openshift-logging/vector:v0.37.1"
imageVector = "quay.io/openshift-logging/vector:v0.47.0"
)

type Options struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/generator/vector/conf/complex.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ enabled = true

# Load sensitive data from files
[secret.kubernetes_secret]
type = "file"
base_path = "/var/run/ocp-collector/secrets"
type = "directory"
path = "/var/run/ocp-collector/secrets"

[sources.internal_metrics]
type = "internal_metrics"
Expand Down
4 changes: 2 additions & 2 deletions internal/generator/vector/conf/complex_http_receiver.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ enabled = true

# Load sensitive data from files
[secret.kubernetes_secret]
type = "file"
base_path = "/var/run/ocp-collector/secrets"
type = "directory"
path = "/var/run/ocp-collector/secrets"

[sources.internal_metrics]
type = "internal_metrics"
Expand Down
4 changes: 2 additions & 2 deletions internal/generator/vector/conf/container.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ enabled = true

# Load sensitive data from files
[secret.kubernetes_secret]
type = "file"
base_path = "/var/run/ocp-collector/secrets"
type = "directory"
path = "/var/run/ocp-collector/secrets"

[sources.internal_metrics]
type = "internal_metrics"
Expand Down
8 changes: 4 additions & 4 deletions internal/generator/vector/conf/global_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ enabled = true
# Load sensitive data from files
[secret.kubernetes_secret]
type = "file"
base_path = "/var/run/ocp-collector/secrets"
type = "directory"
path = "/var/run/ocp-collector/secrets"
`,
).To(EqualConfigFrom(Global(constants.OpenshiftNS, "my-forwarder")))
})
Expand All @@ -37,8 +37,8 @@ enabled = true
# Load sensitive data from files
[secret.kubernetes_secret]
type = "file"
base_path = "/var/run/ocp-collector/secrets"
type = "directory"
path = "/var/run/ocp-collector/secrets"
`,
).To(EqualConfigFrom(Global(constants.OpenshiftNS, constants.SingletonName)))

Expand Down
4 changes: 2 additions & 2 deletions internal/generator/vector/output/common/secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ func (sec VectorSecret) Template() string {
return `{{define "` + sec.Name() + `" -}}
# {{.Desc}}
[secret.{{.ComponentID}}]
type = "file"
base_path = "{{.BasePath}}"
type = "directory"
path = "{{.BasePath}}"
{{end}}`
}

Expand Down
2 changes: 1 addition & 1 deletion olm_deploy/scripts/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -eou pipefail

LOGGING_VERSION=${LOGGING_VERSION:-6.1}

LOGGING_VECTOR_VERSION=${LOGGING_VECTOR_VERSION:-v0.37.1}
LOGGING_VECTOR_VERSION=${LOGGING_VECTOR_VERSION:-v0.47.0}
LOGGING_LOG_FILE_METRIC_EXPORTER_VERSION=${LOGGING_LOG_FILE_METRIC_EXPORTER_VERSION:-6.1}

LOGGING_IS=${LOGGING_IS:-openshift-logging}
Expand Down