add prompt about KUBE_REPO_PREFIX #3597
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
k8s-ci-robot
added
the
cncf-cla: yes
chenopis
suggested changes
May 2, 2017
docs/admin/kubeadm.md
Outdated
| @@ -388,6 +388,15 @@ configuration file. | |||
|
|
|||
| If `KUBE_KUBERNETES_DIR` is specified, you may need to rewrite the arguments of the kubelet. | |||
| (e.g. --kubeconfig, --pod-manifest-path) | |||
| If `KUBE_REPO_PREFIX` is specified, you may need to set --pod-infra-container-image which is the pause image. | |||
| ```bash | |||
There was a problem hiding this comment.
Put an extra newline before the bash commands so that there is some space around it. Thx
|
@xilabao We just fixed a Travis issue, so if you update the branch, the Travis CI check should now work. Thx |
xilabao
force-pushed
the
patch-15
branch
3 times, most recently
from
29b95a5 to
eb10c86
Compare
|
Done. PTAL |
chenopis
approved these changes
May 3, 2017
xilabao
force-pushed
the
patch-15
branch
2 times, most recently
from
7c918a9 to
1506815
Compare
|
rebased. |
|
ping @chenopis |
|
I just need a quick tech review on this. @luxas can you take a look? |
luxas
reviewed
May 29, 2017
docs/admin/kubeadm.md
Outdated
| @@ -389,6 +389,17 @@ configuration file. | |||
| If `KUBE_KUBERNETES_DIR` is specified, you may need to rewrite the arguments of the kubelet. | |||
| (e.g. --kubeconfig, --pod-manifest-path) | |||
|
|
|||
| If `KUBE_REPO_PREFIX` is specified, you may need to set --pod-infra-container-image which is the pause image. | |||
There was a problem hiding this comment.
suggest:
If `KUBE_REPO_PREFIX` is specified, you may need to set the kubelet flag `--pod-infra-container-image` which specifies which pause image to use.
Defaults to `gcr.io/google_containers/pause-${ARCH}:3.0` where `${ARCH}` can be one of `amd64`, `arm`, `arm64`, `ppc64le` or `s390x`
chenopis
added a commit
that referenced
this pull request
May 31, 2017
…hub.io into release-1.7 * 'master' of https://github.com/kubernetes/kubernetes.github.io: Fix log rotation description in the logging doc (#3918) Add colon to #3897 add prompt about KUBE_REPO_PREFIX (#3597) Warn against managing ReplicaSets owned by Deployments Update small typo in components page (#3930) change the service name to pod ip (#3926)
chenopis
added a commit
that referenced
this pull request
May 31, 2017
…hub.io into release-1.6 * 'master' of https://github.com/kubernetes/kubernetes.github.io: networking.md: Add reference to the Cilium network plugin Fix typo in cluster api docs [Kubeadm] bugfix in the index listing Fix log rotation description in the logging doc (#3918) Add colon to #3897 add prompt about KUBE_REPO_PREFIX (#3597) Warn against managing ReplicaSets owned by Deployments Update small typo in components page (#3930) change the service name to pod ip (#3926)
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.
ref to kubernetes/kubeadm#257
This change is