Bugfix for annotations & labels flags

[palourde]

Signed-off-by: Simon Plourde [email protected]

What is this change?

This PR fixes the --annotations & --labels flags with a workaround, since the actual problem in viper is still present: spf13/viper#608.

Why is this change necessary?

Closes #2357

Does your change need a Changelog entry?

Added.

Do you need clarification on anything?

Nope!

Were there any complications while making this change?

Nope!

Have you reviewed and updated the documentation for this change? Is new documentation required?

Nope!

How did you verify this change?

Manually tested:

Labels

$ sensu-agent start --labels foo=bar
$ sensuctl entity info whisky.local --format json | jq -r '.metadata.labels'
{
  "foo": "bar"
}

# Now use a config file with:
# labels:
#   baz: qux
$ sensu-agent start -c agent.yml
$ sensuctl entity info whisky.local --format json | jq -r '.metadata.labels'
{
  "baz": "qux"
}

# Now mix the config file with labels flag, which should have precedence over the config
$ sensu-agent start -c agent.yml --labels foo=bar
$ sensuctl entity info whisky.local --format json | jq -r '.metadata.labels'
{
  "foo": "bar"
}

Annotations

$ sensu-agent start --annotations foo=bar
$ sensuctl entity info whisky.local --format json | jq -r '.metadata.annotations'
{
  "foo": "bar"
}

# Now use a config file with:
# annotations:
#   baz: qux
$ sensu-agent start -c agent.yml
$ sensuctl entity info whisky.local --format json | jq -r '.metadata.annotations'
{
  "baz": "qux"
}

# Now mix the config file with annotations flag, which should have precedence over the config
$ sensu-agent start -c agent.yml --annotations foo=bar
$ sensuctl entity info whisky.local --format json | jq -r '.metadata.annotations'
{
  "foo": "bar"
}

[nikkictl]