starlingx/app-sriov-fec-operator
Code Issues Proposed changes

sriov-fec-operator system integration

Browse Source 
Upgrade sriov-fec-operator application to v2.6.1
- This change includes version upgrade of the operator to v2.6.1 which
  upgrades pf-bb-config to v22.11.
- This change is essential for operator deployment on the latest Intel
  4th gen Xeon scalable processors.
- Updated License headers.

Test Status:
- PASS: Build application deb, generate tarball and build docker images,
copy to stx active controller.
- PASS: Verify that app is uploaded, applied and operator pods are
created.
- PASS: Configure ACC100 using config file to create upto 16 VFs.
- PASS: Bringup test-pod, request FEC VFs and validate sample dpdk
application test-bbdev.
- PASS: App upload, apply, remove, delete verified in simplex mode.
- PASS: Reboot test with operator method validated.
- PASS: Shellcheck tool test.
- PASS: N3000 testing.
- PASS: Configure ACC200 using config file to create 2 VFs.

Failure Tests:
- PASS: Applying Clusterconfig shall fail when fec operator is not
deployed.
- PASS: Operator deployment shall fail when docker image download fails
during system application-apply.
- PASS: Applying Clusterconfig shall fail with Wrong values in
clusterconfig yaml file:
- set vfAmount to >16 or 0.
- set wrong pci address.
- set wrong hostname.
- PASS: Removing the operator without deleting the clusterconfig fails
to delete the FEC VFs and subsequent re-apply will also fail.
- PASS: Modifying or Deleting sriovfecClusterconfig when test-pod is
running with FEC VFs mapped, test-pod gets automatically deleted since
FEC requested resources become unavailable

Story: 2010649
Task: 47661
Signed-off-by: Nidhi Shivashankara Belur <nidhi.shivashankara.belur@intel.com>
Change-Id: I1c6dc946d114a129cd728b8c53b3b00f31fda028
This commit is contained in:
Nidhi Shivashankara Belur 2023-03-24 18:10:55 -07:00
parent 90cd1a27a8
commit d8d7992709
34 changed files with 441 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -39,7 +39,7 @@
- starlingx/fault
- starlingx/update
- starlingx/utilities
nodeset: ubuntu-bionic
nodeset: debian-bullseye
files:
- python3-k8sapp-sriov-fec-operator/*
vars:

8
python3-k8sapp-sriov-fec-operator/debian/deb_folder/changelog
View File

@ -1,5 +1,13 @@
python3-k8sapp-sriov-fec-operator (1.0-2) unstable; urgency=medium
* Upversion sriov-fec-operator v2.6.1.
-- Nidhi Shivashankara Belur <nidhi.shivashankara.belur@intel.com> Thu, 30 Mar 2023 13:07:44 +0000
python3-k8sapp-sriov-fec-operator (1.0-1) unstable; urgency=medium
* Initial release.
-- Nidhi Shivashankara Belur <nidhi.shivashankara.belur@intel.com> Sun, 18 Sep 2022 08:52:11 +0000

4
python3-k8sapp-sriov-fec-operator/debian/deb_folder/copyright
View File

@ -3,7 +3,7 @@ Upstream-Name: python3-k8sapp-sriov-fec-operator
Source: https://opendev.org/starlingx/app-sriov-fec-operator/
Files: *
Copyright: (c) 2022 Intel Corporation
Copyright: (c) 2022-2023 Intel Corporation
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -23,7 +23,7 @@ License: Apache-2
# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2022 Intel Corporation
Copyright: 2022-2023 Intel Corporation
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
python3-k8sapp-sriov-fec-operator/debian/meta_data.yaml
View File

@ -1,6 +1,6 @@
---
debname: python3-k8sapp-sriov-fec-operator
debver: 1.0-1
debver: 1.0-2
src_path: k8sapp_sriov_fec_operator
revision:
dist: $STX_DIST

2
python3-k8sapp-sriov-fec-operator/k8sapp_sriov_fec_operator/LICENSE
View File

@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2022 Intel Corporation
Copyright 2022-2023 Intel Corporation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
python3-k8sapp-sriov-fec-operator/k8sapp_sriov_fec_operator/k8sapp_sriov_fec_operator/common/constants.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2022-2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

2
python3-k8sapp-sriov-fec-operator/k8sapp_sriov_fec_operator/k8sapp_sriov_fec_operator/helm/sriov_fec_operator.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2022-2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

2
python3-k8sapp-sriov-fec-operator/k8sapp_sriov_fec_operator/k8sapp_sriov_fec_operator/lifecycle/lifecycle_sriov_fec_operator.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2022-2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

5
python3-k8sapp-sriov-fec-operator/k8sapp_sriov_fec_operator/k8sapp_sriov_fec_operator/tests/test_plugins.py
View File

@ -1,11 +1,10 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2022-2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
from k8sapp_sriov_fec_operator.common import constants as app_constants
from sysinv.tests.helm.test_helm import HelmOperatorTestSuiteMixin
from sysinv.tests.db import base as dbbase
@ -26,7 +25,6 @@ class K8SAppSriovFecOperatorAppMixin(object):
class K8SAppSriovFecOperatorControllerTestCase(K8SAppSriovFecOperatorAppMixin,
dbbase.BaseIPv6Mixin,
dbbase.BaseCephStorageBackendMixin,
HelmOperatorTestSuiteMixin,
dbbase.ControllerHostTestCase):
pass
@ -38,6 +36,5 @@ class K8SAppSriovFecOperatorControllerTestCase(K8SAppSriovFecOperatorAppMixin,
# - sriov-fec-operator-app
class K8SAppSriovFecOperatorAIOTestCase(K8SAppSriovFecOperatorAppMixin,
dbbase.BaseCephStorageBackendMixin,
HelmOperatorTestSuiteMixin,
dbbase.AIOSimplexHostTestCase):
pass

8
python3-k8sapp-sriov-fec-operator/k8sapp_sriov_fec_operator/k8sapp_sriov_fec_operator/tests/test_sriov_fec_operator.py
View File

@ -1,10 +1,11 @@
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2022-2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
from k8sapp_sriov_fec_operator.tests import test_plugins
from sysinv.tests.db import base as dbbase
from sysinv.db import api as dbapi
from sysinv.tests.db import utils as dbutils
from sysinv.tests.helm import base
@ -17,3 +18,8 @@ class SriovFecOperatorTestCase(test_plugins.K8SAppSriovFecOperatorAppMixin,
super(SriovFecOperatorTestCase, self).setUp()
self.app = dbutils.create_test_app(name='sriov-fec-operator')
self.dbapi = dbapi.get_instance()
class SriovFecOperatorTestCaseDummy(SriovFecOperatorTestCase, dbbase.ProvisionedControllerHostTestCase):
# without a test zuul will fail
def test_dummy(self):
pass

2
python3-k8sapp-sriov-fec-operator/k8sapp_sriov_fec_operator/requirements.txt
View File

@ -1,2 +1,2 @@
pbr>=0.5
PyYAML==3.10
PyYAML>=3.10.0

2
python3-k8sapp-sriov-fec-operator/k8sapp_sriov_fec_operator/setup.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2022-2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

8
python3-k8sapp-sriov-fec-operator/k8sapp_sriov_fec_operator/tox.ini
View File

@ -110,9 +110,15 @@ deps = -r{toxinidir}/test-requirements.txt
commands = bandit --ini tox.ini -n 5 -r k8sapp_sriov_fec_operator
[testenv:pylint]
basepython = python3.6
basepython = python3
sitepackages = False
install_command = pip install \
-v -v -v --use-deprecated legacy-resolver \
-c{toxinidir}/upper-constraints.txt \
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
{opts} {packages}
deps = {[testenv]deps}
pylint
commands =

5
sriov-fec-operator-images/debian/build-sriov-fec-operator-image.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
@ -38,9 +38,6 @@ build_labeler_image() {
build_daemon_image() {
export SRIOV_FEC_DAEMON_IMAGE=$1
sed -i "/FROM.*registry.*/c\FROM ${BASE_IMAGE}" \
Dockerfile.daemon
echo "daemon_image: ${SRIOV_FEC_DAEMON_IMAGE}"
pwd

2
sriov-fec-operator-images/debian/sriov-fec-daemon.stable_docker_image
View File

@ -1,7 +1,7 @@
BUILDER=script
LABEL=sriov-fec-daemon
SOURCE_REPO=https://github.com/smart-edge-open/sriov-fec-operator.git
SOURCE_REF=7eec69b3b7151b1eaccaacd480004654af81784b
SOURCE_REF=45fa1e052bdcf93653cdbb8c5916cbe519f5f273
SOURCE_PATCHES="../files/0001-patch-for-docker-images.patch"
COMMAND=bash
SCRIPT=build-sriov-fec-operator-image.sh

2
sriov-fec-operator-images/debian/sriov-fec-labeler.stable_docker_image
View File

@ -1,7 +1,7 @@
BUILDER=script
LABEL=sriov-fec-labeler
SOURCE_REPO=https://github.com/smart-edge-open/sriov-fec-operator.git
SOURCE_REF=7eec69b3b7151b1eaccaacd480004654af81784b
SOURCE_REF=45fa1e052bdcf93653cdbb8c5916cbe519f5f273
SOURCE_PATCHES="../files/0001-patch-for-docker-images.patch"
COMMAND=bash
SCRIPT=build-sriov-fec-operator-image.sh

2
sriov-fec-operator-images/debian/sriov-fec-operator.stable_docker_image
View File

@ -1,7 +1,7 @@
BUILDER=script
LABEL=sriov-fec-operator
SOURCE_REPO=https://github.com/smart-edge-open/sriov-fec-operator.git
SOURCE_REF=7eec69b3b7151b1eaccaacd480004654af81784b
SOURCE_REF=45fa1e052bdcf93653cdbb8c5916cbe519f5f273
SOURCE_PATCHES="../files/0001-patch-for-docker-images.patch"
COMMAND=bash
SCRIPT=build-sriov-fec-operator-image.sh

404
sriov-fec-operator-images/files/0001-patch-for-docker-images.patch
View File

@ -1,29 +1,116 @@
From 6959d432b7d7c4d53d1ab8ee9b94ad8b8a9b4c4b Mon Sep 17 00:00:00 2001
From 6bfe572dd9d350797ec5a43f85765febc8fa55b3 Mon Sep 17 00:00:00 2001
From: Nidhi Shivashankara Belur <nidhi.shivashankara.belur@intel.com>
Date: Thu, 13 Oct 2022 22:17:19 +0000
Subject: [PATCH] patch for docker images
Date: Fri, 7 Apr 2023 23:16:08 +0000
Subject: [PATCH] Docker Image Changes for StarlingX integration
- Add Image Pull Secrets to service accounts.
- Remove Docker Image Tag creation to prevent multiple image tags.
- VFIO mode fix for STX to disable Operator from checking if vfio_pci
enable_sriov is enabled in the kernel command line parameters, as it is not
required for StarlingX platform. This module parameter is mandatory for
vfio mode, which will be mentioned in the documentation.
- Add Image Pull Secrets to service accounts.
- Remove Docker Image Tag creation to prevent multiple image tags.
- Daemon Dockerfile updates to use CentOS base image.
- Improve Robustness of the telemetry feature.
Signed-off-by: Nidhi Shivashankara Belur <nidhi.shivashankara.belur@intel.com>
---
Makefile | 3 ---
assets/100-labeler.yaml | 2 ++
assets/200-device-plugin.yaml | 2 ++
assets/300-daemon.yaml | 2 ++
pkg/daemon/daemon.go | 1 +
5 files changed, 7 insertions(+), 3 deletions(-)
Dockerfile.daemon | 61 ++------------
Makefile | 3 -
assets/100-labeler.yaml | 2 +
assets/200-device-plugin.yaml | 2 +
assets/300-daemon.yaml | 7 ++
pkg/daemon/telemetry.go | 23 +++++-
pkg/daemon/telemetry_test.go | 148 +++++++++++++++++++++++++++++++++-
7 files changed, 182 insertions(+), 64 deletions(-)
diff --git a/Dockerfile.daemon b/Dockerfile.daemon
index 746d1ab..1cbdd41 100644
--- a/Dockerfile.daemon
+++ b/Dockerfile.daemon
@@ -33,26 +33,19 @@ COPY api api/
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o sriov_fec_daemon cmd/daemon/main.go
-FROM registry.access.redhat.com/ubi9/ubi:9.1.0-1750 as package_installer
-RUN yum install -y ethtool iproute kmod procps-ng pciutils util-linux tar gzip gcc make wget && yum clean all
+FROM centos:7.9.2009
-
-RUN wget -O zlib-1.2.13.tar.gz https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz && \
- tar xzvf zlib-1.2.13.tar.gz
-WORKDIR /zlib-1.2.13
-RUN ./configure && make test && make install
+RUN yum install -y ethtool iproute kmod procps-ng pciutils util-linux && yum clean all
WORKDIR /workspace
-RUN wget https://pci-ids.ucw.cz/v2.2/pci.ids.gz -O pci.ids.gz && \
+RUN mkdir -p /usr/share/misc/ && \
+ cd /usr/share/misc/ && \
+ curl https://pci-ids.ucw.cz/v2.2/pci.ids.gz --output pci.ids.gz && \
gzip -d pci.ids.gz && \
rm -rfv ./pci.ids.gz
-RUN yum remove -y wget
-
-FROM registry.access.redhat.com/ubi9/ubi-micro:9.1.0-13
-
ARG VERSION
### Required OpenShift Labels
LABEL name="SR-IOV Operator for Wireless FEC Accelerators daemonset" \
@@ -63,50 +56,6 @@ LABEL name="SR-IOV Operator for Wireless FEC Accelerators daemonset" \
description="The daemonset container is responsible for building the nodes inventory and configuring the SRIOV-FEC portion of the supported accelerators"
-
-RUN mkdir -p /usr/share/misc/
-
-COPY --from=package_installer /workspace/pci.ids /usr/share/misc/pci.ids
-
-COPY --from=package_installer /lib64/libm.so.6 /lib64/libmnl.so.0 /lib64/libc.so.6 /lib64/ld-linux-x86-64.so.2 \
- /lib64/libzstd.so.1 /lib64/liblzma.so.5 /lib64/libcrypto.so.3 /lib64/libgcc_s.so.1 \
- /lib64/libpci.so.3 /lib64/libkmod.so.2 /lib64/libbpf.so.0 \
- /lib64/libmnl.so.0 /lib64/libtinfo.so.6 /lib64/libsigsegv.so.2.0.6 /lib64/libsigsegv.so.2 \
- /lib64/libreadline.so.8.1 /lib64/libreadline.so.8 /lib64/libmpfr.so.6.1.0 /lib64/libmpfr.so.6 \
- /lib64/libgmp.so.10.4.0 /lib64/libgmp.so.10 /lib64/libprocps.so.8.0.3 /lib64/libsystemd.so.0.33.0 /lib64/liblz4.so.1.9.3 \
- /lib64/libgpg-error.so.0.32.0 /lib64/libgcrypt.so.20.4.0 /lib64/libuuid.so.1.3.0 \
- /lib64/libidn2.so.0.3.7 /lib64/libnettle.so.8.5 /lib64/libgnutls.so.30.33.1 \
- /lib64/libunistring.so.2.1.0 /lib64/libp11-kit.so.0.3.0 /lib64/libtasn1.so.6.6.0 \
- /lib64/libhogweed.so.6.5 /lib64/libffi.so.8.1.0 /lib64/
-RUN ln -sf /usr/lib64/libsigsegv.so.2.0.6 /usr/lib64/libsigsegv.so.2 && \
- ln -sf /usr/lib64/libreadline.so.8.1 /usr/lib64/libreadline.so.8 && \
- ln -sf /usr/lib64/libmpfr.so.6.1.0 /usr/lib64/libmpfr.so.6 && \
- ln -sf /usr/lib64/libprocps.so.8.0.3 /usr/lib64/libprocps.so.8 && \
- ln -sf /usr/lib64/libsystemd.so.0.33.0 /usr/lib64/libsystemd.so.0 && \
- ln -sf /usr/lib64/liblz4.so.1.9.3 /usr/lib64/liblz4.so.1 && \
- ln -sf /usr/lib64/libgcrypt.so.20.4.0 /usr/lib64/libgcrypt.so.20 && \
- ln -sf /usr/lib64/libgpg-error.so.0.32.0 /usr/lib64/libgpg-error.so.0 && \
- ln -sf /usr/lib64/libuuid.so.1.3.0 /usr/lib64/libuuid.so.1 && \
- ln -sf /usr/lib64/libidn2.so.0.3.7 /usr/lib64/libidn2.so.0 && \
- ln -sf /usr/lib64/libnettle.so.8.5 /usr/lib64/libnettle.so.8 && \
- ln -sf /usr/lib64/libgnutls.so.30.33.1 /usr/lib64/libgnutls.so.30 && \
- ln -sf /usr/lib64/libunistring.so.2.1.0 /usr/lib64/libunistring.so.2 && \
- ln -sf /usr/lib64/libp11-kit.so.0.3.0 /usr/lib64/libp11-kit.so.0 && \
- ln -sf /usr/lib64/libtasn1.so.6.6.0 /usr/lib64/libtasn1.so.6 && \
- ln -sf /usr/lib64/libhogweed.so.6.5 /usr/lib64/libhogweed.so.6 && \
- ln -sf /usr/lib64/libffi.so.8.1.0 /usr/lib64/libffi.so.8 && \
- ln -sf /usr/lib64/libgmp.so.10.4.0 /usr/lib64/libgmp.so.10
-COPY --from=package_installer /usr/local/lib/libz.so.1.2.13 /lib64/libz.so.1
-COPY --from=package_installer /usr/sbin/ethtool /usr/sbin/lspci \
- /usr/sbin/setpci /usr/sbin/update-pciids /usr/sbin/ip /usr/sbin/devlink /usr/sbin/modprobe /usr/sbin/
-COPY --from=package_installer /usr/bin/kmod /usr/bin/pkill /usr/bin/dmesg \
- /usr/bin/pgrep /usr/bin/
-COPY --from=package_installer /bin/awk /bin/sed /bin/
-
-
-RUN mkdir /usr/share/hwdata
-COPY --from=package_installer /usr/share/hwdata /usr/share/hwdata
-
USER 1001
COPY TEMP_LICENSE_COPY /licenses/LICENSE
diff --git a/Makefile b/Makefile
index 02d39d2..bc4c086 100644
index b02289f..69018be 100644
--- a/Makefile
+++ b/Makefile
@@ -194,7 +194,6 @@ kustomize: ## Download kustomize locally if necessary.
@@ -193,7 +193,6 @@ generate: controller-gen
image-sriov-fec-daemon:
cp LICENSE TEMP_LICENSE_COPY
$(CONTAINER_TOOL) build . -f Dockerfile.daemon -t $(SRIOV_FEC_DAEMON_IMAGE) --build-arg=VERSION=$(IMG_VERSION)
@ -31,7 +118,7 @@ index 02d39d2..bc4c086 100644
.PHONY: push-sriov-fec-daemon
podman-push-sriov-fec-daemon:
@@ -209,7 +208,6 @@ docker-push-sriov-fec-daemon:
@@ -208,7 +207,6 @@ docker-push-sriov-fec-daemon:
image-sriov-fec-labeler:
cp LICENSE TEMP_LICENSE_COPY
$(CONTAINER_TOOL) build . -f Dockerfile.labeler -t ${SRIOV_FEC_LABELER_IMAGE} --build-arg=VERSION=$(IMG_VERSION)
@ -39,7 +126,7 @@ index 02d39d2..bc4c086 100644
.PHONY: push-sriov-fec-labeler
podman-push-sriov-fec-labeler:
@@ -224,7 +222,6 @@ docker-push-sriov-fec-labeler:
@@ -223,7 +221,6 @@ docker-push-sriov-fec-labeler:
image-sriov-fec-operator:
cp LICENSE TEMP_LICENSE_COPY
$(CONTAINER_TOOL) build . -t $(SRIOV_FEC_OPERATOR_IMAGE) --build-arg=VERSION=$(IMG_VERSION)
@ -61,7 +148,7 @@ index 0681d6d..37210fc 100644
name: accelerator-discovery
namespace: {{ .SRIOV_FEC_NAMESPACE }}
diff --git a/assets/200-device-plugin.yaml b/assets/200-device-plugin.yaml
index 64d5374..f9b9e7f 100644
index 25dbd23..f2e48bd 100644
--- a/assets/200-device-plugin.yaml
+++ b/assets/200-device-plugin.yaml
@@ -11,6 +11,8 @@ data:
@ -74,30 +161,279 @@ index 64d5374..f9b9e7f 100644
name: sriov-device-plugin
namespace: {{ .SRIOV_FEC_NAMESPACE }}
diff --git a/assets/300-daemon.yaml b/assets/300-daemon.yaml
index b2cc28d..229249c 100644
index ce42206..8fd34fe 100644
--- a/assets/300-daemon.yaml
+++ b/assets/300-daemon.yaml
@@ -10,6 +10,8 @@ immutable: false
data:
@@ -11,6 +11,8 @@ data:
serviceAccount: |
apiVersion: v1
kind: ServiceAccount
+ imagePullSecrets:
+ - name: "{{ .SRIOV_FEC_IMAGE_PULL_SECRET }}"
kind: ServiceAccount
metadata:
name: sriov-fec-daemon
diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
index 705a86c..db63308 100644
--- a/pkg/daemon/daemon.go
+++ b/pkg/daemon/daemon.go
@@ -400,6 +400,7 @@ func validateNodeConfig(nodeConfig fec.SriovFecNodeConfigSpec) error {
namespace: {{ .SRIOV_FEC_NAMESPACE }}
@@ -184,6 +186,8 @@ data:
- name: devvfio
mountPath: /dev/vfio
readOnly: true
+ - name: sys
+ mountPath: /sys
- name: vfiotoken
mountPath: /sriov_config/
readOnly: true
@@ -236,6 +240,9 @@ data:
- name: devvfio
hostPath:
path: /dev/vfio
+ - name: sys
+ hostPath:
+ path: /sys
- name: libmodules
hostPath:
path: /lib/modules
diff --git a/pkg/daemon/telemetry.go b/pkg/daemon/telemetry.go
index 7659d11..7ae99e1 100644
--- a/pkg/daemon/telemetry.go
+++ b/pkg/daemon/telemetry.go
@@ -4,11 +4,11 @@ import (
"context"
"errors"
"fmt"
- fec "github.com/smart-edge-open/sriov-fec-operator/api/v2"
- "github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/sirupsen/logrus"
+ fec "github.com/smart-edge-open/sriov-fec-operator/api/v2"
+ "github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
"k8s.io/apimachinery/pkg/util/wait"
"net"
"os"
@@ -221,6 +221,18 @@ func parseDeviceStatus(lines []string, pfPciAddr string, vfs []fec.VF, telemetry
}
telemetryGatherer.updateVfCount(pfPciAddr, string(fec.SucceededSync), vfCount)
+ if int(vfCount) != len(vfs) {
+ log.WithError(err).WithField("value", strings.TrimSuffix(deviceStatus[1], " VFs")).
+ Error("No. of VFs from in metrics log is wrong. Skipping metric.")
+ return
+ }
+
+ if len(lines) < ((int(vfCount) + 1) * 2) {
+ log.WithError(err).WithField("value", strings.TrimSuffix(deviceStatus[1], " VFs")).
+ Error("failed to parse VF status. Skipping metric.")
+ return
+ }
+
for vfIdx := 0; vfIdx < int(vfCount); vfIdx++ {
vfStatus := strings.Split(lines[(vfIdx+1)*2], fmt.Sprintf("VF %v ", vfIdx))
isReady := float64(0)
@@ -232,6 +244,13 @@ func parseDeviceStatus(lines []string, pfPciAddr string, vfs []fec.VF, telemetry
}
func validateVfioKernelParams(cmdline string) error {
+ return nil
for _, param := range kernelParamsVfio {
if !strings.Contains(cmdline, param) {
return fmt.Errorf("missing kernel param for vfio-pci(%s)", param)
func parseCounters(fieldLine, valueLine string, vfs []fec.VF, pfPciAddr string, telemetryGatherer *telemetryGatherer, log *logrus.Logger) {
+
+ if len(fieldLine) <= 0 || len(valueLine) <= 0 {
+ log.WithField("metrics", len(valueLine)).WithField("pciAddr", pfPciAddr).
+ Errorf("Metrics values are null, skip it.")
+ return
+ }
+
fieldName := strings.Split(fieldLine, "INFO:")[1]
value := strings.Split(valueLine, "INFO:")[1]
diff --git a/pkg/daemon/telemetry_test.go b/pkg/daemon/telemetry_test.go
index f37dcd7..a9aa0fc 100644
--- a/pkg/daemon/telemetry_test.go
+++ b/pkg/daemon/telemetry_test.go
@@ -2,12 +2,12 @@ package daemon
import (
"fmt"
- v2 "github.com/smart-edge-open/sriov-fec-operator/api/v2"
- "github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/prometheus/client_golang/prometheus/testutil"
"github.com/sirupsen/logrus"
+ v2 "github.com/smart-edge-open/sriov-fec-operator/api/v2"
+ "github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
"net"
"os"
"strings"
@@ -157,6 +157,63 @@ var _ = Describe("parseCounters", func() {
tg.resetMetrics()
})
+ It("value Line null", func() {
+ fieldLine := "Fri Sep 13 10:49:25 2022:INFO:FFT counters: Per Engine"
+ valueLine := ""
+
+ logger := utils.NewLogger()
+ hook := &testHook{
+ expectedError: "Metrics values are null, skip it.",
+ }
+ logger.AddHook(hook)
+
+ parseCounters(fieldLine, valueLine, []v2.VF{
+ {PCIAddress: "9999:99:99.9"},
+ }, "9999:99:99.0", tg, logger)
+ tg.updateMetrics()
+
+ Expect(testutil.CollectAndCount(tg.engineGauge)).To(Equal(0))
+ Expect(hook.expectedErrorOccured).To(BeTrue())
+ })
+
+ It("field Line null", func() {
+ fieldLine := ""
+ valueLine := ""
+
+ logger := utils.NewLogger()
+ hook := &testHook{
+ expectedError: "Metrics values are null, skip it.",
+ }
+ logger.AddHook(hook)
+
+ parseCounters(fieldLine, valueLine, []v2.VF{
+ {PCIAddress: "9999:99:99.9"},
+ }, "9999:99:99.0", tg, logger)
+ tg.updateMetrics()
+
+ Expect(testutil.CollectAndCount(tg.engineGauge)).To(Equal(0))
+ Expect(hook.expectedErrorOccured).To(BeTrue())
+ })
+
+ It("Incomplete Value Line data", func() {
+ fieldLine := "Fri Sep 13 10:49:25 2022:INFO:FFT counters: Per Engine"
+ valueLine := "Tue Sep 13 10:49:25 2022:INFO:"
+
+ logger := utils.NewLogger()
+ hook := &testHook{
+ expectedError: "failed to parse string into float64. Skipping metric.",
+ }
+ logger.AddHook(hook)
+
+ parseCounters(fieldLine, valueLine, []v2.VF{
+ {PCIAddress: "9999:99:99.9"},
+ }, "9999:99:99.0", tg, logger)
+ tg.updateMetrics()
+
+ Expect(testutil.CollectAndCount(tg.engineGauge)).To(Equal(0))
+ Expect(hook.expectedErrorOccured).To(BeTrue())
+ })
+
It("one FFT engine value is exposed", func() {
parseCounters("Fri Sep 13 10:49:25 2022:INFO:FFT counters: Per Engine", "Tue Sep 13 10:49:25 2022:INFO:123", []v2.VF{
{PCIAddress: "9999:99:99.9"},
@@ -178,6 +235,28 @@ var _ = Describe("parseCounters", func() {
Expect(testutil.ToFloat64(gauge)).To(Equal(float64(999)))
})
+ It("3 5GUL values are exposed with no values", func() {
+ pfPciAddr := "9999:00:00.0"
+ fieldLine := "Fri Sep 13 10:49:25 2022:INFO:5GUL counters: Data (Bytes)"
+ valueLine := "Tue Sep 13 10:49:25 2022:INFO:"
+
+ logger := utils.NewLogger()
+ hook := &testHook{
+ expectedError: "number of metrics doesn't equals to number of VFs",
+ }
+ logger.AddHook(hook)
+
+ parseCounters(fieldLine, valueLine, []v2.VF{
+ {PCIAddress: "9999:01:00.0"},
+ {PCIAddress: "9999:01:00.1"},
+ {PCIAddress: "9999:01:00.2"},
+ }, pfPciAddr, tg, logger)
+ tg.updateMetrics()
+
+ Expect(testutil.CollectAndCount(tg.engineGauge)).To(Equal(0))
+ Expect(hook.expectedErrorOccured).To(BeTrue())
+ })
+
It("3 5GUL values are exposed", func() {
pfPciAddr := "9999:00:00.0"
opType := "5GUL"
@@ -294,7 +373,8 @@ Fri Sep 16 10:42:33 2022:INFO:- VF 1 RTE_BBDEV_DEV_ACTIVE
Fri Sep 16 10:42:33 2022:INFO:- VF 2 RTE_BBDEV_DEV_RESTART_REQ
-Fri Sep 16 10:42:33 2022:INFO:- VF 3 RTE_BBDEV_DEV_RECONFIG_REQ`
+Fri Sep 16 10:42:33 2022:INFO:- VF 3 RTE_BBDEV_DEV_RECONFIG_REQ
+`
parseDeviceStatus(strings.Split(fileLog, "\n"), "1111:00:00.0", []v2.VF{
{PCIAddress: "1111:01:00.0"},
@@ -343,6 +423,68 @@ Fri Sep 16 10:42:33 2022:INFO:- VF 3 RTE_BBDEV_DEV_RECONFIG_REQ`
Expect(testutil.CollectAndCount(tg.vfCountGauge)).To(Equal(0))
Expect(hook.expectedErrorOccured).To(BeTrue())
})
+
+ It("Should skip metrics for insufficient data", func() {
+ logger := utils.NewLogger()
+ hook := &testHook{
+ expectedError: "failed to parse VF status. Skipping metric.",
+ }
+ logger.AddHook(hook)
+ fileLog := `Fri Sep 16 10:42:33 2022:INFO:Device Status:: 1 VFs`
+ parseDeviceStatus(strings.Split(fileLog, "\n"), "1111:00:00.0", []v2.VF{
+ {PCIAddress: "1111:01:00.0"},
+ }, tg, logger)
+ tg.updateMetrics()
+
+ Expect(testutil.CollectAndCount(tg.vfCountGauge)).To(Equal(1))
+ Expect(hook.expectedErrorOccured).To(BeTrue())
+ })
+
+ It("Should skip metrics for when VF count is less than expected", func() {
+ logger := utils.NewLogger()
+ hook := &testHook{
+ expectedError: "No. of VFs from in metrics log is wrong. Skipping metric.",
+ }
+ logger.AddHook(hook)
+ fileLog := `Fri Sep 16 10:42:33 2022:INFO:Device Status:: 1 VFs
+
+Fri Sep 16 10:42:33 2022:INFO:- VF 0 RTE_BBDEV_DEV_CONFIGURED
+
+`
+ parseDeviceStatus(strings.Split(fileLog, "\n"), "1111:00:00.0", []v2.VF{
+ {PCIAddress: "1111:01:00.0"},
+ {PCIAddress: "1111:01:00.1"},
+ {PCIAddress: "1111:01:00.2"},
+ }, tg, logger)
+ tg.updateMetrics()
+
+ Expect(testutil.CollectAndCount(tg.vfCountGauge)).To(Equal(1))
+ Expect(hook.expectedErrorOccured).To(BeTrue())
+ })
+
+ It("Should skip metrics for when VF count is more than expected", func() {
+ logger := utils.NewLogger()
+ hook := &testHook{
+ expectedError: "No. of VFs from in metrics log is wrong. Skipping metric.",
+ }
+ logger.AddHook(hook)
+ fileLog := `Fri Sep 16 10:42:33 2022:INFO:Device Status:: 3 VFs
+
+Fri Sep 16 10:42:33 2022:INFO:- VF 0 RTE_BBDEV_DEV_CONFIGURED
+
+Fri Sep 16 10:42:33 2022:INFO:- VF 1 RTE_BBDEV_DEV_CONFIGURED
+
+Fri Sep 16 10:42:33 2022:INFO:- VF 3 RTE_BBDEV_DEV_CONFIGURED
+
+`
+ parseDeviceStatus(strings.Split(fileLog, "\n"), "1111:00:00.0", []v2.VF{
+ {PCIAddress: "1111:01:00.1"},
+ }, tg, logger)
+ tg.updateMetrics()
+
+ Expect(testutil.CollectAndCount(tg.vfCountGauge)).To(Equal(1))
+ Expect(hook.expectedErrorOccured).To(BeTrue())
+ })
})
type testHook struct {
--
2.25.1

6
stx-sriov-fec-operator-helm/debian/deb_folder/changelog
View File

@ -1,3 +1,9 @@
stx-sriov-fec-operator-helm (1.0-2) unstable; urgency=medium
* Upversion sriov-fec-operator v2.6.1.
-- Nidhi Shivashankara Belur <nidhi.shivashankara.belur@intel.com> Thu, 30 Mar 2023 13:07:44 +0000
stx-sriov-fec-operator-helm (1.0-1) unstable; urgency=medium
* Initial release.

4
stx-sriov-fec-operator-helm/debian/deb_folder/copyright
View File

@ -3,7 +3,7 @@ Upstream-Name: stx-sriov-fec-operator-helm
Source: https://opendev.org/starlingx/app-sriov-fec-operator/
Files: *
Copyright: (c) 2022 Intel Corporation
Copyright: (c) 2023 Intel Corporation
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -23,7 +23,7 @@ License: Apache-2
# If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2022 Intel Corporation
Copyright: 2023 Intel Corporation
License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

2
stx-sriov-fec-operator-helm/debian/meta_data.yaml
View File

@ -1,6 +1,6 @@
---
debname: stx-sriov-fec-operator-helm
debver: 1.0-1
debver: 1.0-2
src_path: stx-sriov-fec-operator-helm
revision:
dist: $STX_DIST

2
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/fluxcd-manifests/base/helmrepository.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

2
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/fluxcd-manifests/base/kustomization.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

2
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/fluxcd-manifests/base/namespace.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

4
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/fluxcd-manifests/sriov-fec-operator/helmrelease.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
@ -15,7 +15,7 @@ spec:
chart:
spec:
chart: sriov-fec-operator
version: 0.1.2
version: 0.1.3
sourceRef:
kind: HelmRepository
name: stx-platform

2
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/fluxcd-manifests/sriov-fec-operator/kustomization.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

4
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/fluxcd-manifests/sriov-fec-operator/sriov-fec-operator-static-overrides.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
@ -20,7 +20,7 @@ kubeRbacProxy:
name: kube-rbac-proxy
image:
repository: gcr.io/kubebuilder/kube-rbac-proxy
tag: v0.11.0
tag: v0.13.1
sriovNetworkDevicePlugin:
image:

2
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/fluxcd-manifests/sriov-fec-operator/sriov-fec-operator-system-overrides.yaml
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

2
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/helm-charts/Makefile
View File

@ -1,7 +1,7 @@
#
# Copyright 2017 The Openstack-Helm Authors.
#
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#

4
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/helm-charts/sriov-fec-operator/Chart.yaml
View File

@ -2,5 +2,5 @@ apiVersion: v2
name: sriov-fec-operator
description: A Helm chart for SR-IOV FEC operator deployment
type: application
version: 0.1.2
appVersion: "2.5.0"
version: 0.1.3
appVersion: "2.6.1"

2
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/helm-charts/sriov-fec-operator/templates/config_map.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v1
data:
controller_manager_config.yaml: |
# SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2022 Intel Corporation
# Copyright (c) 2023 Intel Corporation
apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
kind: ControllerManagerConfig

7
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/helm-charts/sriov-fec-operator/templates/deployment.yaml
View File

@ -6,7 +6,7 @@ metadata:
name: sriov-fec-controller-manager
namespace: sriov-fec-system
spec:
replicas: 2
replicas: 1
selector:
matchLabels:
control-plane: controller-manager
@ -76,6 +76,8 @@ spec:
memory: 20Mi
securityContext:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
runAsNonRoot: true
volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert
@ -98,6 +100,9 @@ spec:
requests:
cpu: 5m
memory: 64Mi
securityContext:
allowPrivilegeEscalation: false
runAsNonRoot: true
serviceAccountName: sriov-fec-controller-manager
terminationGracePeriodSeconds: 10
topologySpreadConstraints:

8
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/helm-charts/sriov-fec-operator/templates/sriov_fec_node_config_crd.yaml
View File

@ -333,8 +333,8 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
type FooStatus struct{ // Represents the observations of a foo's
current state. // Known .status.conditions.type are: \"Available\",
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
@ -870,8 +870,8 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
type FooStatus struct{ // Represents the observations of a foo's
current state. // Known .status.conditions.type are: \"Available\",
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"

4
stx-sriov-fec-operator-helm/stx-sriov-fec-operator-helm/helm-charts/sriov-fec-operator/values.yaml
View File

@ -11,7 +11,7 @@ kubeRbacProxy:
name: kube-rbac-proxy
image:
repository: gcr.io/kubebuilder/kube-rbac-proxy
tag: v0.11.0
tag: v0.13.1
env:
SRIOV_FEC_VFIO_TOKEN: ""
@ -19,4 +19,4 @@ env:
SRIOV_FEC_DAEMON_IMAGE: "registry.local:9001/docker.io/starlingx/sriov-fec-daemon:stx.8.0-v2.5.0"
SRIOV_FEC_LABELER_IMAGE: "registry.local:9001/docker.io/starlingx/sriov-fec-labeler:stx.8.0-v2.5.0"
SRIOV_FEC_NETWORK_DEVICE_PLUGIN_IMAGE: "registry.local:9001/ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:v3.5.1"
KUBE_RBAC_PROXY_IMAGE: "registry.local:9001/gcr.io/kubebuilder/kube-rbac-proxy:v0.11.0"
KUBE_RBAC_PROXY_IMAGE: "registry.local:9001/gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1"