Fix openvswitch gate issue for multinode
Add openvswitch gate issue with systemd 237-3ubuntu10.43 to multinode also. Added code from [0]. Additionally, made changes to support 1.18.9 version of kubeadm. [0] https://review.opendev.org/c/openstack/openstack-helm-infra/+/763619 Change-Id: I2681feb1029e5535f3f278513e8aece821c715f1
This commit is contained in:
parent
b952e99828
commit
1f3fe0cb45
@ -13,8 +13,8 @@
|
||||
---
|
||||
version:
|
||||
kubernetes: v1.18.9
|
||||
helm: v2.13.0
|
||||
cni: v0.6.0
|
||||
helm: v2.16.9
|
||||
cni: v0.8.5
|
||||
|
||||
proxy:
|
||||
http: null
|
||||
|
@ -43,6 +43,22 @@
|
||||
- python-urllib3
|
||||
- python-requests
|
||||
|
||||
- name: install additional packages
|
||||
include_role:
|
||||
name: deploy-package
|
||||
tasks_from: dist
|
||||
vars:
|
||||
state: present
|
||||
packages:
|
||||
deb:
|
||||
- conntrack
|
||||
- bc
|
||||
- nmap
|
||||
rpm:
|
||||
- conntrack-tools
|
||||
- bc
|
||||
- nmap
|
||||
|
||||
- name: Ensure docker python packages deployed
|
||||
include_role:
|
||||
name: deploy-package
|
||||
|
@ -11,6 +11,13 @@
|
||||
# limitations under the License.
|
||||
|
||||
---
|
||||
- name: setting default limit memlock
|
||||
shell: |
|
||||
set -xe;
|
||||
echo "DefaultLimitMEMLOCK=16777216" | sudo tee -a /etc/systemd/system.conf
|
||||
sudo systemctl daemon-reexec
|
||||
sudo systemctl daemon-reload
|
||||
|
||||
- name: check if docker deploy is needed
|
||||
raw: which docker
|
||||
register: need_docker
|
||||
|
@ -39,7 +39,7 @@
|
||||
become_user: root
|
||||
register: kubeadm_aio_action_logs
|
||||
- name: storing cluster join command
|
||||
set_fact: kubeadm_cluster_join_command="{{ kubeadm_aio_action_logs.stdout }}"
|
||||
set_fact: kubeadm_cluster_join_command="{{ kubeadm_aio_action_logs.stdout | regex_search('kubeadm join.*') }}"
|
||||
rescue:
|
||||
- name: "dumping logs for {{ kubeadm_aio_action }} action"
|
||||
debug:
|
||||
|
@ -38,7 +38,7 @@ ENV GOOGLE_HELM_REPO_URL ${GOOGLE_HELM_REPO_URL}
|
||||
ARG KUBE_VERSION="v1.18.9"
|
||||
ENV KUBE_VERSION ${KUBE_VERSION}
|
||||
|
||||
ARG CNI_VERSION="v0.6.0"
|
||||
ARG CNI_VERSION="v0.8.5"
|
||||
ENV CNI_VERSION ${CNI_VERSION}
|
||||
|
||||
ARG CNI_REPO_URL=https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION
|
||||
@ -97,7 +97,7 @@ RUN set -ex ;\
|
||||
${GOOGLE_KUBERNETES_REPO_URL}/kubelet ;\
|
||||
chmod +x /opt/assets/usr/bin/kubelet ;\
|
||||
mkdir -p /opt/assets${CNI_BIN_DIR} ;\
|
||||
curl -sSL ${CNI_REPO_URL}/cni-plugins-amd64-$CNI_VERSION.tgz | \
|
||||
curl -sSL ${CNI_REPO_URL}/cni-plugins-linux-amd64-$CNI_VERSION.tgz | \
|
||||
tar -zxv --strip-components=1 -C /opt/assets${CNI_BIN_DIR} ;\
|
||||
TMP_DIR=$(mktemp -d) ;\
|
||||
curl -sSL ${GOOGLE_HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} ;\
|
||||
|
@ -141,7 +141,8 @@
|
||||
- portmap
|
||||
- tuning
|
||||
- vlan
|
||||
- sample
|
||||
# NOTE(aostapenko) absent with v0.8.5 cni
|
||||
# - sample
|
||||
- dhcp
|
||||
- ipvlan
|
||||
- macvlan
|
||||
|
Loading…
Reference in New Issue
Block a user