Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix environment with env_file bug #1020

Merged
merged 1 commit into from
Jul 10, 2018
Merged

Fix environment with env_file bug #1020

merged 1 commit into from
Jul 10, 2018

Conversation

hangyan
Copy link
Contributor

@hangyan hangyan commented May 26, 2018 •
edited
Loading

Fix #1013

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 26, 2018
@hangyan
Copy link
Contributor Author

hangyan commented Jul 5, 2018 •
edited
Loading

@cdrage Do you have time to review #1020 #1007 for me? Not in a rush, but i can only continue to work after these PRs merged

@cdrage
Copy link
Member

cdrage commented Jul 5, 2018

@hangyan Sorry, been busy with other projects. I'll review them now! 👍

cdrage
cdrage approved these changes Jul 5, 2018
View reviewed changes
Copy link
Member

@cdrage cdrage left a comment

Choose a reason for hiding this comment

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

Fix the small added comment, other than that, this LGTM (good job on tests too). After you fix that commented line, LGTM.

pkg/loader/compose/v3.go Outdated
@@ -235,7 +235,7 @@ func dockerComposeToKomposeMapping(composeObject *types.Config) (kobject.Kompose
for _, composeServiceConfig := range composeObject.Services {

// Standard import
// No need to modify before importation
// No need to modify `before importation
Copy link
Member

Choose a reason for hiding this comment

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

remove random `

@cdrage
Copy link
Member

cdrage commented Jul 5, 2018

Feel free to merge after the fix

@hangyan hangyan merged commit c0360e0 into kubernetes:master Jul 10, 2018
@hangyan hangyan deleted the fix/env-file-env branch December 27, 2019 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdrage cdrage cdrage approved these changes

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hangyan @cdrage @k8s-ci-robot