Closed chungers closed 6 years ago
Merging #829 into master will not change coverage. The diff coverage is
n/a
.
@@ Coverage Diff @@
## master #829 +/- ##
=======================================
Coverage 47.84% 47.84%
=======================================
Files 89 89
Lines 7945 7945
=======================================
Hits 3801 3801
Misses 3782 3782
Partials 362 362
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact)
,ø = not affected
,? = missing data
Powered by Codecov. Last update 07d7dbe...ce421c6. Read the comment docs.
This PR tries to clear up some confusion raised in #826 and clean up the Options processing for the enrollment controller:
pkg/controller/enrollment.DefaultOptions
)DefaultOptions
is referenced inpkg/run/v0/enrollment/enrollment.go
as the base value for Options used to parse the plugins.json config. If environment variables are set for theinfrakit plugin start
process, the values of the environment variables will override the default values set in code of the package.enrollment commit -y <yml>
CLI. This spec can further container anoptions
block. The values here will override the default values. There is a bug where theupdateSpecs
function did not honor the default by decoding the input options into an uninitializedenrollment.Options{}
. This is now fixed by decoding the yml input into a copy of the Options that the plugin initialized with.Signed-off-by: David Chung david.chung@docker.com