Skip to content

Commit 6b584f1

Browse files
authored
Merge pull request #334 from redhat-openshift-ecosystem/revert-327-add-subscription-check
Revert "Add check for openshift subscription"
2 parents 18695b9 + 5142207 commit 6b584f1

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

roles/parse_operator_bundle/tasks/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,12 @@
104104
set_fact:
105105
csv_vars: "{{ csv_data.stdout }}"
106106

107-
- name: "Determine and set fact for operator specific information - name, pod name, container name, capabilities, and subscription"
107+
- name: "Determine and set fact for operator specific information - name, pod name, container name and capabilities"
108108
set_fact:
109109
current_csv: "{{ (csv_vars | from_yaml).metadata.name }}"
110110
operator_pod_name: "{{ (csv_vars | from_yaml).spec.install.spec.deployments[0].name }}"
111111
operator_container_name: "{{ (csv_vars | from_yaml).spec.install.spec.deployments[0].spec.template.spec.containers[0].name }}"
112112
operator_capabilities: "{{ (csv_vars | from_yaml).metadata.annotations.capabilities }}"
113-
operator_valid_subscription: "{{ (csv_vars | from_yaml).metadata.annotations['operators.openshift.io/valid-subscription'] | default([]) }}"
114113

115114
- name: "Determine operator_allnamespaces_support"
116115
set_fact:

roles/parse_operator_bundle/templates/parsed_operator_data.yml.j2

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ operator_allnamespaces_support: {{ operator_allnamespaces_support }}
1313
operator_ownnamespace_support: {{ operator_ownnamespace_support }}
1414
operator_singlenamespace_support: {{ operator_singlenamespace_support }}
1515
operator_multinamespace_support: {{ operator_multinamespace_support }}
16-
{% if operator_valid_subscription|length < 1 %}
17-
operator_valid_subscription: []
18-
{% else %}
19-
operator_valid_subscription:
20-
{% for valid_subscription in operator_valid_subscription %}
21-
- {{ valid_subscription }}
22-
{% endfor %}
23-
{% endif %}
2416
{% if crd_paths|length < 1 %}
2517
crd_paths: []
2618
{% else %}

0 commit comments

Comments
 (0)