From 8b6dce500e711f30804d53589465e11feaf393d969cf4b39b7ad34df6463111c Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Fri, 15 Nov 2024 16:49:33 +0000 Subject: [PATCH] Update SR-IOV chart to v1.4.0 Aligning with https://github.com/suse-edge/charts/pull/167 --- sriov-crd-chart/Chart.yaml | 6 ++--- sriov-network-operator-chart/Chart.yaml | 12 +++++----- sriov-network-operator-chart/README.md | 23 ++++++++++++++++++- .../charts/sriov-nfd/Chart.yaml | 4 ++-- .../charts/sriov-nfd/values.yaml | 2 +- .../templates/extra-list.yaml | 8 +++++++ .../templates/operator.yaml | 2 ++ sriov-network-operator-chart/values.yaml | 15 ++++++------ 8 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 sriov-network-operator-chart/templates/extra-list.yaml diff --git a/sriov-crd-chart/Chart.yaml b/sriov-crd-chart/Chart.yaml index 5953b18a..0c54e5fb 100644 --- a/sriov-crd-chart/Chart.yaml +++ b/sriov-crd-chart/Chart.yaml @@ -1,5 +1,5 @@ -#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:1.3.0-%RELEASE% -#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:1.3.0 +#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:302.0.0_up1.4.0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:302.0.0_up1.4.0 annotations: catalog.cattle.io/experimental: "true" catalog.cattle.io/hidden: "true" @@ -10,4 +10,4 @@ apiVersion: v2 description: Installs the CRDs for the SR-IOV operator name: sriov-crd type: application -version: 1.3.0 +version: 302.0.0+up1.4.0 diff --git a/sriov-network-operator-chart/Chart.yaml b/sriov-network-operator-chart/Chart.yaml index 538f7e31..39a385ca 100644 --- a/sriov-network-operator-chart/Chart.yaml +++ b/sriov-network-operator-chart/Chart.yaml @@ -1,19 +1,19 @@ -#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:1.3.0-%RELEASE% -#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:1.3.0 +#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:302.0.0_up1.4.0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%sriov-network-operator-chart:302.0.0_up1.4.0 annotations: catalog.cattle.io/auto-install: sriov-crd=match catalog.cattle.io/experimental: "true" catalog.cattle.io/namespace: cattle-sriov-system catalog.cattle.io/os: linux catalog.cattle.io/permits-os: linux - catalog.cattle.io/upstream-version: 1.3.0 + catalog.cattle.io/upstream-version: 1.4.0 apiVersion: v2 -appVersion: v1.3.0 +appVersion: v1.4.0 dependencies: - condition: sriov-nfd.enabled name: sriov-nfd repository: file://./charts/sriov-nfd - version: 0.15.6 + version: 0.15.7 description: SR-IOV network operator configures and manages SR-IOV networks in the kubernetes cluster home: https://github.com/k8snetworkplumbingwg/sriov-network-operator @@ -25,4 +25,4 @@ name: sriov-network-operator sources: - https://github.com/k8snetworkplumbingwg/sriov-network-operator type: application -version: 1.3.0 +version: 302.0.0+up1.4.0 diff --git a/sriov-network-operator-chart/README.md b/sriov-network-operator-chart/README.md index 86b0519a..9cbb747a 100644 --- a/sriov-network-operator-chart/README.md +++ b/sriov-network-operator-chart/README.md @@ -38,9 +38,20 @@ For additional information and methods for installing Helm, refer to the officia ### Deploy SR-IOV Network Operator +#### Deploy from OCI repo + ``` +$ helm install -n sriov-network-operator --create-namespace --version 1.3.0 --set sriovOperatorConfig.deploy=true sriov-network-operator oci://ghcr.io/k8snetworkplumbingwg/sriov-network-operator-chart +``` + +#### Deploy from project sources + +``` +# Clone project +$ git clone https://github.com/k8snetworkplumbingwg/sriov-network-operator.git ; cd sriov-network-operator + # Install Operator -$ helm install -n sriov-network-operator --create-namespace --wait sriov-network-operator ./ +$ helm install -n sriov-network-operator --create-namespace --wait --set sriovOperatorConfig.deploy=true sriov-network-operator ./deployment/sriov-network-operator-chart # View deployed resources $ kubectl -n sriov-network-operator get pods @@ -128,3 +139,13 @@ This section contains general parameters that apply to both the operator and dae | `images.sriovDevicePlugin` | SR-IOV device plugin image | | `images.resourcesInjector` | Resources Injector image | | `images.webhook` | Operator Webhook image | + +### Extra objects parameters + +**Disclaimer**: + +Please note that any resources deployed using the `extraDeploy` in this Helm chart are the sole responsibility of the user. It is important to review and understand the implications of these deployed resources. The maintainers of this Helm chart take no responsibility for any issues or damages caused by the deployment or operation of these resources. + +| Name | description | +| ---- | ------------| +|`extraDeploy`| Array of extra objects to deploy with the release | diff --git a/sriov-network-operator-chart/charts/sriov-nfd/Chart.yaml b/sriov-network-operator-chart/charts/sriov-nfd/Chart.yaml index 5415b0db..add60836 100644 --- a/sriov-network-operator-chart/charts/sriov-nfd/Chart.yaml +++ b/sriov-network-operator-chart/charts/sriov-nfd/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: v0.15.6 +appVersion: v0.15.7 description: Detects hardware features available on each node in a Kubernetes cluster, and advertises those features using node labels home: https://github.com/kubernetes-sigs/node-feature-discovery @@ -11,4 +11,4 @@ name: sriov-nfd sources: - https://github.com/kubernetes-sigs/node-feature-discovery type: application -version: 0.15.6 +version: 0.15.7 diff --git a/sriov-network-operator-chart/charts/sriov-nfd/values.yaml b/sriov-network-operator-chart/charts/sriov-nfd/values.yaml index 9d9aa94a..7a06ad65 100644 --- a/sriov-network-operator-chart/charts/sriov-nfd/values.yaml +++ b/sriov-network-operator-chart/charts/sriov-nfd/values.yaml @@ -3,7 +3,7 @@ image: # This should be set to 'IfNotPresent' for released version pullPolicy: IfNotPresent # tag, if defined will use the given image tag, else Chart.AppVersion will be used - tag: v0.15.6-build20240822 + tag: v0.15.7-build20241113 imagePullSecrets: [] nameOverride: "" diff --git a/sriov-network-operator-chart/templates/extra-list.yaml b/sriov-network-operator-chart/templates/extra-list.yaml new file mode 100644 index 00000000..61a91f5e --- /dev/null +++ b/sriov-network-operator-chart/templates/extra-list.yaml @@ -0,0 +1,8 @@ +{{- range .Values.extraDeploy }} +--- +{{- if typeIs "string" . }} + {{- tpl . $ }} +{{- else }} + {{- tpl (. | toYaml) $ }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/sriov-network-operator-chart/templates/operator.yaml b/sriov-network-operator-chart/templates/operator.yaml index 6768e372..ad7af5bc 100644 --- a/sriov-network-operator-chart/templates/operator.yaml +++ b/sriov-network-operator-chart/templates/operator.yaml @@ -20,6 +20,8 @@ spec: maxUnavailable: 33% template: metadata: + annotations: + openshift.io/required-scc: restricted-v2 labels: name: sriov-network-operator spec: diff --git a/sriov-network-operator-chart/values.yaml b/sriov-network-operator-chart/values.yaml index 9d6c741f..dbf4c06f 100644 --- a/sriov-network-operator-chart/values.yaml +++ b/sriov-network-operator-chart/values.yaml @@ -96,26 +96,27 @@ supportedExtraNICs: [] images: operator: repository: rancher/hardened-sriov-network-operator - tag: v1.3.0-build20240816 + tag: v1.4.0-build20241113 sriovConfigDaemon: repository: rancher/hardened-sriov-network-config-daemon - tag: v1.3.0-build20240816 + tag: v1.4.0-build20241113 sriovCni: repository: rancher/hardened-sriov-cni - tag: v2.8.1-build20240820 + tag: v2.8.1-build20241113 ibSriovCni: repository: rancher/hardened-ib-sriov-cni - tag: v1.1.1-build20240816 + tag: v1.1.1-build20241113 sriovDevicePlugin: repository: rancher/hardened-sriov-network-device-plugin - tag: v3.7.0-build20240816 + tag: v3.8.0-build20241114 resourcesInjector: repository: rancher/hardened-sriov-network-resources-injector - tag: v1.6.0-build20240816 + tag: v1.6.0-build20241113 webhook: repository: rancher/hardened-sriov-network-webhook - tag: v1.3.0-build20240816 + tag: v1.4.0-build20241113 imagePullSecrets: [] +extraDeploy: [] global: cattle: systemDefaultRegistry: ""