Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 0 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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)"
51 changes: 0 additions & 51 deletions ansible/check_kubevirt_worker.yml

This file was deleted.

111 changes: 0 additions & 111 deletions ansible/deploy_kubevirt_worker.yml

This file was deleted.

3 changes: 3 additions & 0 deletions overrides/values-console-plugins.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
ensureConsolePlugins:
- odf-console
2 changes: 2 additions & 0 deletions overrides/values-egv-vms.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
waitForMetalNode: false

vms:
kiosk:
count: 2
Expand Down
2 changes: 1 addition & 1 deletion pattern-metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions scripts/check_kubevirt_worker.sh

This file was deleted.

4 changes: 0 additions & 4 deletions scripts/deploy_kubevirt_worker.sh

This file was deleted.

14 changes: 9 additions & 5 deletions values-hub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -78,7 +86,6 @@ clusterGroup:
- apiGroups:
- '*'
resources:
- machinesets
- persistentvolumeclaims
- datavolumes
- dataimportcrons
Expand All @@ -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: {}
Loading