From 69fefba69f60e1d559c3633e35152a6c15fb0726 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Wed, 25 Mar 2020 10:47:20 -0700
Subject: [PATCH] Remove label filtering from initinfra
Now that initinfra leverages a specific entrypoint using
the cluster type, and the Config.Initinfra subdirectory
there is no need to also require all documents be labeled
with a specific label. That would be redundant.
Change-Id: I41ff1ea01d5f04d7d987d2308636adfff48016ea
---
pkg/cluster/initinfra/infra.go | 5 ++---
pkg/document/selectors.go | 5 -----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/pkg/cluster/initinfra/infra.go b/pkg/cluster/initinfra/infra.go
index 252bac62f..7cbc6c429 100644
--- a/pkg/cluster/initinfra/infra.go
+++ b/pkg/cluster/initinfra/infra.go
@@ -65,9 +65,8 @@ func (infra *Infra) Deploy() error {
return err
}
- // Returns documents marked with initinfra phase label
- selector := document.NewInintInfraSelector()
- docs, err := b.Select(selector)
+ // Returns all documents for this phase
+ docs, err := b.GetAllDocuments()
if err != nil {
return err
}
diff --git a/pkg/document/selectors.go b/pkg/document/selectors.go
index e41ca2cb5..42d9e4c93 100644
--- a/pkg/document/selectors.go
+++ b/pkg/document/selectors.go
@@ -98,8 +98,3 @@ func NewEphemeralNetworkDataSelector(bmhDoc Document) (Selector, error) {
return selector, nil
}
-
-// NewInintInfraSelector returns selector to get deployable documents marked with initinfra label
-func NewInintInfraSelector() Selector {
- return NewSelector().ByLabel(InitInfraSelector)
-}