airship/airshipctl
Code Issues Proposed changes

Allow filtering of config bundle

Browse Source 
Change-Id: I4f2381bf775d202851fa1d6c3d65c2d1f1043ead
This commit is contained in:
Kostiantyn Kalynovskyi 2021-02-22 17:42:08 +00:00
parent 7e2e6975ec
commit 5e76f32712
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/phase/render.go
View File

@ -67,9 +67,17 @@ func (fo *RenderCommand) RunE(cfgFactory config.Factory, out io.Writer) error {
if err != nil { if err != nil {
return err return err
} }
groupVersion := strings.Split(fo.APIVersion, "/")
group := ""
version := groupVersion[0]
if len(groupVersion) > 1 {
group = groupVersion[0]
version = strings.Join(groupVersion[1:], "/")
}
sel := document.NewSelector().ByLabel(fo.Label).ByAnnotation(fo.Annotation).ByGvk(group, version, fo.Kind)
if fo.Source == RenderSourceConfig { if fo.Source == RenderSourceConfig {
return renderConfigBundle(out, helper) return renderConfigBundle(out, helper, sel)
} }
client := NewClient(helper) client := NewClient(helper)
@ -78,15 +86,6 @@ func (fo *RenderCommand) RunE(cfgFactory config.Factory, out io.Writer) error {
return err return err
} }
groupVersion := strings.Split(fo.APIVersion, "/")
group := ""
version := groupVersion[0]
if len(groupVersion) > 1 {
group = groupVersion[0]
version = strings.Join(groupVersion[1:], "/")
}
sel := document.NewSelector().ByLabel(fo.Label).ByAnnotation(fo.Annotation).ByGvk(group, version, fo.Kind)
var executorRender bool var executorRender bool
if fo.Source == RenderSourceExecutor { if fo.Source == RenderSourceExecutor {
executorRender = true executorRender = true
@ -94,11 +93,16 @@ func (fo *RenderCommand) RunE(cfgFactory config.Factory, out io.Writer) error {
return phase.Render(out, executorRender, ifc.RenderOptions{FilterSelector: sel}) return phase.Render(out, executorRender, ifc.RenderOptions{FilterSelector: sel})
} }
func renderConfigBundle(out io.Writer, h ifc.Helper) error { func renderConfigBundle(out io.Writer, h ifc.Helper, sel document.Selector) error {
bundle, err := document.NewBundleByPath(h.PhaseBundleRoot()) bundle, err := document.NewBundleByPath(h.PhaseBundleRoot())
if err != nil { if err != nil {
return err return err
} }
bundle, err = bundle.SelectBundle(sel)
if err != nil {
return err
}
return bundle.Write(out) return bundle.Write(out)
} }