Cherry pick จาก rke-0.1.10-rc2 #7
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
1. rancher/types (cherry picked from commit dffc2b944371387775367ccb54bad0e93ebd3472) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com> Conflicts: vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go
1. Support to configure Flannel as "host-gw" backend 2. Define the network component yaml and ingress controller yaml only schedule to non-Windows node 3. Support to configure Docker container's port publishing (cherry picked from commit bcb6e13618f03e8b57957d89cde3232b937eeb99) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 9c172c40b2b46f50ff045dac0ffa102883b7cb09) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com> Conflicts: docker/docker.go
(cherry picked from commit 4b3068d6734e03f1d41249367b3eba22ecb8c37b) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 8f47078988da92b57df6e8abe9c27a2ca6b74f43) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit d451683abb6a1c2d107353e420c8814e12bfa44a) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 6b141295aaa36673397cc264263bccb04a3cfb5d) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 6b6a7803a7abe995aabaf1a31a0056b2ad4e2be8) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 1f6e254f6698a26751d2948504d915348d6fda0a) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com> Conflicts: vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go
(cherry picked from commit cb5067207173605072be62c0f2d2f77e92a16a6d) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 3375a2f2e962527af54d3323b401d0489893a01f) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 3c76263096e2cb9a2947b78587a0cc037952cd64) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit f314d1dc96cd31c1020c49c7fb4a9568d30bcd44) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 8a62703b3404a919ed50bea6c3b85b1ca929c175) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 453ddd521310adb894c2fb203c093c8ecc9f1c8e) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
(cherry picked from commit 67448c38c672c81d20004d5532fc0db464189d30) Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>
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.
Resolve conflicts หลายจุด โดยเฉพาะการ update ให้ Kube 1.11.2 กลายเป็น default ของ RKE 0.1.10