From 788e837867a0b026c9f9156c4921ee64087ce6ae Mon Sep 17 00:00:00 2001 From: Fred Rolland Date: Sun, 24 Nov 2024 16:15:20 +0200 Subject: [PATCH] chore: update nic conf chart Signed-off-by: Fred Rolland --- .../README.md | 27 +++++++++++++++++++ ....nvidia.com_nicconfigurationtemplates.yaml | 15 ----------- ...nfiguration.net.nvidia.com_nicdevices.yaml | 18 ++----------- .../supported-nic-firmware-configmap.yaml | 4 +-- .../values.yaml | 6 ++--- deployment/network-operator/values.yaml | 4 +-- hack/release.yaml | 4 +-- 7 files changed, 37 insertions(+), 41 deletions(-) create mode 100644 deployment/network-operator/charts/nic-configuration-operator-chart/README.md diff --git a/deployment/network-operator/charts/nic-configuration-operator-chart/README.md b/deployment/network-operator/charts/nic-configuration-operator-chart/README.md new file mode 100644 index 000000000..67b28260b --- /dev/null +++ b/deployment/network-operator/charts/nic-configuration-operator-chart/README.md @@ -0,0 +1,27 @@ +# nic-configuration-operator-chart + +![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square) + +A Helm chart for NIC Configuration Operator + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| configDaemon.image.name | string | `"nic-configuration-operator-daemon"` | | +| configDaemon.image.repository | string | `"ghcr.io/mellanox"` | repository to use for the config daemon image | +| configDaemon.image.tag | string | `"latest"` | image tag to use for the config daemon image | +| configDaemon.nodeSelector | object | `{}` | node selector for the config daemon | +| configDaemon.resources | object | `{"limits":{"cpu":"500m","memory":"128Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}` | resources and limits for the config daemon | +| imagePullSecrets | list | `[]` | image pull secrets for both the operator and the config daemon | +| logLevel | string | `"info"` | log level configuration (debug|info) | +| operator.affinity | object | `{"nodeAffinity":{"preferredDuringSchedulingIgnoredDuringExecution":[{"preference":{"matchExpressions":[{"key":"node-role.kubernetes.io/master","operator":"Exists"}]},"weight":1},{"preference":{"matchExpressions":[{"key":"node-role.kubernetes.io/control-plane","operator":"Exists"}]},"weight":1}]}}` | node affinity for the operator | +| operator.image.name | string | `"nic-configuration-operator"` | | +| operator.image.repository | string | `"ghcr.io/mellanox"` | repository to use for the operator image | +| operator.image.tag | string | `"latest"` | image tag to use for the operator image | +| operator.nodeSelector | object | `{}` | node selector for the operator | +| operator.replicas | int | `1` | operator deployment number of replicas | +| operator.resources | object | `{"limits":{"cpu":"500m","memory":"128Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}` | specify resource requests and limits for the operator | +| operator.serviceAccount.annotations | object | `{}` | set annotations for the operator service account | +| operator.tolerations | list | `[{"effect":"NoSchedule","key":"node-role.kubernetes.io/master","operator":"Exists"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/control-plane","operator":"Exists"}]` | tolerations for the operator | + diff --git a/deployment/network-operator/charts/nic-configuration-operator-chart/crds/configuration.net.nvidia.com_nicconfigurationtemplates.yaml b/deployment/network-operator/charts/nic-configuration-operator-chart/crds/configuration.net.nvidia.com_nicconfigurationtemplates.yaml index 3b98de333..e604881fe 100644 --- a/deployment/network-operator/charts/nic-configuration-operator-chart/crds/configuration.net.nvidia.com_nicconfigurationtemplates.yaml +++ b/deployment/network-operator/charts/nic-configuration-operator-chart/crds/configuration.net.nvidia.com_nicconfigurationtemplates.yaml @@ -126,21 +126,6 @@ spec: required: - enabled type: object - rawNvConfig: - description: List of arbitrary nv config parameters - items: - properties: - name: - description: Name of the arbitrary nvconfig parameter - type: string - value: - description: Value of the arbitrary nvconfig parameter - type: string - required: - - name - - value - type: object - type: array roceOptimized: description: RoCE optimization settings properties: diff --git a/deployment/network-operator/charts/nic-configuration-operator-chart/crds/configuration.net.nvidia.com_nicdevices.yaml b/deployment/network-operator/charts/nic-configuration-operator-chart/crds/configuration.net.nvidia.com_nicdevices.yaml index 6bb659860..93c522770 100644 --- a/deployment/network-operator/charts/nic-configuration-operator-chart/crds/configuration.net.nvidia.com_nicdevices.yaml +++ b/deployment/network-operator/charts/nic-configuration-operator-chart/crds/configuration.net.nvidia.com_nicdevices.yaml @@ -45,7 +45,8 @@ spec: properties: resetToDefault: description: |- - ResetToDefault specifies whether node agent needs to perform a reset flow + ResetToDefault specifies whether node agent needs to perform a reset flow. + In NIC Configuration Operator template v0.1.14 BF2/BF3 DPUs (not SuperNics) FW reset flow isn't supported. The following operations will be performed: * Nvconfig reset of all non-volatile configurations - Mstconfig -d reset for each PF @@ -105,21 +106,6 @@ spec: required: - enabled type: object - rawNvConfig: - description: List of arbitrary nv config parameters - items: - properties: - name: - description: Name of the arbitrary nvconfig parameter - type: string - value: - description: Value of the arbitrary nvconfig parameter - type: string - required: - - name - - value - type: object - type: array roceOptimized: description: RoCE optimization settings properties: diff --git a/deployment/network-operator/charts/nic-configuration-operator-chart/templates/supported-nic-firmware-configmap.yaml b/deployment/network-operator/charts/nic-configuration-operator-chart/templates/supported-nic-firmware-configmap.yaml index 64d47adc1..7e935ed6a 100644 --- a/deployment/network-operator/charts/nic-configuration-operator-chart/templates/supported-nic-firmware-configmap.yaml +++ b/deployment/network-operator/charts/nic-configuration-operator-chart/templates/supported-nic-firmware-configmap.yaml @@ -13,10 +13,10 @@ data: Nvidia_mlx5_MT42822_BlueField-2_integrated_ConnectX-6_Dx-24.07: "a2d6 24.07-0.6.1 24.42.1000" Nvidia_mlx5_ConnectX-4-24.10: "1013 24.10-0.7.0 12.28.2006" Nvidia_mlx5_ConnectX-4_Lx-24.10: "1013 24.10-0.7.0 14.32.1010" - Nvidia_mlx5_ConnectX-5-24.10: "1017 24.10-0.7.0.35.4030" + Nvidia_mlx5_ConnectX-5-24.10: "1017 24.10-0.7.0 16.35.4030" Nvidia_mlx5_ConnectX-5_Ex-24.10: "1019 24.10-0.7.0 16.35.4030" Nvidia_mlx5_ConnectX-6-24.10: "101b 24.10-0.7.0 20.43.1014" Nvidia_mlx5_ConnectX-6_Dx-24.10: "101d 24.10-0.7.0 22.43.1014" Nvidia_mlx5_ConnectX-6_Lx-24.10: "101f 24.10-0.7.0 26.43.1014" Nvidia_mlx5_ConnectX-7-24.10: "1021 24.10-0.7.0 28.43.1014" - Nvidia_mlx5_MT42822_BlueField-2_integrated_ConnectX-6_Dx-24.10: "a2d6 24.10-0.7.0 22.43.1014" + Nvidia_mlx5_MT42822_BlueField-2_integrated_ConnectX-6_Dx-24.10: "a2d6 24.10-0.7.0 22.43.1014" \ No newline at end of file diff --git a/deployment/network-operator/charts/nic-configuration-operator-chart/values.yaml b/deployment/network-operator/charts/nic-configuration-operator-chart/values.yaml index c945c7928..a9409312c 100644 --- a/deployment/network-operator/charts/nic-configuration-operator-chart/values.yaml +++ b/deployment/network-operator/charts/nic-configuration-operator-chart/values.yaml @@ -4,7 +4,7 @@ operator: repository: ghcr.io/mellanox name: nic-configuration-operator # -- image tag to use for the operator image - tag: latest + tag: v0.1.14 # -- tolerations for the operator tolerations: - key: "node-role.kubernetes.io/master" @@ -42,14 +42,13 @@ operator: serviceAccount: # -- set annotations for the operator service account annotations: {} - configDaemon: image: # -- repository to use for the config daemon image repository: ghcr.io/mellanox name: nic-configuration-operator-daemon # -- image tag to use for the config daemon image - tag: latest + tag: v0.1.14 # -- node selector for the config daemon nodeSelector: {} # -- resources and limits for the config daemon @@ -60,7 +59,6 @@ configDaemon: requests: cpu: 10m memory: 64Mi - # -- log level configuration (debug|info) logLevel: info # -- image pull secrets for both the operator and the config daemon diff --git a/deployment/network-operator/values.yaml b/deployment/network-operator/values.yaml index ef752954d..d5382c0b9 100644 --- a/deployment/network-operator/values.yaml +++ b/deployment/network-operator/values.yaml @@ -174,12 +174,12 @@ nic-configuration-operator-chart: image: repository: ghcr.io/mellanox name: nic-configuration-operator - tag: v0.1.13 + tag: v0.1.14 configDaemon: image: repository: ghcr.io/mellanox name: nic-configuration-operator-daemon - tag: v0.1.13 + tag: v0.1.14 # General Operator related values # The operator element allows to deploy network operator from an alternate location diff --git a/hack/release.yaml b/hack/release.yaml index 63ce08172..cdc4dc31b 100644 --- a/hack/release.yaml +++ b/hack/release.yaml @@ -81,8 +81,8 @@ rdmaCni: nicConfigurationOperator: image: nic-configuration-operator repository: ghcr.io/mellanox - version: v0.1.13 + version: v0.1.14 nicConfigurationConfigDaemon: image: nic-configuration-operator-daemon repository: ghcr.io/mellanox - version: v0.1.13 + version: v0.1.14