From 998e0c84399eb45b6a99b445929b06e84363512f Mon Sep 17 00:00:00 2001
From: Wolfgang Kulhanek <wkulhanek@users.noreply.github.com>
Date: Fri, 13 Mar 2020 18:38:16 +0100
Subject: [PATCH] Update Quay Operator to new variable structure. Removed non-marketplace deployment logic. (#1326)
---
ansible/roles/ocp4-workload-quay-operator/tasks/remove_workload.yml | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/ansible/roles/ocp4-workload-quay-operator/tasks/remove_workload.yml b/ansible/roles/ocp4-workload-quay-operator/tasks/remove_workload.yml
index fb4e877..b0dd19c 100644
--- a/ansible/roles/ocp4-workload-quay-operator/tasks/remove_workload.yml
+++ b/ansible/roles/ocp4-workload-quay-operator/tasks/remove_workload.yml
@@ -1,39 +1,21 @@
---
-# Implement your Workload removal tasks here
+- name: Set up combined ocp4_workload_quay_operator dictionary
+ set_fact:
+ ocp4_workload_quay_operator: >-
+ {{ ocp4_workload_quay_operator_defaults
+ | combine(ocp4_workload_quay_operator_input | default( {} ),
+ ocp4_workload_quay_operator_secret | default( {} ), recursive=true)
+ }}
-- name: Remove Quay Resources
+- name: Remove Red Hat Quay Operator
k8s:
state: absent
definition: "{{ lookup('template', item ) | from_yaml }}"
loop:
- ./templates/quay.j2
-
-- name: Remove Red Hat Quay Operator (OLM install)
- when: _quay_operator_hub | bool
- k8s:
- state: absent
- definition: "{{ lookup('template', item ) | from_yaml }}"
- loop:
- ./templates/subscription.j2
- ./templates/operatorgroup.j2
- ./templates/catalogsourceconfig.j2
-
-- name: Remove Red Hat Quay Operator (Manual install)
- when: not _quay_operator_hub | bool
- k8s:
- state: absent
- definition: "{{ lookup('template', item ) | from_yaml }}"
- loop:
- - ./templates/operator.j2
- - ./templates/service_account.j2
- - ./templates/role.j2
- - ./templates/role_binding.j2
- - ./templates/cluster_role_binding.j2
- # NOT removing Cluster Resources because there may be
- # other projects with Quay Operators in them.
- # Removing Cluster Resources would screw those up.
- #- ./templates/cluster_role.j2
- #- ./templates/crd.j2
- name: Remove Red Hat Quay Operator (Shared resources)
k8s:
--
Gitblit v1.9.3