Merge branch 'development' into rhte-apac

Guillaume Coré

2019-09-12 8c770764263daa05596ba9fce8d961f7f0aa3c44

Merge branch 'development' into rhte-apac

 ansible/roles/ocp4-workload-kube-federation/tasks/remove_workload.yml

@@ -8,11 +8,20 @@
#   loop:
#   - ./templates/kubefed.j2

- name: Remove federated API Types
  when:
  - _kubefed_federated_api_types | d("") | length > 0
  shell: "kubefedctl disable {{ item }}"
  loop: "{{ _kubefed_federated_api_types }}"

- name: Remove Kube Federation Operator
  k8s:
    state: absent
    definition: "{{ lookup('template', item ) | from_yaml }}"
  loop:
  - ./templates/kubefed.j2
  - ./templates/kubefedconfig.j2
  - ./templates/kubefedwebhook.j2
  - ./templates/subscription.j2
  - ./templates/catalog_source_config.j2
  - ./templates/operator_group.j2

 ansible/roles/ocp4-workload-kube-federation/tasks/workload.yml

@@ -45,7 +45,24 @@
  delay: 10
  until: csv.stdout == "Succeeded"

- name: Create KubeFed objects
- name: Create KubeFed Admission Webhook objects
  k8s:
    state: present
    merge_type:
    - strategic-merge
    - merge
    definition: "{{ lookup('template', item ) | from_yaml }}"
  loop:
  - ./templates/kubefedwebhook.j2

- name: Wait until KubeFed Admission WebHook Deployment is ready
  command: oc get deployment kubefed-admission-webhook -o jsonpath='{.status.availableReplicas}' -n "{{ _kubefed_project }}"
  register: csv
  retries: 30
  delay: 10
  until: csv.stdout == "1"

- name: Create KubeFed (Config) objects
  k8s:
    state: present
    merge_type:
@@ -54,9 +71,15 @@
    definition: "{{ lookup('template', item ) | from_yaml }}"
  loop:
  - ./templates/kubefedconfig.j2
  - ./templates/kubefedwebhook.j2
  - ./templates/kubefed.j2
  

- name: Wait until KubeFed Controller Manager Deployment is ready
  command: oc get deployment kubefed-controller-manager -o jsonpath='{.status.availableReplicas}' -n "{{ _kubefed_project }}"
  register: csv
  retries: 30
  delay: 10
  until: csv.stdout == "2"

- name: Register API Types to be federated
  when:
  - _kubefed_federated_api_types | d("") | length > 0