Deduplicate airshipctl manifest networking

Deduplicate networking definitions inside of airshipctl functions,
and make the values driveable via a catalogue.

Changes:
* Removed BMO patches at site level; drive through catalogue instead.
* Added separate entrypoints for ephemeral & target site-level.
  catalogue/networking overrides. Ephemeral's kustomizes target's.
* Generalized the commonHostNetworking catalogue into a section in the
  overall networking catalogue.
* Cleaned up catalogue use in general.
* Got rid of some ill-formed Type-level phase definition.
  We should go back soon and define proper Type-level phases.

Change-Id: Iff96ccdcf7ebde4ae55e2b1a9d25dd1cdca0d2c8
Relates-To: https://github.com/airshipit/airshipctl/issues/315
This commit is contained in:
Matt McEuen
2020-09-02 07:47:00 -05:00
parent 113628336f
commit 910d296f6b
45 changed files with 345 additions and 72 deletions

View File

@@ -1,11 +0,0 @@
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3
kind: Metal3MachineTemplate
metadata:
name: cluster-controlplane
spec:
template:
spec:
image:
url: http://10.23.24.1:8099/target-image.qcow2
checksum: http://10.23.24.1:8099/target-image.qcow2.md5sum

View File

@@ -3,7 +3,7 @@ kind: Kustomization
resources:
- ../../../../../function/hostgenerator-m3
- ../../../../../function/hardwareprofile-example
- ../../../shared/catalogues/
- ../../catalogues
- host-generation.yaml
transformers:

View File

@@ -4,11 +4,11 @@ resources:
# TODO (dukov) It's recocommended to upload BareMetalHost objects separately
# otherwise nodes will hang in 'registering' state for quite a long time
- nodes
- ../../../../function/airshipctl-catalogues
- ../../../../function/k8scontrol
patchesStrategicMerge:
- control-machine-template-patch.yaml
- ../catalogues
commonLabels:
airshipit.org/stage: initinfra
transformers:
- ../../../../function/k8scontrol/replacements