grim/convey

Add support for multiple selector labels to the k8s commands

2019-08-02, Gary Kramlich
ca2b01050753
Parents 37db7a19923f
Children c9cbaba67219
Add support for multiple selector labels to the k8s commands
2 files changed, 10 insertions(+), 5 deletions(-)
  • +1 -1
    kubectl/README.md
  • +9 -4
    kubectl/command.go
    • --- a/kubectl/README.md Fri Aug 02 03:19:39 2019 -0500
    +++ b/kubectl/README.md Fri Aug 02 20:26:06 2019 -0500
    @@ -20,7 +20,7 @@
    | context | | | The kubernetes context to use. |
    | files | Yes | | The list of manifest files to apply. |
    | namespace | | | The kubernetes namespace to use. |
    -| selector | | | The selector to use. |
    +| selector | | | The list of selectors to use. |
    | engine | | | The template engine to use. |
    ### Example
    --- a/kubectl/command.go Fri Aug 02 03:19:39 2019 -0500
    +++ b/kubectl/command.go Fri Aug 02 20:26:06 2019 -0500
    @@ -35,7 +35,7 @@
    Context string `yaml:"context"`
    Files yaml.StringOrSlice `yaml:"files"`
    Namespace string `yaml:"namespace"`
    - Selector string `yaml:"selector"`
    + Selector yaml.StringOrSlice `yaml:"selector"`
    Engine string `yaml:"engine"`
    }
    @@ -153,9 +153,14 @@
    cmd.Append("-n", namespace)
    }
    - selector := fullEnv.Map(c.Selector)
    - if selector != "" {
    - cmd.Append("-l", selector)
    + selectors, err := fullEnv.MapSlice(c.Selector)
    + if err != nil {
    + return err
    + }
    + for _, selector := range selectors {
    + if selector != "" {
    + cmd.Append("-l", selector)
    + }
    }
    // create our scratch directory