From f976d40883de3eac6e252f29ff3252a73f23c632 Mon Sep 17 00:00:00 2001
From: Pranav Gaikwad <pgaikwad@redhat.com>
Date: Wed, 19 Feb 2020 18:33:18 +0100
Subject: [PATCH] Upgraded to migration operator v1.1.1 (#1165)
---
ansible/roles/ocp-workload-migration/templates/operator.yml.j2 | 2 +-
ansible/roles/ocp4-workload-migration/defaults/main.yml | 8 +++++++-
ansible/roles/ocp4-workload-migration/tasks/workload.yml | 13 +++++++++++--
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/ocp-workload-migration/templates/operator.yml.j2 b/ansible/roles/ocp-workload-migration/templates/operator.yml.j2
index 8184320..ae6793d 100644
--- a/ansible/roles/ocp-workload-migration/templates/operator.yml.j2
+++ b/ansible/roles/ocp-workload-migration/templates/operator.yml.j2
@@ -255,7 +255,7 @@
- name: MIG_UI_TAG
value: ed16db50ffd6614d8f654449bf29003b82d4d5da420419add00fd5ec5b1fd79b
- name: MIG_CONTROLLER_TAG
- value: db3247ffbaaace242cfd3d530994ccdeb0a39f4e3b46e43f7f3870279cf65d1a
+ value: cbdd2cdc2c050bb62c713004497e57bfb9c4f7575dd1ec38e69f41689575d365
volumes:
- name: runner
emptyDir: {}
diff --git a/ansible/roles/ocp4-workload-migration/defaults/main.yml b/ansible/roles/ocp4-workload-migration/defaults/main.yml
index 7089136..31a3250 100644
--- a/ansible/roles/ocp4-workload-migration/defaults/main.yml
+++ b/ansible/roles/ocp4-workload-migration/defaults/main.yml
@@ -1,6 +1,12 @@
# workload vars
-mig_operator_release: "v1.1.0"
+mig_operator_release: "v1.1.1"
mig_subscription_wait: 20
+mig_expected_crds:
+- migclusters.migration.openshift.io
+- migmigrations.migration.openshift.io
+- migplans.migration.openshift.io
+- migrationcontrollers.migration.openshift.io
+- migstorages.migration.openshift.io
mig_state: "present"
mig_migration_namespace: "openshift-migration"
diff --git a/ansible/roles/ocp4-workload-migration/tasks/workload.yml b/ansible/roles/ocp4-workload-migration/tasks/workload.yml
index 067c4bc..f0cd894 100644
--- a/ansible/roles/ocp4-workload-migration/tasks/workload.yml
+++ b/ansible/roles/ocp4-workload-migration/tasks/workload.yml
@@ -20,8 +20,17 @@
state: "{{ mig_state }}"
definition: "{{ lookup('template', 'mig-operator-subscription-downstream.yml.j2' ) }}"
-- pause:
- seconds: "{{ mig_subscription_wait }}"
+- name: "Wait for Migration CRDs to exist"
+ k8s_info:
+ api_version: "apiextensions.k8s.io/v1beta1"
+ kind: CustomResourceDefinition
+ name: "{{ item }}"
+ loop: "{{ mig_expected_crds }}"
+ register: crds
+ until: crds.resources|length > 0
+ retries: 30
+ delay: 10
+ when: not migration_workload_destroy|bool
- name: "Set MigrationController state to {{ mig_state }}"
k8s:
--
Gitblit v1.9.3