diff --git a/Makefile b/Makefile index e086eaf0b6..c4807b6a52 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/bundle/manifests/cluster-logging.clusterserviceversion.yaml b/bundle/manifests/cluster-logging.clusterserviceversion.yaml index b6cd803f61..ee7d7a1b74 100644 --- a/bundle/manifests/cluster-logging.clusterserviceversion.yaml +++ b/bundle/manifests/cluster-logging.clusterserviceversion.yaml @@ -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 @@ -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 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index ca1f8bace7..e91ec8bd0f 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -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 diff --git a/internal/cmd/functional-benchmarker/config/options.go b/internal/cmd/functional-benchmarker/config/options.go index 7a9ccfa805..df926d1f6f 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.37.1" + imageVector = "quay.io/openshift-logging/vector:v0.47.0" ) type Options struct { diff --git a/internal/generator/vector/conf/complex.toml b/internal/generator/vector/conf/complex.toml index 2258c94fea..76f02f8dd7 100644 --- a/internal/generator/vector/conf/complex.toml +++ b/internal/generator/vector/conf/complex.toml @@ -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" diff --git a/internal/generator/vector/conf/complex_http_receiver.toml b/internal/generator/vector/conf/complex_http_receiver.toml index 6fa3f26836..ee3f807c58 100644 --- a/internal/generator/vector/conf/complex_http_receiver.toml +++ b/internal/generator/vector/conf/complex_http_receiver.toml @@ -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" diff --git a/internal/generator/vector/conf/container.toml b/internal/generator/vector/conf/container.toml index b8019307d2..0095ff8169 100644 --- a/internal/generator/vector/conf/container.toml +++ b/internal/generator/vector/conf/container.toml @@ -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" diff --git a/internal/generator/vector/conf/global_test.go b/internal/generator/vector/conf/global_test.go index 14c818e831..ad68f72984 100644 --- a/internal/generator/vector/conf/global_test.go +++ b/internal/generator/vector/conf/global_test.go @@ -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"))) }) @@ -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))) diff --git a/internal/generator/vector/output/common/secret.go b/internal/generator/vector/output/common/secret.go index fa71bbcf16..96e42da467 100644 --- a/internal/generator/vector/output/common/secret.go +++ b/internal/generator/vector/output/common/secret.go @@ -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}}` } diff --git a/olm_deploy/scripts/env.sh b/olm_deploy/scripts/env.sh index 8475ded712..32d2e57358 100755 --- a/olm_deploy/scripts/env.sh +++ b/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.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}