Merge pull request #754 from ayefimov-1/ayefimov_update_logging_operators

Update logging operators

Author: openshift-merge-bot[bot]

ci/deploy-logging-dependencies/files/lokistack.yaml

@@ -6,8 +6,8 @@ spec:
   size: 1x.demo
   storage:
     schemas:
-    - version: v12
-      effectiveDate: "2022-06-01"
+    - version: v13
+      effectiveDate: "2025-06-01"
     secret:
       name: logging-loki-s3
       type: s3

ci/deploy-logging-dependencies/files/operators.yaml

@@ -35,7 +35,7 @@ metadata:
   name: loki-operator
   namespace: openshift-operators-redhat
 spec:
-  channel: stable-6.1
+  channel: stable-6.2
   installPlanApproval: Automatic
   name: loki-operator
   source: redhat-operators
@@ -47,7 +47,7 @@ metadata:
   name: cluster-logging
   namespace: openshift-logging
 spec:
-  channel: stable-6.1
+  channel: stable-6.2
   installPlanApproval: Automatic
   name: cluster-logging
   source: redhat-operators

ci/deploy-logging-dependencies/tasks/deploy-cluster-logging.yml

@@ -21,7 +21,16 @@
   register: output
   until: output.stdout_lines | length != 0
 
-- name: Wait for the cluster log forwarder to be ready
-  ansible.builtin.command:
-    cmd: |
-      oc wait --timeout=300s --for condition=Ready=True --namespace=openshift-logging clusterlogforwarder collector
+- name: Wait for 2 "True" and 0 "False" conditions in ClusterLogForwarder status
+  ansible.builtin.shell:
+    cmd: >
+      oc get clusterlogforwarder collector -n openshift-logging -o json | jq --raw-output '[
+        ([.status.conditions[] | select(.status == "True")] | length),
+        ([.status.conditions[] | select(.status == "False")] | length)
+      ] | @csv'
+  register: clf_condition_counts
+  until: clf_condition_counts.stdout == "2,0"
+  retries: 20
+  delay: 20
+  changed_when: false
+  check_mode: no