Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Support multiple -git-path arguments #1297

Merged
merged 1 commit into from
Aug 22, 2018
Merged

Conversation

squaremo
Copy link
Member

The idea is to let people overlay bits of configuration by supplying more than one --git-path argument.

Much of the machinery for dealing with manifest files (and directories) already expected more than one path; but, it wasn't necessarily convenient to supply all of them in one go, so I've updated the Manifests interface and followed that through.

The git path appears in API results -- it's just an opaque string, though, so joining the now multiple paths and returning that should be fine.

Fixes #1267.

@squaremo
Copy link
Member Author

squaremo commented Aug 21, 2018

it's just an opaque string, though, so joining the now multiple paths and returning that should be fine.

This is not quite true; if you round-trip this, and supply comma-delimited paths as the value for --git-path, it won't work. You need to break it into multiple --git-path arguments.

EDIT: Nope, right the first time. I fooled myself by applying a weave cloud config, which of course uses the released daemon and thus doesn't understand this argument.

@squaremo squaremo requested a review from rndstr August 21, 2018 10:39
Copy link
Contributor

@rndstr rndstr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM!

daemon/images.go Outdated
return ids
}

// getUnlockedAutomatedServices returns all the resources that are

This comment was marked as abuse.

This comment was marked as abuse.

The idea is to let people overlay bits of configuration by supplying
more than one `--git-path` argument.

Much of the machinery for dealing with manifest files (and
directories) already expected more than one path; but, it wasn't
necessarily convenient to supply all of them in one go, so I've
updated the Manifests interface and followed that through.

The git path appears in API results -- it's just an opaque string,
though, so joining the now multiple paths and returning that should be
fine.
@squaremo squaremo force-pushed the issue/1267-multiple-paths branch from 5f2de14 to 8f09ae6 Compare August 22, 2018 13:55
@squaremo
Copy link
Member Author

Rebassed and cliffhanger comment resolved.

@squaremo squaremo merged commit 670fce0 into master Aug 22, 2018
@squaremo squaremo deleted the issue/1267-multiple-paths branch August 22, 2018 14:06
@stephenmoloney
Copy link
Contributor

stephenmoloney commented Sep 21, 2018

Just wondering:

  1. if the docs show how this works ?

  2. If there is an open issue to support something similar for the helmOperator ? (found the relevant issue here

@squaremo
Copy link
Member Author

  1. if the docs show how this works ?

Possibly only the usage message :-S

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants