airship/airshipctl
Code Issues Proposed changes

Remove label filtering from initinfra

Browse Source 
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
This commit is contained in:
Alan Meadows 2020-03-25 10:47:20 -07:00
parent 66a1332ce9
commit 69fefba69f
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cluster/initinfra/infra.go
View File

@ -65,9 +65,8 @@ func (infra *Infra) Deploy() error {
return err return err
} }
// Returns documents marked with initinfra phase label // Returns all documents for this phase
selector := document.NewInintInfraSelector() docs, err := b.GetAllDocuments()
docs, err := b.Select(selector)
if err != nil { if err != nil {
return err return err
} }

5
pkg/document/selectors.go
View File

@ -98,8 +98,3 @@ func NewEphemeralNetworkDataSelector(bmhDoc Document) (Selector, error) {
return selector, nil return selector, nil
} }
// NewInintInfraSelector returns selector to get deployable documents marked with initinfra label
func NewInintInfraSelector() Selector {
return NewSelector().ByLabel(InitInfraSelector)
}