Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Ijaz Ahmad
ksonnet
Commits
2b4acaf2
Unverified
Commit
2b4acaf2
authored
Mar 08, 2018
by
Bryan Liles
Committed by
GitHub
Mar 08, 2018
Browse files
Merge pull request #349 from bryanl/bug-use-env-params
bug: env used incorrent params for rendering
parents
3b225dd0
e3775267
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
cmd/root.go
cmd/root.go
+3
-4
No files found.
cmd/root.go
View file @
2b4acaf2
...
...
@@ -322,7 +322,7 @@ func (te *cmdObjExpander) Expand() ([]*unstructured.Unstructured, error) {
}
envPath
,
vendorPath
:=
manager
.
LibPaths
()
libPath
,
mainPath
,
_
,
err
:=
manager
.
EnvPaths
(
te
.
config
.
env
)
libPath
,
mainPath
,
paramsPath
,
err
:=
manager
.
EnvPaths
(
te
.
config
.
env
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -350,12 +350,11 @@ func (te *cmdObjExpander) Expand() ([]*unstructured.Unstructured, error) {
baseCodes
:=
expander
.
ExtCodes
params
:=
importParams
(
paramsPath
)
slUnstructured
:=
make
([]
*
unstructured
.
Unstructured
,
0
)
for
ns
,
componentPaths
:=
range
namespacedComponentPaths
{
paramsPath
:=
ns
.
ParamsPath
()
params
:=
importParams
(
string
(
paramsPath
))
baseObj
,
err
:=
constructBaseObj
(
componentPaths
,
te
.
config
.
components
)
if
err
!=
nil
{
return
nil
,
errors
.
Wrap
(
err
,
"construct base object"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment