Merge pull request #145 from mhjacks/require_metal_nodes

Require metal nodes

Author: mhjacks

Changes.md

@@ -75,3 +75,5 @@
 * Switch to patternizer and remove common
 * Stop deploying storagesystem as ODF does not need it anymore (as of 4.18/4.20)
 * Update Ansible linter
+* Require metal nodes as workers - remove code to create machinesets
+* Add ODF console plugin

Makefile

@@ -1,10 +1 @@
 include Makefile-common
-
-.PHONY: default
-default: help
-
-deploy-kubevirt-worker: ## Deploy the metal node worker (from workstation). This is normally done in-cluster
-	./scripts/deploy_kubevirt_worker.sh
-
-configure-controller: ## Configure AAP operator (from workstation). This is normally done in-cluster
-	ansible-playbook ./scripts/ansible_load_controller.sh -e "aeg_project_repo=$(TARGET_REPO) aeg_project_branch=$(TARGET_BRANCH)"

ansible/check_kubevirt_worker.yml

@@ -0,0 +1,3 @@
+---
+ensureConsolePlugins:
+  - odf-console

ansible/deploy_kubevirt_worker.yml

@@ -1,4 +1,6 @@
 ---
+waitForMetalNode: false
+
 vms:
   kiosk:
     count: 2

overrides/values-console-plugins.yaml

@@ -23,7 +23,7 @@ requirements:
       platform:
         aws:
           replicas: 3
-          type: m5.4xlarge
+          type: m5.metal
 
 # Loosely defined extra features like hypershift support, non-openshift
 # kubernetes support, spoke support

overrides/values-egv-vms.yaml

@@ -61,6 +61,14 @@ clusterGroup:
       chartVersion: 0.2.*
       extraValueFiles:
         - $patternref/overrides/values-odf-chart.yaml
+    ensure-openshift-console-plugins:
+      name: ensure-openshift-console-plugins
+      namespace: openshift-console
+      project: hub
+      chart: ensure-openshift-console-plugins
+      chartVersion: 0.1.*
+      extraValueFiles:
+        - '$patternref/overrides/values-console-plugins.yaml'
     openshift-cnv:
       name: openshift-cnv
       namespace: openshift-cnv
@@ -78,7 +86,6 @@ clusterGroup:
       - apiGroups:
           - '*'
         resources:
-          - machinesets
           - persistentvolumeclaims
           - datavolumes
           - dataimportcrons
@@ -94,10 +101,7 @@ clusterGroup:
           - list
           - watch
     jobs:
-      - name: deploy-kubevirt-worker
-        playbook: ansible/deploy_kubevirt_worker.yml
-        verbosity: -vvv
       - name: clean-golden-images
         playbook: ansible/odf_fix_dataimportcrons.yml
         verbosity: -vvv
-  managedClusterGroups: []
+  managedClusterGroups: {}