Remove HyperShift edge install (#44)

* Remove HyperShift edge install

* un-used

* more

* update readme

* always install gitops

Author: loganmc10

README.md

@@ -1,11 +1,7 @@
 ## Overview
 The purpose of this project is to ease the setup of a provisioning cluster, as well as ease the process of installing an edge cluster.
 
-Standard Install:
-* After the installation of an edge cluster is complete, the edge cluster does not depend on the provisioning cluster for anything. The provisioning cluster is simply an installer.
-
-HyperShift Install:
-* The provisioning cluster hosts the control plane for the edge cluster. The edge cluster has no control plane nodes.
+After the installation of an edge cluster is complete, the edge cluster does not depend on the provisioning cluster for anything. The provisioning cluster is simply an installer.
 ## Prerequisites
 * Provisioning Cluster:
   * Pre-existing OpenShift cluster (SNO, compact, or standard).

SALES_PITCH.md

@@ -8,7 +8,6 @@
 * Option to auto approve CSRs (for edge clusters that may be offline for extended periods).
 * Re-uses install-config.yaml (IPI install config) for configuration.
 * Easy to read Ansible playbook, what you see is what you get.
-* Can deploy HyperShift (Hosted Control Plane) clusters.
 
 ## How do I do GitOps?
 The edge cluster install config files can be committed to a Git repo. You could then configure a CI/CD pipeline (GitHub Actions, Gitlab CI, etc) to execute the Ansible playbook using those files as inputs whenever a change is committed to the repo.

edge/README.md

@@ -1,7 +1,7 @@
 # Purpose
-This playbook installs an edge cluster. You should already have a provisioning cluster configured. See [HYPERSHIFT.md](docs/HYPERSHIFT.md) for information on setting up a cluster using Hosted Control Planes.
+This playbook installs an edge cluster. You should already have a provisioning cluster configured.
 # Usage
-Example [install config](https://docs.openshift.com/container-platform/latest/installing/installing_bare_metal_ipi/ipi-install-installation-workflow.html#additional-resources_config) files are provided in ```install-config-sno-example.yaml```, ```install-config-standard-example.yaml``` and ```install-config-hypershift-example.yaml```.
+Example [install config](https://docs.openshift.com/container-platform/latest/installing/installing_bare_metal_ipi/ipi-install-installation-workflow.html#additional-resources_config) files are provided in ```install-config-sno-example.yaml``` and ```install-config-standard-example.yaml```.
 
 The install config uses the same format as an IPI install, except that it also requires you to set clusterImageSet. The example shows how to point the clusterImageSet to a mirror registry.
 
@@ -17,7 +17,7 @@ Finally, you can set a path to a folder containing scripts to be executed after
 ```
 postInstallScriptsFolder: post_scripts
 ```
-Other options are documented in ```install-config-sno-example.yaml```, ```install-config-standard-example.yaml``` and ```install-config-hypershift-example.yaml```.
+Other options are documented in ```install-config-sno-example.yaml``` and ```install-config-standard-example.yaml```.
 
 ---
 To run the playbook:

edge/docs/HYPERSHIFT.md

@@ -1,7 +1,5 @@
 install_overrides: {}
-hypershift_configuration: {}
 worker_count: 0
 interface_number: 3
 relocatable_ipv4_subnet: "192.168.7.0/24"
 relocatable_ipv6_subnet: "fd04::/64"
-hypershift: false

edge/install-config-hypershift-example.yaml

@@ -28,13 +28,6 @@
       register: k8s_result
       until: k8s_result is not failed
 
-    - name: Enable HyperShift
-      when:
-        - edgeCluster.hypershift is defined
-        - edgeCluster.hypershift.enabled
-      ansible.builtin.set_fact:
-        hypershift: true
-
     # these manifests are applied early in the install process, often they are MachineConfigs, applying them early helps avoid extra reboots
     - name: Create user-defined manifest config maps
       when: edgeCluster.installManifestsFolder is defined
@@ -63,13 +56,8 @@
       when: edgeCluster.reservedCpuSet is defined
       ansible.builtin.include_tasks: workload_partitioning.yaml
 
-    - name: Standard cluster install
-      when: not hypershift
-      ansible.builtin.include_tasks: standard.yaml
-
-    - name: HyperShift install
-      when: hypershift
-      ansible.builtin.include_tasks: hypershift.yaml
+    - name: Cluster install
+      ansible.builtin.include_tasks: install.yaml
   rescue:
     - name: Delete ClusterImageSet
       kubernetes.core.k8s:

edge/roles/edge_install/defaults/main.yaml

@@ -4,9 +4,5 @@ metadata:
   name: "manifest-{{ idx }}"
   namespace: "{{ metadata.name }}"
 data:
-{% if not hypershift %}
   {{ item | basename }}: |
-{% else %}
-  config: |
-{% endif %}
     {{ lookup('ansible.builtin.file', lookup('ansible.builtin.vars', 'item')) | indent(4) }}