Merge pull request #558 from e0ne/23.5

Release Network Operator 23.5.0
Mellanox · Jun 21, 2023 · b61df6e · b61df6e
2 parents aa3d4ef + 4c82987
commit b61df6e
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 20 deletions.
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -5,8 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=nvidia-network-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=v23.1.0
-LABEL operators.operatorframework.io.bundle.channel.default.v1=v23.1.0
+LABEL operators.operatorframework.io.bundle.channels.v1=v23.5.0
+LABEL operators.operatorframework.io.bundle.channel.default.v1=v23.5.0
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

diff --git a/bundle/manifests/mellanox.com_nicclusterpolicies.yaml b/bundle/manifests/mellanox.com_nicclusterpolicies.yaml
@@ -274,6 +274,29 @@ spec:
                     type: object
                     x-kubernetes-map-type: atomic
                 type: object
+              nvIpam:
+                properties:
+                  config:
+                    description: Config for nv-ipam in JSON format
+                    type: string
+                  image:
+                    pattern: '[a-zA-Z0-9\-]+'
+                    type: string
+                  imagePullSecrets:
+                    items:
+                      type: string
+                    type: array
+                  repository:
+                    pattern: '[a-zA-Z0-9\.\-\/]+'
+                    type: string
+                  version:
+                    pattern: '[a-zA-Z0-9\.-]+'
+                    type: string
+                required:
+                - image
+                - repository
+                - version
+                type: object
               nvPeerDriver:
                 description: NVPeerDriverSpec describes configuration options for
                   NV Peer Memory driver

diff --git a/bundle/manifests/nvidia-network-operator.clusterserviceversion.yaml b/bundle/manifests/nvidia-network-operator.clusterserviceversion.yaml
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -4,13 +4,13 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: nvidia-network-operator
-  operators.operatorframework.io.bundle.channels.v1: v23.1.0
-  operators.operatorframework.io.bundle.channel.default.v1: v23.1.0
+  operators.operatorframework.io.bundle.channels.v1: v23.5.0
+  operators.operatorframework.io.bundle.channel.default.v1: v23.5.0
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 
-  com.redhat.openshift.versions: v4.10-4.13
+  com.redhat.openshift.versions: v4.10-4.12
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1
   operators.operatorframework.io.test.config.v1: tests/scorecard/
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -11,6 +11,6 @@ configMapGenerator:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
-- digest: sha256:f8cdf307c170dab6c60c9f1ebaf690dc80c1379dc6872096e946ffae679650ab
+- digest: sha256:ea7becaa1cde597af6b87dc4e8377c68b64eb266f3c9d852ec756c83b961b253
   name: controller
   newName: nvcr.io/nvidia/cloud-native/network-operator
diff --git a/deployment/network-operator/Chart.yaml b/deployment/network-operator/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
 name: network-operator
-version: 23.5.0-beta.3
+version: 23.5.0
 kubeVersion: '>= 1.21.0'
-appVersion: v23.5.0-beta.3
+appVersion: v23.5.0
 description: Nvidia network operator
 type: application
 keywords:

diff --git a/deployment/network-operator/values.yaml b/deployment/network-operator/values.yaml
@@ -95,8 +95,8 @@ sriov-network-operator:
 
   # Image URIs for sriov-network-operator components
   images:
-    operator: ghcr.io/k8snetworkplumbingwg/sriov-network-operator:13405c55b6a77bc2476ad5bf40a3188bb5783244
-    sriovConfigDaemon: ghcr.io/k8snetworkplumbingwg/sriov-network-operator-config-daemon:13405c55b6a77bc2476ad5bf40a3188bb5783244
+    operator: nvcr.io/nvidia/mellanox/sriov-network-operator:network-operator-23.5.0
+    sriovConfigDaemon: nvcr.io/nvidia/mellanox/sriov-network-operator-config-daemon:network-operator-23.5.0
     sriovCni: ghcr.io/k8snetworkplumbingwg/sriov-cni:v2.7.0
     ibSriovCni:  ghcr.io/k8snetworkplumbingwg/ib-sriov-cni:v1.0.3
     sriovDevicePlugin: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plugin:v3.5.1

diff --git a/hack/release.yaml b/hack/release.yaml
@@ -3,12 +3,12 @@ NetworkOperator:
   repository: nvcr.io/nvidia/cloud-native
 SriovNetworkOperator:
   image: sriov-network-operator
-  repository: ghcr.io/k8snetworkplumbingwg
-  version: 13405c55b6a77bc2476ad5bf40a3188bb5783244
+  repository: nvcr.io/nvidia/mellanox
+  version: network-operator-23.5.0
 SriovConfigDaemon:
   image: sriov-network-operator-config-daemon
-  repository: ghcr.io/k8snetworkplumbingwg
-  version: 13405c55b6a77bc2476ad5bf40a3188bb5783244
+  repository: nvcr.io/nvidia/mellanox
+  version: network-operator-23.5.0
 SriovCni:
   image: sriov-cni
   repository: ghcr.io/k8snetworkplumbingwg