openshift · openshift-merge-bot · Oct 10, 2025 · Sep 25, 2025 · Sep 25, 2025
diff --git a/api/observability/v1/conditions.go b/api/observability/v1/conditions.go
@@ -35,9 +35,6 @@ const (
 	// ConditionTypeMaxUnavailable validates the value of the max-unavailable-rollout annotation
 	ConditionTypeMaxUnavailable = GroupName + "/MaxUnavailableAnnotation"
 
-	// ConditionTypeUseKubeCache validates the value of the use-apiserver-cache annotation
-	ConditionTypeUseKubeCache = GroupName + "/UseKubeCacheAnnotation"
-
 	// ConditionTypeReady indicates the service is ready.
 	//
 	// Ready=True means the operands are running and providing some service.

diff --git a/api/observability/v1/output_types.go b/api/observability/v1/output_types.go
@@ -744,7 +744,7 @@ type Kafka struct {
 	Brokers []BrokerURL `json:"brokers,omitempty"`
 }
 
-// +kubebuilder:validation:XValidation:rule="self == '' || (isURL(self) && (self.startsWith('tcp://') || self.startsWith('tls://')))",message="each broker must be a valid URL with a tcp or tls scheme"
+// +kubebuilder:validation:XValidation:rule="isURL(self) && (self.startsWith('tcp://') || self.startsWith('tls://'))",message="each broker must be a valid URL with a tcp or tls scheme"
 type BrokerURL string
 
 type LokiTuningSpec struct {

diff --git a/bundle/manifests/cluster-logging-operator-metrics_v1_service.yaml b/bundle/manifests/cluster-logging-operator-metrics_v1_service.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  creationTimestamp: null
   labels:
     name: cluster-logging-operator
   name: cluster-logging-operator-metrics
@@ -14,3 +15,5 @@ spec:
     name: cluster-logging-operator
   sessionAffinity: None
   type: ClusterIP
+status:
+  loadBalancer: {}
diff --git a/bundle/manifests/collector_monitoring.coreos.com_v1_prometheusrule.yaml b/bundle/manifests/collector_monitoring.coreos.com_v1_prometheusrule.yaml
@@ -6,6 +6,21 @@ spec:
   groups:
   - name: logging_collector.alerts
     rules:
+    - alert: ClusterLogForwarderDeprecations
+      annotations:
+        message: The Cluster Logging Operator version {{$labels.version}} includes
+          deprecations to some feature of ClusterLogForwarder.
+        summary: |-
+          The Cluster Logging Operator version {{$labels.version}} includes deprecations to some features of ClusterLogForwarder which
+          will be removed in a future release.  Please see the release notes for details:
+          https://docs.redhat.com/en/documentation/red_hat_openshift_logging/6.3/html/release_notes
+      expr: |
+        max by (version) (csv_succeeded{exported_namespace="openshift-logging", name=~"cluster-logging.*", version=~"6.3.*"})  > 0
+      for: 1m
+      labels:
+        namespace: openshift-logging
+        service: collector
+        severity: info
     - alert: CollectorNodeDown
       annotations:
         description: Prometheus could not scrape {{ $labels.namespace }}/{{ $labels.pod

diff --git a/bundle/manifests/observability.openshift.io_clusterlogforwarders.yaml b/bundle/manifests/observability.openshift.io_clusterlogforwarders.yaml
@@ -2533,8 +2533,7 @@ spec:
                             x-kubernetes-validations:
                             - message: each broker must be a valid URL with a tcp
                                 or tls scheme
-                              rule: self == '' || (isURL(self) && (self.startsWith('tcp://')
-                                || self.startsWith('tls://')))
+                              rule: isURL(self) && (self.startsWith('tcp://') || self.startsWith('tls://'))
                           type: array
                         topic:
                           description: |-

diff --git a/config/crd/bases/observability.openshift.io_clusterlogforwarders.yaml b/config/crd/bases/observability.openshift.io_clusterlogforwarders.yaml
@@ -2533,8 +2533,7 @@ spec:
                             x-kubernetes-validations:
                             - message: each broker must be a valid URL with a tcp
                                 or tls scheme
-                              rule: self == '' || (isURL(self) && (self.startsWith('tcp://')
-                                || self.startsWith('tls://')))
+                              rule: isURL(self) && (self.startsWith('tcp://') || self.startsWith('tls://'))
                           type: array
                         topic:
                           description: |-

diff --git a/config/prometheus/collector_alerts.yaml b/config/prometheus/collector_alerts.yaml
@@ -7,6 +7,20 @@ spec:
   groups:
   - name: logging_collector.alerts
     rules:
+    - alert: ClusterLogForwarderDeprecations
+      annotations:
+        message: "The Cluster Logging Operator version {{$labels.version}} includes deprecations to some feature of ClusterLogForwarder."
+        summary: |-
+          The Cluster Logging Operator version {{$labels.version}} includes deprecations to some features of ClusterLogForwarder which
+          will be removed in a future release.  Please see the release notes for details:
+          https://docs.redhat.com/en/documentation/red_hat_openshift_logging/6.3/html/release_notes
+      expr: |
+        max by (version) (csv_succeeded{exported_namespace="openshift-logging", name=~"cluster-logging.*", version=~"6.3.*"})  > 0
+      for: 1m
+      labels:
+        namespace: openshift-logging
+        service: collector
+        severity: info
     - alert: CollectorNodeDown
       annotations:
         description: "Prometheus could not scrape {{ $labels.namespace }}/{{ $labels.pod }} collector component for more than 10m."

diff --git a/internal/collector/collector.go b/internal/collector/collector.go
@@ -91,7 +91,7 @@ func (f *Factory) Affinity() *v1.Affinity {
 	return f.CollectorSpec.Affinity
 }
 
-func New(confHash, clusterID string, collectorSpec *obs.CollectorSpec, secrets internalobs.Secrets, configMaps map[string]*v1.ConfigMap, forwarderSpec obs.ClusterLogForwarderSpec, resNames *factory.ForwarderResourceNames, isDaemonset bool, logLevel string, useCache bool, maxUnavailable string) *Factory {
+func New(confHash, clusterID string, collectorSpec *obs.CollectorSpec, secrets internalobs.Secrets, configMaps map[string]*v1.ConfigMap, forwarderSpec obs.ClusterLogForwarderSpec, resNames *factory.ForwarderResourceNames, isDaemonset bool, logLevel string, maxUnavailable string) *Factory {
 	if collectorSpec == nil {
 		collectorSpec = &obs.CollectorSpec{}
 	}
@@ -111,7 +111,6 @@ func New(confHash, clusterID string, collectorSpec *obs.CollectorSpec, secrets i
 		PodLabelVisitor: vector.PodLogExcludeLabel,
 		isDaemonset:     isDaemonset,
 		LogLevel:        logLevel,
-		UseKubeCache:    useCache,
 		MaxUnavailable:  maxUnavailable,
 	}
 	return factory

diff --git a/internal/constants/annotations.go b/internal/constants/annotations.go
@@ -18,16 +18,7 @@ const (
 
 	AnnotationSecretHash = "observability.openshift.io/secret-hash"
 
-	// AnnotationKubeCache is used to enable caching for requests to the kube-apiserver using vector kubernetes_logs source.
-	// Tech-Preview feature
-	//
-	// While enabling cache can significantly reduce Kubernetes control plane
-	// memory pressure, the trade-off is a chance of receiving stale data.
-	AnnotationKubeCache = "observability.openshift.io/use-apiserver-cache"
-
-	// AnnotationMaxUnavailable configures the maximum number of DaemonSet pods that can be unavailable during a rolling update.
-	// Tech-Preview feature
-	//
+	// AnnotationMaxUnavailable (Deprecated) configures the maximum number of DaemonSet pods that can be unavailable during a rolling update.
 	// This can be an absolute number (e.g., 1) or a percentage (e.g., 10%). Default is 100%.
 	AnnotationMaxUnavailable = "observability.openshift.io/max-unavailable-rollout"
 )
diff --git a/internal/controller/observability/collector.go b/internal/controller/observability/collector.go
@@ -44,9 +44,7 @@ func ReconcileCollector(context internalcontext.ForwarderContext, pollInterval,
 		options = context.AdditionalContext
 	}
 
-	// Set kubeapi and rollout options based on annotation (LOG-7196)
-	// TODO: replace with API fields
-	SetKubeCacheOption(context.Forwarder.Annotations, options)
+	// Set rollout options based on annotation (LOG-7196)
 	SetMaxUnavailableRolloutOption(context.Forwarder.Annotations, options)
 
 	if internalobs.Outputs(context.Forwarder.Spec.Outputs).NeedServiceAccountToken() {
@@ -115,7 +113,6 @@ func ReconcileCollector(context internalcontext.ForwarderContext, pollInterval,
 		resourceNames,
 		isDaemonSet,
 		LogLevel(context.Forwarder.Annotations),
-		factory.IncludesKubeCacheOption(options),
 		factory.GetMaxUnavailableValue(options),
 	)
 
@@ -180,11 +177,6 @@ func EvaluateAnnotationsForEnabledCapabilities(annotations map[string]string, op
 			if strings.ToLower(value) == "true" {
 				options[generatorhelpers.EnableDebugOutput] = "true"
 			}
-		case constants.AnnotationKubeCache:
-			// Matching the validate_annotations logic
-			if observability.IsEnabledValue(value) {
-				options[framework.UseKubeCacheOption] = "true"
-			}
 		case constants.AnnotationMaxUnavailable:
 			// Matching the validate_annotations logic
 			if observability.IsPercentOrWholeNumber(value) {
@@ -201,15 +193,6 @@ func LogLevel(annotations map[string]string) string {
 	return "warn"
 }
 
-func SetKubeCacheOption(annotations map[string]string, options framework.Options) {
-	if value, found := annotations[constants.AnnotationKubeCache]; found {
-		if observability.IsEnabledValue(value) {
-			log.V(3).Info("Kube cache annotation found")
-			options[framework.UseKubeCacheOption] = "true"
-		}
-	}
-}
-
 func SetMaxUnavailableRolloutOption(annotations map[string]string, options framework.Options) {
 	if value, found := annotations[constants.AnnotationMaxUnavailable]; found {
 		if observability.IsPercentOrWholeNumber(value) {

diff --git a/internal/controller/observability/collector_features_test.go b/internal/controller/observability/collector_features_test.go
@@ -39,11 +39,6 @@ var _ = Describe("#EvaluateAnnotationsForEnabledCapabilities", func() {
 		Entry("enables debug for True", helpers.EnableDebugOutput, "true", AnnotationDebugOutput, "True"),
 		Entry("disables debug for anything else", "", "", AnnotationDebugOutput, "abcdef"),
 
-		Entry("enables kube-cache for true", framework.UseKubeCacheOption, "true", AnnotationKubeCache, "true"),
-		Entry("enables kube-cache for True", framework.UseKubeCacheOption, "true", AnnotationKubeCache, "True"),
-		Entry("enables kube-cache for enabled", framework.UseKubeCacheOption, "true", AnnotationKubeCache, "enabled"),
-		Entry("disables kube-cache for anything else", "", "", AnnotationKubeCache, "bubbles"),
-
 		Entry("enables max-unavailable for value '10'", framework.MaxUnavailableOption, "10", AnnotationMaxUnavailable, "10"),
 		Entry("enables max-unavailable for value '99%'", framework.MaxUnavailableOption, "99%", AnnotationMaxUnavailable, "99%"),
 		Entry("disables max-unavailable option for anything not a number or percentage", "", "", AnnotationMaxUnavailable, "fluffy"),

diff --git a/internal/factory/options.go b/internal/factory/options.go
diff --git a/internal/generator/framework/options.go b/internal/generator/framework/options.go
@@ -11,7 +11,6 @@ const (
 	URL                                 = "url"
 	OptionServiceAccountTokenSecretName = "serviceAccountTokenSecretName"
 	OptionForwarderName                 = "forwarderName"
-	UseKubeCacheOption                  = "useKubeCache"
 	MaxUnavailableOption                = "maxUnavailableRollout"
 )
 

diff --git a/internal/generator/vector/conf/complex.toml b/internal/generator/vector/conf/complex.toml
@@ -250,7 +250,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_infrastructure_container_meta]
 type = "remap"
@@ -420,7 +420,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_mytestapp_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/conf/complex_http_receiver.toml b/internal/generator/vector/conf/complex_http_receiver.toml
@@ -247,7 +247,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_infrastructure_container_meta]
 type = "remap"
@@ -457,7 +457,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_mytestapp_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/conf/conf_test.go b/internal/generator/vector/conf/conf_test.go
@@ -3,6 +3,7 @@ package conf
 import (
 	_ "embed"
 	"fmt"
+
 	obs "github.com/openshift/cluster-logging-operator/api/observability/v1"
 
 	"github.com/openshift/cluster-logging-operator/internal/factory"
@@ -69,50 +70,6 @@ var _ = Describe("Testing Complete Config Generation", func() {
 		conf := Conf(secrets, spec, constants.OpenshiftNS, "my-forwarder", factory.ForwarderResourceNames{CommonName: constants.CollectorName}, op)
 		Expect(string(exp)).To(EqualConfigFrom(conf))
 	},
-		Entry("with spec for containers and kube-cache enabled",
-			"container.toml",
-			framework.Options{framework.UseKubeCacheOption: "true"},
-			obs.ClusterLogForwarderSpec{
-				Inputs: []obs.InputSpec{
-					{
-						Name: "mytestapp",
-						Type: obs.InputTypeApplication,
-						Application: &obs.Application{
-							Includes: []obs.NamespaceContainerSpec{
-								{Namespace: "test-ns"},
-							},
-						},
-					},
-					{
-						Name: "myinfra",
-						Type: obs.InputTypeInfrastructure,
-						Infrastructure: &obs.Infrastructure{
-							Sources: []obs.InfrastructureSource{obs.InfrastructureSourceContainer},
-						},
-					},
-				},
-				Pipelines: []obs.PipelineSpec{
-					{
-						InputRefs: []string{
-							"myinfra",
-							"mytestapp",
-						},
-						OutputRefs: []string{outputName},
-						Name:       "mypipeline",
-						FilterRefs: []string{"my-labels"},
-					},
-				},
-				Outputs: []obs.OutputSpec{
-					kafkaOutput,
-				},
-				Filters: []obs.FilterSpec{
-					{
-						Name:            "my-labels",
-						Type:            obs.FilterTypeOpenshiftLabels,
-						OpenshiftLabels: map[string]string{"key1": "value1", "key2": "value2"},
-					},
-				},
-			}),
 		Entry("with complex spec",
 			"complex.toml",
 			nil,

diff --git a/internal/generator/vector/input/application.toml b/internal/generator/vector/input/application.toml
@@ -12,7 +12,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_application_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/input/application_exclude_container_from_infra.toml b/internal/generator/vector/input/application_exclude_container_from_infra.toml
@@ -13,7 +13,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_my_app_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/input/application_excludes_container.toml b/internal/generator/vector/input/application_excludes_container.toml
@@ -12,7 +12,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_my_app_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/input/application_includes_container.toml b/internal/generator/vector/input/application_includes_container.toml
@@ -13,7 +13,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_my_app_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/input/application_with_includes_excludes.toml b/internal/generator/vector/input/application_with_includes_excludes.toml
@@ -13,7 +13,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_my_app_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/input/application_with_infra_includes_excludes.toml b/internal/generator/vector/input/application_with_infra_includes_excludes.toml
@@ -13,7 +13,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_my_app_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/input/application_with_infra_includes_infra_excludes.toml b/internal/generator/vector/input/application_with_infra_includes_infra_excludes.toml
@@ -13,7 +13,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_my_app_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/input/application_with_matchLabels.toml b/internal/generator/vector/input/application_with_matchLabels.toml
@@ -13,7 +13,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_my_app_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/input/application_with_specific_infra_includes_infra_excludes.toml b/internal/generator/vector/input/application_with_specific_infra_includes_infra_excludes.toml
@@ -13,7 +13,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_my_app_container_meta]
 type = "remap"

diff --git a/internal/generator/vector/input/application_with_throttle.toml b/internal/generator/vector/input/application_with_throttle.toml
@@ -12,7 +12,7 @@ pod_annotation_fields.pod_uid = "kubernetes.pod_id"
 pod_annotation_fields.pod_node_name = "hostname"
 namespace_annotation_fields.namespace_uid = "kubernetes.namespace_id"
 rotate_wait_secs = 5
-use_apiserver_cache = false
+use_apiserver_cache = true
 
 [transforms.input_application_container_meta]
 type = "remap"