WIP: feat(rebase): Rebase upstream kubespray release-2.14 branch #148
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
* fix flake8 errors in Kubespray CI - tox-inventory-builder * fix flake8 errors in Kubespray CI - tox-inventory-builder * Invalidate CRI-O kubic repo's cache Signed-off-by: Victor Morales <[email protected]> * add support to configure pkg install retries and use in CI job tf-ovh_ubuntu18-calico (due to it failing often) * Switch Calico and Cilium image repos to Quay.io Co-authored-by: Victor Morales <[email protected]> Co-authored-by: Barry Melbourne <[email protected]> Conflicts: roles/download/defaults/main.yml * up vagrant box to fedora/33-cloud-base in cri-o molecule tests (cherry picked from commit 06ec539) * add Google proxy-mirror-cache for docker hub to CI tests (cherry picked from commit d739a6b) * containerd docker hub registry mirror support * containerd docker hub registry mirror support * add docs * fix typo * fix yamllint * fix indent in sample and ansible-playbook param in testcases_run * fix md * mv common vars to tests/common/_docker_hub_registry_mirror.yml * checkout vars to upgrade tests (cherry picked from commit 4a8a52b) * Exclude .git/ from shellcheck If a branch name contains '.sh', current shellcheck checks the branch file under .git/ and outputs error because the format is not shell script one. This makes shellcheck exclude files under .git/ to avoid this issue. (cherry picked from commit e2467d8) Co-authored-by: Hans Feldt <[email protected]> Co-authored-by: Sergey <[email protected]> Co-authored-by: Kenichi Omichi <[email protected]>
RedHat 8.3 merged nf_conntrack_ipv4 in nf_conntrack but still advertise 4.18 so just try to modprobe and decide depending on the success Also nf_conntrack is a dependency of ip_vs, so no need to care about it Signed-off-by: Etienne Champetier <[email protected]> (cherry picked from commit 00e0f3b)
This new version uses the same base image as kube-proxy (k8s.gcr.io/build-image/debian-iptables) This allow to automatically pick iptables-legacy or iptables-nft, and be compatible with RHEL/CentOS 8 kubernetes/dns#367 Signed-off-by: Etienne Champetier <[email protected]> (cherry picked from commit e909f84)
This fixes the Containerd + EL8 case that was missed in 7d1ab33 On CentOS 8 with proxy ansible render inline `proxy` and `module_hotfixes` options. For example: ``` proxy=http://127.0.0.1:3128module_hotfixes=True ``` But expected result: ``` proxy=http://127.0.0.1:3128 module_hotfixes=True ``` Signed-off-by: Etienne Champetier <[email protected]> (cherry picked from commit 03f316e)
…s#7209) * cherry-pick bump crio version to 1.19 (kubernetes-sigs#6758) cherry-pick modifications: * keep default to 1.17 as release 2.14 came with * don't change readme with newer versions * bump crio version to 1.19 * crio package name has changed for debian/ubuntu * crio upgrade does not work, see kubernetes-sigs#6757 * update crio info in docs * Install cri-o with package version (kubernetes-sigs#6853) and thereby support upgrade from e.g. 1.18.x to 1.19.y Included OSes: - Centos7/8 - Ubuntu18/20 New variables for overriding by default installed packages: - centos_crio_packages - ubuntu_crio_packages * add support crio version for varios k8s vers (kubernetes-sigs#7003) * add support crio version for various k8s vers * regexp in pkg versions Co-authored-by: Hans Feldt <[email protected]> Co-authored-by: Sergey <[email protected]>
* Allow configureable vni and port for flannel overlay * additional options for azure cloud config
…s#7193) (kubernetes-sigs#7197) Only checking the kubernetes api on the first master when upgrading is not enough. Each master needs to be checked before it's upgrade. Signed-off-by: Rick Haan <[email protected]>
caicloud-bot
added
the
do-not-merge/work-in-progress
|
@WangMinjie114: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the caicloud/tools repository. |
caicloud-bot
added
kind/feature
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Assign the PR to them by writing The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
What type of PR is this?
/kind feature
/area release
What this PR does / why we need it:
rebase 上游 release-2.14 分支代码
Which issue(s) this PR is related to (optional, link to 3rd issue(s)):
Fixes #
Reference to #
Special notes for your reviewer:
/cc @your-reviewer
Does this PR introduce a user-facing change?: