Skip to content

Commit 9487068

Browse files
committed
Revert "[ci] Pin loki-operator version to 6.3.0"
This reverts commit 54fb11e.
1 parent 8eb50ce commit 9487068

2 files changed

Lines changed: 0 additions & 29 deletions

File tree

ci/cloudkitty-pre_deploy-install_loki.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,11 @@
1414
github.com/openstack-k8s-operators/telemetry-operator:
1515
src_dir: "{{ telemetry_operator_dir | default('telemetry-operator/') }}"
1616

17-
# NOTE: The value doesn't get used unless the deploy-loki-for-ck is converted into a template and rendered.
18-
# TODO: Update the yaml to a template
19-
- name: Set the loki-operator version to pin the version
20-
ansible.builtin.set_fact:
21-
loki_operator_version: "v6.3.0"
22-
2317
- name: Deploy loki operator
2418
ansible.builtin.shell:
2519
cmd: |
2620
oc apply -f {{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/deploy-loki-for-ck.yaml
2721
28-
- name: Get and approve the installplan when the version is pinned
29-
when: loki_operator_version is defined
30-
block:
31-
- name: Get the installplan from the loki-operator subscription
32-
ansible.builtin.shell:
33-
cmd: |
34-
oc get installplan -n openshift-operators-redhat | grep "loki-operator.{{ loki_operator_version }}" | awk '{print $1}'
35-
retries: 10
36-
delay: 10
37-
register: loki_installplan
38-
until: loki_installplan.stdout_lines | length != 0
39-
40-
- name: Show the loki_installplan from oc get installplan
41-
ansible.builtin.debug:
42-
var: loki_installplan
43-
44-
- name: Approve the installation
45-
ansible.builtin.shell:
46-
cmd: |
47-
oc patch -n openshift-operators-redhat installplan {{ loki_installplan.stdout }} --type='json' -p='[{"op": "replace", "path": "/spec/approved", "value":true}]'
48-
4922
- name: Wait up to 5 minutes until the Loki CSV is Succeeded
5023
ansible.builtin.shell:
5124
cmd: |

ci/deploy-loki-for-ck.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ metadata:
2121
namespace: openshift-operators-redhat
2222
spec:
2323
channel: stable-6.3
24-
installPlanApproval: Manual
25-
startingCSV: loki-operator.v6.3.0
2624
name: loki-operator
2725
source: redhat-operators
2826
sourceNamespace: openshift-marketplace

0 commit comments

Comments
 (0)