feature: remove InstanceInfo from container env #1738
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #1738 +/- ##
==========================================
- Coverage 14.14% 13.49% -0.65%
==========================================
Files 281 281
Lines 56755 58270 +1515
==========================================
- Hits 8027 7864 -163
- Misses 47805 49476 +1671
- Partials 923 930 +7
|
Ace-Tang
reviewed
Jul 16, 2018
| func updateContainerEnv(inputRawEnv []string, baseFs string) error { | ||
| var ( | ||
| envPropertiesPath = path.Join(baseFs, containerInstanceInfo) | ||
| envShPath = path.Join(baseFs, pouchEnvFile) |
There was a problem hiding this comment.
Where do we create envShPath and envShDir, are they create in rich-mode with runc?
There was a problem hiding this comment.
The file is located in the image's rootfs.
In addition, the file is in the base image.
There was a problem hiding this comment.
do you mean we not create the file, but only judge the file
Ace-Tang
reviewed
Jul 17, 2018
daemon/mgr/container_envs.go
Outdated
| if _, err := os.Stat(envPropertiesPath); err != nil { | ||
| //if etc/instanceInfo is not exist, it's unnecessary to update that file. | ||
| return nil | ||
| } | ||
| if _, err := os.Stat(envShPath); err != nil { | ||
| return fmt.Errorf("failed to stat container's env file /etc/profile.d/pouchenv.sh: %v", err) |
There was a problem hiding this comment.
if envShPath is not exist, we should return nil, as you said, we just judge the file i exist.
There was a problem hiding this comment.
Using
if _, err := os.Stat(envShPath); err != nil {
logrus.Warnf("failed to stat container's env file /etc/profile.d/pouchenv.sh: %v", err)
return nil
}
Signed-off-by: Allen Sun <allensun.shl@alibaba-inc.com>
allencloud
force-pushed
the
rm-instancinfo
branch
from
14fa23a
to
3d3dc95
Compare
|
LGTM |
pouchrobot
added
the
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Allen Sun allensun.shl@alibaba-inc.com
Ⅰ. Describe what this PR did
remove InstanceInfo from container env since this part could be added in the plugin.
And this block of code is for special use, not so general.
@Ace-Tang
Ⅱ. Does this pull request fix one issue?
none
Ⅲ. Describe how you did it
none
Ⅳ. Describe how to verify it
none
Ⅴ. Special notes for reviews
none