From 5d25216c2f47338485b05679763303adcb6223ba Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Tue, 29 Jun 2021 19:00:24 -0600 Subject: [PATCH] Add missing and remove parent labels for subcluster workers Change-Id: Iaeb52c5623ba00ce6c17bb17efab0fcef46d1bf0 Signed-off-by: Andrii Ostapenko --- .../lma/workers/patches/metal3machinetemplate.yaml | 1 + .../wordpress/workers/patches/metal3machinetemplate.yaml | 1 + manifests/type/sub-cluster/workers/kustomization.yaml | 5 +++++ manifests/type/sub-cluster/workers/m3mt-delete-labels.yaml | 2 ++ 4 files changed, 9 insertions(+) create mode 100644 manifests/type/sub-cluster/workers/m3mt-delete-labels.yaml diff --git a/manifests/type/multi-tenant/sub-clusters/lma/workers/patches/metal3machinetemplate.yaml b/manifests/type/multi-tenant/sub-clusters/lma/workers/patches/metal3machinetemplate.yaml index b3cf2c75f..61fbe3d9d 100644 --- a/manifests/type/multi-tenant/sub-clusters/lma/workers/patches/metal3machinetemplate.yaml +++ b/manifests/type/multi-tenant/sub-clusters/lma/workers/patches/metal3machinetemplate.yaml @@ -10,3 +10,4 @@ spec: matchLabels: sip.airshipit.org/cluster-namespace: lma-infra sip.airshipit.org/cluster-name: lma + sip.airshipit.org/node-type: Worker diff --git a/manifests/type/multi-tenant/sub-clusters/wordpress/workers/patches/metal3machinetemplate.yaml b/manifests/type/multi-tenant/sub-clusters/wordpress/workers/patches/metal3machinetemplate.yaml index 15f250163..9e7a8d95b 100644 --- a/manifests/type/multi-tenant/sub-clusters/wordpress/workers/patches/metal3machinetemplate.yaml +++ b/manifests/type/multi-tenant/sub-clusters/wordpress/workers/patches/metal3machinetemplate.yaml @@ -9,3 +9,4 @@ spec: matchLabels: sip.airshipit.org/cluster-namespace: wordpress-infra sip.airshipit.org/cluster-name: wordpress + sip.airshipit.org/node-type: Worker diff --git a/manifests/type/sub-cluster/workers/kustomization.yaml b/manifests/type/sub-cluster/workers/kustomization.yaml index a50527bd2..a47f3bf62 100644 --- a/manifests/type/sub-cluster/workers/kustomization.yaml +++ b/manifests/type/sub-cluster/workers/kustomization.yaml @@ -3,5 +3,10 @@ kind: Kustomization resources: - ../../../../../airshipctl/manifests/function/workers-capm3 +patches: +- target: + kind: Metal3MachineTemplate + path: m3mt-delete-labels.yaml + # NOTE: CAPI objects must be in the same namespace in which ViNO applies BMHs. namespace: vino-system diff --git a/manifests/type/sub-cluster/workers/m3mt-delete-labels.yaml b/manifests/type/sub-cluster/workers/m3mt-delete-labels.yaml new file mode 100644 index 000000000..7c7de7030 --- /dev/null +++ b/manifests/type/sub-cluster/workers/m3mt-delete-labels.yaml @@ -0,0 +1,2 @@ +- op: remove + path: "/spec/template/spec/hostSelector"