Add option to install operators (#45)

* Add option to install operators

* update docs

* more

* typo

* fix indent

* fix defaults

* use custom var to avoid issue

* update loop

* update names

Author: loganmc10

common/roles/install_operator/tasks/main.yaml

@@ -1,4 +1,4 @@
-- name: Create Namespace
+- name: "Create Namespace for {{ operator_name }}"
   when: operator_namespace != "openshift-operators"
   kubernetes.core.k8s:
     template: Namespace.yaml.j2
@@ -7,7 +7,7 @@
   register: k8s_result
   until: k8s_result is not failed
 
-- name: Create OperatorGroup
+- name: "Create OperatorGroup for {{ operator_name }}"
   when: operator_namespace != "openshift-operators"
   kubernetes.core.k8s:
     template: OperatorGroup.yaml.j2
@@ -16,19 +16,9 @@
   register: k8s_result
   until: k8s_result is not failed
 
-- name: Create Subscription
+- name: "Create Subscription for {{ operator_name }}"
   kubernetes.core.k8s:
-    definition:
-      apiVersion: operators.coreos.com/v1alpha1
-      kind: Subscription
-      metadata:
-        name: "{{ operator_name }}"
-        namespace: "{{ operator_namespace }}"
-      spec:
-        installPlanApproval: Automatic
-        name: "{{ operator_name }}"
-        source: "{{ catalog_source | default('redhat-operators') }}"
-        sourceNamespace: openshift-marketplace
+    template: Subscription.yaml.j2
     apply: true
     state: present
   register: create_sub

common/roles/install_operator/templates/Subscription.yaml.j2

@@ -0,0 +1,13 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: "{{ operator_name }}"
+  namespace: "{{ operator_namespace }}"
+spec:
+  installPlanApproval: "{{ install_plan_approval | default('Automatic') }}"
+  name: "{{ operator_name }}"
+  source: "{{ catalog_source | default('redhat-operators') }}"
+  sourceNamespace: openshift-marketplace
+{% if channel is defined %}
+  channel: "{{ channel }}"
+{% endif %}

edge/install-config-sno-example.yaml

@@ -14,8 +14,8 @@ edgeCluster:
     mode: "tpmv2"
   relocatable: # Optional, see docs/RELOCATABLE.md
     interface: <external_interface>
-    ipv4_subnet: "192.168.7.0/24" # Optional, defaults to 192.168.7.0/24
-    ipv6_subnet: "fd04::/64" # Optional, defaults to fd04::/64, only used for dual stack or IPv6 deployments
+    ipv4Subnet: "192.168.7.0/24" # Optional, defaults to 192.168.7.0/24
+    ipv6Subnet: "fd04::/64" # Optional, defaults to fd04::/64, only used for dual stack or IPv6 deployments
   clearRegistryConfig: false # Optional, deletes ImageContentSourcePolicys and registry pull-secret at the end of the installation. Also disables the crio-wipe service.
   routingViaHost: false # Optional, see https://docs.openshift.com/container-platform/latest/rest_api/operator_apis/network-operator-openshift-io-v1.html#spec-defaultnetwork-ovnkubernetesconfig-gatewayconfig
   odfStorage: # Optional
@@ -25,6 +25,14 @@ edgeCluster:
     catalogSource: redhat-operators # Optional, defaults to redhat-operators
     noobaa: false # Install NooBaa (S3 compatible storage), defaults to false
   reservedCpuSet: <reserved_set> # Optional, example: "0-1,32-33"  there should be no spaces. See https://docs.openshift.com/container-platform/latest/scalability_and_performance/sno-du-enabling-workload-partitioning-on-single-node-openshift.html
+  operators: # Optional, a list of operators to install
+    - name: my-operator
+      namespace: my-namespace
+      allNamespaces: false # Defaults to false
+      clusterMonitoring: false # Defaults to false
+      channel: stable # Can be omitted, will default to the default channel for the operator
+      catalogSource: redhat-operators # Defaults to redhat-operators
+      installPlanApproval: Automatic # Defaults to Automatic
 
 baseDomain: <cluster_domain>
 compute:

edge/install-config-standard-example.yaml

@@ -14,8 +14,8 @@ edgeCluster:
     mode: "tpmv2"
   relocatable: # Optional, see docs/RELOCATABLE.md
     interface: <external_interface>
-    ipv4_subnet: "192.168.7.0/24" # Optional, defaults to 192.168.7.0/24
-    ipv6_subnet: "fd04::/64" # Optional, defaults to fd04::/64, only used for dual stack or IPv6 deployments
+    ipv4Subnet: "192.168.7.0/24" # Optional, defaults to 192.168.7.0/24
+    ipv6Subnet: "fd04::/64" # Optional, defaults to fd04::/64, only used for dual stack or IPv6 deployments
   clearRegistryConfig: false # Optional, deletes ImageContentSourcePolicys and registry pull-secret at the end of the installation. Also disables the crio-wipe service.
   routingViaHost: false # Optional, see https://docs.openshift.com/container-platform/latest/rest_api/operator_apis/network-operator-openshift-io-v1.html#spec-defaultnetwork-ovnkubernetesconfig-gatewayconfig
   odfStorage: # Optional
@@ -24,6 +24,14 @@ edgeCluster:
     enabled: true
     catalogSource: redhat-operators # Optional, defaults to redhat-operators
   reservedCpuSet: <reserved_set> # Optional, example: "0-1,32-33"  there should be no spaces. See https://docs.openshift.com/container-platform/latest/scalability_and_performance/sno-du-enabling-workload-partitioning-on-single-node-openshift.html
+  operators: # Optional, a list of operators to install
+    - name: my-operator
+      namespace: my-namespace
+      allNamespaces: false # Defaults to false
+      clusterMonitoring: false # Defaults to false
+      channel: stable # Can be omitted, will default to the default channel for the operator
+      catalogSource: redhat-operators # Defaults to redhat-operators
+      installPlanApproval: Automatic # Defaults to Automatic
 
 baseDomain: <cluster_domain>
 compute:

edge/roles/edge_install/tasks/install.yaml

@@ -49,17 +49,17 @@
   when:
     - cluster_ipv4 is defined
     - edgeCluster.relocatable is defined
-    - edgeCluster.relocatable.ipv4_subnet is defined
+    - edgeCluster.relocatable.ipv4Subnet is defined
   ansible.builtin.set_fact:
-    relocatable_ipv4_subnet: "{{ edgeCluster.relocatable.ipv4_subnet }}"
+    relocatable_ipv4_subnet: "{{ edgeCluster.relocatable.ipv4Subnet }}"
 
 - name: Set relocatable IPv6 subnet
   when:
     - cluster_ipv6 is defined
     - edgeCluster.relocatable is defined
-    - edgeCluster.relocatable.ipv6_subnet is defined
+    - edgeCluster.relocatable.ipv6Subnet is defined
   ansible.builtin.set_fact:
-    relocatable_ipv6_subnet: "{{ edgeCluster.relocatable.ipv6_subnet }}"
+    relocatable_ipv6_subnet: "{{ edgeCluster.relocatable.ipv6Subnet }}"
 
 # on a multi-node cluster this is determined based on the API and Ingress VIPs
 - name: Setup relocatable machine network

edge/roles/edge_post_install/tasks/main.yaml

@@ -98,6 +98,21 @@
           vars:
             catalog_source: "{{ edgeCluster.odfStorage.catalogSource | default('redhat-operators') }}"
 
+        - name: Install operator # noqa role-name[path]
+          loop: "{{ edgeCluster.operators | default([]) }}"
+          loop_control:
+            loop_var: operator
+          ansible.builtin.include_role:
+            name: "{{ playbook_dir }}/../common/roles/install_operator"
+          vars:
+            operator_name: "{{ operator.name }}"
+            operator_namespace: "{{ operator.namespace }}"
+            all_namespaces: "{{ operator.allNamespaces | default(false) }}"
+            cluster_monitoring: "{{ operator.clusterMonitoring | default(false) }}"
+            catalog_source: "{{ operator.catalogSource | default('redhat-operators') }}"
+            channel: "{{ operator.channel | default(omit) }}"
+            install_plan_approval: "{{ operator.installPlanApproval | default('Automatic') }}"
+
         - name: Auto approve CSRs
           when:
             - edgeCluster.autoApproveCSRs is defined