bugfix: make infra image configurable #1159
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
allencloud
reviewed
Apr 18, 2018
main.go
Outdated
| @@ -78,6 +78,7 @@ func setupFlags(cmd *cobra.Command) { | |||
| flagSet.StringVar(&cfg.CriConfig.Listen, "listen-cri", "/var/run/pouchcri.sock", "Specify listening address of CRI") | |||
| flagSet.StringVar(&cfg.CriConfig.NetworkPluginBinDir, "cni-bin-dir", "/opt/cni/bin", "The directory for putting cni plugin binaries.") | |||
| flagSet.StringVar(&cfg.CriConfig.NetworkPluginConfDir, "cni-conf-dir", "/etc/cni/net.d", "The directory for putting cni plugin configuration files.") | |||
| flagSet.StringVar(&cfg.CriConfig.SandboxImage, "sandbox-image", "k8s.gcr.io/pause-amd64:3.0", "The image used by sandbox container.") | |||
There was a problem hiding this comment.
Shall we change the default image to a better image which is easier to access in China?
I think that would be more user-friendly.
Codecov Report
@@ Coverage Diff @@
## master #1159 +/- ##
=========================================
- Coverage 16.06% 15.57% -0.5%
=========================================
Files 173 172 -1
Lines 9930 9781 -149
=========================================
- Hits 1595 1523 -72
+ Misses 8218 8148 -70
+ Partials 117 110 -7
|
Signed-off-by: YaoZengzeng <[email protected]>
YaoZengzeng
force-pushed
the
pod-image-configurable
branch
from
0f5b3fe to
46dc486
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: YaoZengzeng [email protected]
Ⅰ. Describe what this PR did
If we want to use other images of infra container other than default "k8s.gcr.io/pause-amd64:3.0",
we should specify pouchd's configuration like "pouchd --enable-cri --sandbox-image XXX"
Ⅱ. Does this pull request fix one issue?
fixes #1158
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews