LOG-8992: update dependencies to match OCP v4.22

.bingo/bingo.mod

@@ -1,7 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.24.9
+go 1.25.0
 
-toolchain go1.24.11
+toolchain go1.25.0
 
 require github.com/bwplotka/bingo v0.10.0

.bingo/controller-gen.mod

@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.24.0
+go 1.25.0
 
 require sigs.k8s.io/controller-tools v0.18.0 // cmd/controller-gen

.bingo/gen-crd-api-reference-docs.mod

@@ -1,5 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.25.0
+
+toolchain go1.25.0
 
 require github.com/ViaQ/gen-crd-api-reference-docs v0.0.5

.bingo/go.mod

@@ -1 +1,5 @@
-module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
+module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
+
+go 1.25.0
+
+toolchain go1.25.0

.bingo/golangci-lint.mod

@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.24.11
+go 1.25.0
 
 require github.com/golangci/golangci-lint/v2 v2.8.0 // cmd/golangci-lint

.bingo/junitreport.mod

@@ -1,5 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.14
+go 1.25.0
+
+toolchain go1.25.0
 
 require github.com/openshift/release v0.0.0-20220531132329-92dee95b5da2 // tools/junitreport

.bingo/kustomize.mod

@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.22.5
+go 1.25.0
 
 require sigs.k8s.io/kustomize/kustomize/v5 v5.4.3

.bingo/operator-sdk.mod

@@ -1,6 +1,6 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.24.6
+go 1.25.0
 
 replace github.com/containerd/containerd => github.com/containerd/containerd v1.4.11
 

.bingo/opm.mod

@@ -1,5 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.14
+go 1.25.0
+
+toolchain go1.25.0
 
 require github.com/operator-framework/operator-registry v1.23.0 // cmd/opm

Dockerfile

@@ -1,20 +1,17 @@
-FROM golang:1.24 AS builder
+FROM golang:1.25 AS builder
 
-ENV REMOTE_SOURCES=${REMOTE_SOURCES:-.}
-ENV REMOTE_SOURCES_DIR=${REMOTE_SOURCES_DIR:-.}
-ENV APP_DIR=.
-ENV CACHE_DEPS="true"
-WORKDIR /opt/apt-root/src
+ARG CACHE_DEPS="true"
+WORKDIR /opt/app-root/src
 
 
-COPY ${APP_DIR}/api ./api
-COPY ${APP_DIR}/go.mod ${APP_DIR}/go.sum ./
-RUN if [ -n $CACHE_DEPS ]; then go mod download ; fi
-COPY ${APP_DIR}/.bingo .bingo
-COPY ${APP_DIR}/Makefile ./Makefile
-COPY ${APP_DIR}/version ./version
-COPY ${APP_DIR}/cmd/main.go ./cmd/main.go
-COPY ${APP_DIR}/internal ./internal
+COPY ./api ./api
+COPY ./go.mod ./go.sum ./
+RUN if [ "${CACHE_DEPS}" = "true" ] ; then go mod download ; fi
+COPY ./.bingo .bingo
+COPY ./Makefile ./Makefile
+COPY ./version ./version
+COPY ./cmd/main.go ./cmd/main.go
+COPY ./internal ./internal
 
 USER 0
 RUN make build
@@ -31,26 +28,23 @@ esac
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
 
-ENV APP_DIR=/opt/apt-root/src
-ENV SRC_DIR=./
-
 RUN INSTALL_PKGS=" \
       openssl \
       rsync \
       file \
       xz \
       " && \
-    microdnf install -y $INSTALL_PKGS && \
-    rpm -V $INSTALL_PKGS && \
+    microdnf install -y ${INSTALL_PKGS} && \
+    rpm -V ${INSTALL_PKGS} && \
     microdnf clean all && \
     mkdir /tmp/ocp-clo && \
     chmod og+w /tmp/ocp-clo
 
-COPY --from=builder $APP_DIR/bin/cluster-logging-operator /usr/bin/
+COPY --from=builder /opt/app-root/src/bin/cluster-logging-operator /usr/bin/
 
 COPY --from=origincli /tmp/oc /usr/bin/oc
 
-COPY $SRC_DIR/must-gather/collection-scripts/* /usr/bin/
+COPY ./must-gather/collection-scripts/* /usr/bin/
 
 USER 1000
 WORKDIR /usr/bin

Makefile

@@ -11,6 +11,7 @@ export PATH:=$(GOBIN):$(PATH)
 
 include .bingo/Variables.mk
 
+export GOTOOLCHAIN=auto
 export GOROOT=$(shell go env GOROOT)
 export GOFLAGS=
 export GO111MODULE=on

bundle/manifests/cluster-logging.clusterserviceversion.yaml

@@ -82,7 +82,7 @@ metadata:
     categories: OpenShift Optional, Logging & Tracing, Observability
     certified: "false"
     containerImage: quay.io/openshift-logging/cluster-logging-operator:latest
-    createdAt: "2026-05-14T13:46:42Z"
+    createdAt: "2026-05-14T19:29:17Z"
     description: The Red Hat OpenShift Logging Operator for OCP provides a means for
       configuring and managing log collection and forwarding.
     features.operators.openshift.io/cnf: "false"
@@ -2562,6 +2562,8 @@ spec:
                       fieldPath: metadata.name
                 - name: OPERATOR_NAME
                   value: cluster-logging-operator
+                - name: KUBE_FEATURE_WatchListClient
+                  value: "false"
                 - name: RELATED_IMAGE_VECTOR
                   value: quay.io/openshift-logging/vector:v0.54.0
                 - name: RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER

bundle/manifests/logging.openshift.io_logfilemetricexporters.yaml

@@ -78,7 +78,7 @@ spec:
                       Claims lists the names of resources, defined in spec.resourceClaims,
                       that are used by this container.
 
-                      This is an alpha field and requires enabling the
+                      This field depends on the
                       DynamicResourceAllocation feature gate.
 
                       This field is immutable. It can only be set for containers.
@@ -149,9 +149,10 @@ spec:
                     operator:
                       description: |-
                         Operator represents a key's relationship to the value.
-                        Valid operators are Exists and Equal. Defaults to Equal.
+                        Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                         Exists is equivalent to wildcard for value, so that a pod can
                         tolerate all taints of a particular category.
+                        Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                       type: string
                     tolerationSeconds:
                       description: |-

cmd/main.go

@@ -46,7 +46,6 @@ import (
 	oauth "github.com/openshift/api/oauth/v1"
 	routev1 "github.com/openshift/api/route/v1"
 	securityv1 "github.com/openshift/api/security/v1"
-	elasticsearch "github.com/openshift/elasticsearch-operator/apis/logging/v1"
 	hypershiftv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
@@ -64,7 +63,6 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 	utilruntime.Must(apis.AddToScheme(scheme))
-	utilruntime.Must(elasticsearch.AddToScheme(scheme))
 	utilruntime.Must(routev1.AddToScheme(scheme))
 	utilruntime.Must(consolev1.AddToScheme(scheme))
 	utilruntime.Must(oauth.AddToScheme(scheme))

config/crd/bases/logging.openshift.io_logfilemetricexporters.yaml

@@ -73,7 +73,7 @@ spec:
                       Claims lists the names of resources, defined in spec.resourceClaims,
                       that are used by this container.
 
-                      This is an alpha field and requires enabling the
+                      This field depends on the
                       DynamicResourceAllocation feature gate.
 
                       This field is immutable. It can only be set for containers.
@@ -144,9 +144,10 @@ spec:
                     operator:
                       description: |-
                         Operator represents a key's relationship to the value.
-                        Valid operators are Exists and Equal. Defaults to Equal.
+                        Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                         Exists is equivalent to wildcard for value, so that a pod can
                         tolerate all taints of a particular category.
+                        Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                       type: string
                     tolerationSeconds:
                       description: |-

config/manager/manager.yaml

@@ -48,6 +48,8 @@ spec:
                 fieldPath: metadata.name
           - name: OPERATOR_NAME
             value: "cluster-logging-operator"
+          - name: KUBE_FEATURE_WatchListClient
+            value: "false"
           - name: RELATED_IMAGE_VECTOR
             value: quay.io/openshift-logging/vector:v0.54.0
           - name: RELATED_IMAGE_LOG_FILE_METRIC_EXPORTER