starlingx
/
ansible-playbooks
Code Issues Proposed changes

Revert Multus image version back to 3.9.3 

Experiencing issues related to the
initcontainer: "delete-multus-conf".
Which was initially added as a workaround.

Avoid using upstream "apline" image inside the container.
For now, revert back to multus v3.9.3.

Testing:
- All kube-system pods came up
- Multus conf file was generated properly
- Was able to deploy pods with multiple interfaces

Story: 2010639
Task: 49830

Change-Id: I4d4f420784cf49316ae9146f2b8bcc4f29f748f6
Signed-off-by: Mohammad Issa <mohammad.issa@windriver.com>
This commit is contained in:
Mohammad Issa 2024-04-08 20:39:28 +00:00
parent 351aa195f9
commit 2839f12760
4 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
playbookconfig/src/playbooks/roles/common/bringup-kubemaster/templates/k8s-v1.28.4/multus-cni.yaml.j2
View File

@ -1,11 +1,11 @@
---
# Multus Version v4.0.2
# Multus Version v3.9.3
# Based on:
# https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v4.0.2/deployments/
# https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v3.9.3/deployments/
# multus-daemonset.yml
#
# This file is licensed under Apache 2.0. You can obtain a copy of the license at:
# https://github.com/k8snetworkplumbingwg/multus-cni/blob/v4.0.2/LICENSE
# https://github.com/k8snetworkplumbingwg/multus-cni/blob/v3.9.3/LICENSE
#
# The following modifications have been made:
#
@ -22,12 +22,8 @@
# multus-cni-config.
# - Due to the limitations on resource tracking and CPU usage in Kubernetes,
# platform pod's CPU requests are set to zero and must not request CPU resources.
# - multus v4.0.2 changes thin container base image to distroless,
# hence using --multus-conf-file=auto instead of custom conf file as done previously.
# - multus v4.0.2 has an issue with nested delegate misconfiguration in the conf file;
# Adding an initContainer that deletes the multus cni configuration on startup.
#
# Copyright (c) 2024 Wind River Systems, Inc.
# Copyright (c) 2023 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -239,13 +235,21 @@ spec:
containers:
- name: kube-multus
image: "{{ local_registry }}/{{ multus_img }}"
command: ["/thin_entrypoint"]
args:
- "--multus-conf-file=auto"
- "--multus-autoconfig-dir=/host/etc/cni/net.d"
- "--cni-conf-dir=/host/etc/cni/net.d"
- "--multus-log-file=/var/log/multus.log"
- "--multus-log-level=debug"
env:
- name: KUBERNETES_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
command:
- /bin/bash
- -cex
- |
#!/bin/bash
sed "s|__KUBERNETES_NODE_NAME__|${KUBERNETES_NODE_NAME}|g" /tmp/multus-conf/05-multus.conf > /usr/src/multus-cni/05-multus.conf
{% if cluster_network_ipv6 -%}
sed -i 's#//\${KUBERNETES_SERVICE_HOST}#//\[\${KUBERNETES_SERVICE_HOST}\]#' /entrypoint.sh
{% endif -%}
/entrypoint.sh --multus-conf-file=/usr/src/multus-cni/05-multus.conf
resources:
requests:
memory: "50Mi"
@ -263,10 +267,10 @@ spec:
initContainers:
- name: install-multus-binary
image: "{{ local_registry }}/{{ multus_img }}"
command: ["/install_multus"]
args:
- "--type"
- "thin"
command:
- "cp"
- "/usr/src/multus-cni/bin/multus"
- "/host/opt/cni/bin/multus"
resources:
requests:
cpu: "0"
@ -277,18 +281,6 @@ spec:
- name: cnibin
mountPath: /host/opt/cni/bin
mountPropagation: Bidirectional
# 00-multus.conf is generated with a nested delegate misconfiguration.
# Use initcontainer 'delete-multus-conf' to re-generate 00-multus.conf on startup.
# This upstream bug was found in v4.0.2.
- name: delete-multus-conf
image: "alpine"
command: ["rm"]
args:
- "-f"
- "/host/etc/cni/net.d/00-multus.conf"
volumeMounts:
- name: cni
mountPath: "/host/etc/cni/net.d"
terminationGracePeriodSeconds: 10
volumes:
- name: cni
@ -302,4 +294,4 @@ spec:
name: multus-cni-config.v1
items:
- key: cni-conf.json
path: 00-multus.conf
path: 05-multus.conf

2
playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.24.4/system-images.yml
View File

@ -5,7 +5,7 @@ kubernetes_entrypoint_img: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
calico_cni_img: quay.io/calico/cni:v3.26.4
calico_node_img: quay.io/calico/node:v3.26.4
calico_kube_controllers_img: quay.io/calico/kube-controllers:v3.26.4
multus_img: ghcr.io/k8snetworkplumbingwg/multus-cni:v4.0.2
multus_img: ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.3
sriov_cni_img: ghcr.io/k8snetworkplumbingwg/sriov-cni:v2.7.0
sriov_network_device_img: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:v3.6.2
# Nginx images

2
playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.25.3/system-images.yml
View File

@ -5,7 +5,7 @@ kubernetes_entrypoint_img: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
calico_cni_img: quay.io/calico/cni:v3.26.4
calico_node_img: quay.io/calico/node:v3.26.4
calico_kube_controllers_img: quay.io/calico/kube-controllers:v3.26.4
multus_img: ghcr.io/k8snetworkplumbingwg/multus-cni:v4.0.2
multus_img: ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.3
sriov_cni_img: ghcr.io/k8snetworkplumbingwg/sriov-cni:v2.7.0
sriov_network_device_img: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:v3.6.2
intel_qat_plugin_img: docker.io/intel/intel-qat-plugin:0.26.0

2
playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.28.4/system-images.yml
View File

@ -5,7 +5,7 @@ kubernetes_entrypoint_img: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
calico_cni_img: quay.io/calico/cni:v3.26.4
calico_node_img: quay.io/calico/node:v3.26.4
calico_kube_controllers_img: quay.io/calico/kube-controllers:v3.26.4
multus_img: ghcr.io/k8snetworkplumbingwg/multus-cni:v4.0.2
multus_img: ghcr.io/k8snetworkplumbingwg/multus-cni:v3.9.3
sriov_cni_img: ghcr.io/k8snetworkplumbingwg/sriov-cni:v2.7.0
sriov_network_device_img: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:v3.6.2
intel_qat_plugin_img: docker.io/intel/intel-qat-plugin:0.26.0