Merge pull request #803 from elfiesmelfie/update_loki_operator_for_ck

[ci] Update loki operator to stable-6.4 channel

Author: openshift-merge-bot[bot]

ci/cloudkitty-pre_deploy-install_loki.yml

@@ -14,38 +14,11 @@
             github.com/openstack-k8s-operators/telemetry-operator:
               src_dir: "{{ telemetry_operator_dir | default('telemetry-operator/') }}"
 
-      # NOTE: The value doesn't get used unless the deploy-loki-for-ck is converted into a template and rendered.
-      # TODO: Update the yaml to a template
-    - name: Set the loki-operator version to pin the version
-      ansible.builtin.set_fact:
-        loki_operator_version: "v6.3.0"
-
     - name: Deploy loki operator
       ansible.builtin.shell:
         cmd: |
           oc apply -f {{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/deploy-loki-for-ck.yaml
 
-    - name: Get and approve the installplan when the version is pinned
-      when: loki_operator_version is defined
-      block:
-        - name: Get the installplan from the loki-operator subscription
-          ansible.builtin.shell:
-            cmd: |
-              oc get installplan -n openshift-operators-redhat | grep "loki-operator.{{ loki_operator_version }}" | awk '{print $1}'
-          retries: 10
-          delay: 10
-          register: loki_installplan
-          until: loki_installplan.stdout_lines | length != 0
-
-        - name: Show the loki_installplan from oc get installplan
-          ansible.builtin.debug:
-            var: loki_installplan
-
-        - name: Approve the installation
-          ansible.builtin.shell:
-            cmd: |
-              oc patch -n openshift-operators-redhat installplan {{ loki_installplan.stdout }} --type='json' -p='[{"op": "replace", "path": "/spec/approved", "value":true}]'
-
     - name: Wait up to 5 minutes until the Loki CSV is Succeeded
       ansible.builtin.shell:
         cmd: |

ci/deploy-loki-for-ck.yaml

@@ -20,9 +20,7 @@ metadata:
   name: loki-operator
   namespace: openshift-operators-redhat
 spec:
-  channel: stable-6.3
-  installPlanApproval: Manual
-  startingCSV: loki-operator.v6.3.0
+  channel: stable-6.4
   name: loki-operator
   source: redhat-operators
   sourceNamespace: openshift-marketplace