diff --git a/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml b/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml index aef366078a..00dcdd9423 100644 --- a/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml +++ b/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworknodepolicies.yaml @@ -61,6 +61,13 @@ spec: description: IDs to inject to external_ids field in the Bridge table in OVSDB type: object + failMode: + description: configure fail_mode field in the Bridge table + in OVSDB (optional). 'secure' or 'standalone'. + enum: + - secure + - standalone + type: string otherConfig: additionalProperties: type: string diff --git a/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworknodestates.yaml b/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworknodestates.yaml index 63991800f7..07e284e518 100644 --- a/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworknodestates.yaml +++ b/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworknodestates.yaml @@ -74,6 +74,13 @@ spec: description: IDs to inject to external_ids field in the Bridge table in OVSDB type: object + failMode: + description: configure fail_mode field in the Bridge + table in OVSDB (optional). 'secure' or 'standalone'. + enum: + - secure + - standalone + type: string otherConfig: additionalProperties: type: string @@ -213,6 +220,13 @@ spec: description: IDs to inject to external_ids field in the Bridge table in OVSDB type: object + failMode: + description: configure fail_mode field in the Bridge + table in OVSDB (optional). 'secure' or 'standalone'. + enum: + - secure + - standalone + type: string otherConfig: additionalProperties: type: string diff --git a/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworks.yaml b/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworks.yaml index 067e53a7f5..28e7297e40 100644 --- a/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworks.yaml +++ b/assets/optional/sriov/crd/sriovnetwork.openshift.io_sriovnetworks.yaml @@ -107,7 +107,7 @@ spec: type: string vlan: description: VLAN ID to assign for the VF. Defaults to 0. - maximum: 4096 + maximum: 4094 minimum: 0 type: integer vlanProto: diff --git a/assets/optional/sriov/deploy/operator.yaml b/assets/optional/sriov/deploy/operator.yaml index 5da0e4ecd4..80228f6e39 100644 --- a/assets/optional/sriov/deploy/operator.yaml +++ b/assets/optional/sriov/deploy/operator.yaml @@ -56,11 +56,11 @@ spec: fieldRef: fieldPath: metadata.name - name: RELEASE_VERSION - value: 4.20.0 - - name: SRIOV_CNI_BIN_PATH - value: /run/cni/bin + value: 4.21.0 - name: CLUSTER_TYPE value: kubernetes + - name: SRIOV_CNI_BIN_PATH + value: /run/cni/bin image: quay.io/openshift/sriov-network-operator:latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/assets/optional/sriov/kustomization.aarch64.yaml b/assets/optional/sriov/kustomization.aarch64.yaml index a9816a30c8..4349f1666e 100644 --- a/assets/optional/sriov/kustomization.aarch64.yaml +++ b/assets/optional/sriov/kustomization.aarch64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/sriov-network-operator newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator - digest: sha256:5c45880dc14f79c5f4dbb20feeba6656384ea7ef1863f59fdedbdf306d693b77 + digest: sha256:d1d3cf966dc748871cc8165425d84937326e734ee76a21073cf6a13e34b9a152 patches: - patch: |- @@ -9,47 +9,47 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: SRIOV_CNI_IMAGE - value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3d36679b58f53ad154b886843a0092f84409610b1e1ff1ae3ab021109c1eae35 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a7a53eddbd9f30ab052a4cb051c0668261691bf08718c72ef8b3be0e3a704ff0 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_DEVICE_PLUGIN_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:99bb0ea29b9fed45aed8391344ea9b785b1c044101332d218bcb3da585429d37 + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:65c288d12a7546190770008bbe63ef44de84dafe21aa086e155923e6986bbe78 - op: add path: /spec/template/spec/containers/0/env/- value: name: NETWORK_RESOURCES_INJECTOR_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:09e43f54273705a05c0c71c7e47324172ad57c9c468f382f7aec9cda730f83ed + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:8f8113ee41fcbd991d9bb8d67932d14ee5ed13a76e88af8584cba96e8911d91a - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:fdb3456dfa64b48e42662b52c698ea7bba4d9fc6504d54f814a759c4ab0b0258 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:a7587edc911af89c59892a63e03894593115e334b12f1e9b75075a82a75d188d - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_WEBHOOK_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6f982d7fc0ce4a370d443c1ae74adbb93e47355bcfa7a2a3f731a04496bb4c3d + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:3fe547fb4fc740e26a6a4f9949dc18b7d6bb640be25b5198d496c99ab05f4f1c - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_INFINIBAND_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:cb99f378ba0cbc6878f8c2605eb1a98c4d6edaeeaea8f8262d4f923f7d6afdc4 + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ee11058b5d987dc10dbc3bd77b88767b535804f40c1f98b0d5a80c26db164bec - op: add path: /spec/template/spec/containers/0/env/- value: name: RDMA_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e10697925700ec0c1304b817335ff4d6b5176c905f86415b14573c65c9674c80 + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:5a675578272c5751bb90d94b09d22286be63b3710d95244607af0140e7376579 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:98fe46af8f7116c76eb50a75e83b7027c2f4ccf2f5b5955767ba3cb69b60e493 + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:e24223c34b933c671723f0bd5bf0b0f2a01aecd2028613b69d42ee62bb84799d - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:4bd4ba390e83fb3eff7d17281090981125e08ecb458969b5ac95da4342641e65 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:9bc0f56a1ab47031e1470d0e67764c3b7d37a144c967de0723fd3ffdf3bc29f2 target: kind: Deployment name: sriov-network-operator diff --git a/assets/optional/sriov/kustomization.x86_64.yaml b/assets/optional/sriov/kustomization.x86_64.yaml index 6a484a8229..aa0ae4d653 100644 --- a/assets/optional/sriov/kustomization.x86_64.yaml +++ b/assets/optional/sriov/kustomization.x86_64.yaml @@ -1,7 +1,7 @@ images: - name: quay.io/openshift/sriov-network-operator newName: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator - digest: sha256:eb33beb5c0387c53709ca90e4a34bd3bc6423f40f2c3f87d1259e26838d30b69 + digest: sha256:cc4a79fd0502e836d4e4e84ebd4ed105e4ea3f3f34362bee41065b55e15c9d95 patches: - patch: |- @@ -9,47 +9,47 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: SRIOV_CNI_IMAGE - value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:419a7edf1893e5ae2ccc8bdd927ba79f0994865a41a2a41b8b003f48d11a61c2 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3c0a313acbd8d6010324dd526146a91ae14e296581d8abffadfcc4541fd5ee3e - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_DEVICE_PLUGIN_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:b134ed51c7f6e9c8b529cc26dd4f840b20b3fed57b5dabffed6ee968d3b6c542 + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:304031da3d64e572648e18a105dd8c2967500531dc8b1a622caca69762785db4 - op: add path: /spec/template/spec/containers/0/env/- value: name: NETWORK_RESOURCES_INJECTOR_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:3dcf9e4d16a3d9cb297363f5e13def08350e2e8b4af6488c70fe2a3322302460 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:d37f8b44d4ae0a83483ba0e3074709b0d5fa7ad1661f86d1758650bc727e45f8 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6febc5de880f61a38ea6b4e001ac567a6f05ba742714845a33cc663013332e12 + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:ef10354a70b61a69e1a925f9262cc7e9883fdccb66fa47ab67e51fa8b876f9c2 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_NETWORK_WEBHOOK_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:9c27ea1bca8365b8b66d03e838d48ec7510714bc954e1f89c5f19d4a24db072b + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:3018c39e1fe65ad6bc4f2700c2789bf4a15bcdc0c7d9210f96cc32da3eca7617 - op: add path: /spec/template/spec/containers/0/env/- value: name: SRIOV_INFINIBAND_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:69887c1d3777bb1f6334783926e63295bf574b762faeb481eba8550c916a9159 + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:4d13e672aa36bea01cc23c8a2bc0c3590acee8a30a66023633b03f2f1abdc924 - op: add path: /spec/template/spec/containers/0/env/- value: name: RDMA_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:0aefbfbeba10fa66e6988f6b571749c4df965b4ecb99678488685be26e80c543 + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:5c1848ecdc8da4a2c5fd5ab86af14d8b19552775fe8e9b0d2f69242627d92342 - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:866bd03f50228e938d475fb2daa3feceeaedb532a7079e25e95af2536e5a78d7 + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:b38a19c77b253e6ca0a4e7bf1f2f020b7fbcfdbbc6b5a52892a2681c3b5f4c7a - op: add path: /spec/template/spec/containers/0/env/- value: name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:602dc9f92b7a8e84e6eb998191263d186d1d10d378eeef0845435715bee812dc + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:e99cd629414427a7792ccecda36d856dbe549682438f7b0dfb0ee2e7af536dd6 target: kind: Deployment name: sriov-network-operator diff --git a/assets/optional/sriov/release-sriov-aarch64.json b/assets/optional/sriov/release-sriov-aarch64.json index a9ff4d0648..ab658b8200 100644 --- a/assets/optional/sriov/release-sriov-aarch64.json +++ b/assets/optional/sriov/release-sriov-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.20.0-202602261925" + "base": "4.21.0-202603092144" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:98fe46af8f7116c76eb50a75e83b7027c2f4ccf2f5b5955767ba3cb69b60e493", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:4bd4ba390e83fb3eff7d17281090981125e08ecb458969b5ac95da4342641e65", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:09e43f54273705a05c0c71c7e47324172ad57c9c468f382f7aec9cda730f83ed", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:e10697925700ec0c1304b817335ff4d6b5176c905f86415b14573c65c9674c80", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3d36679b58f53ad154b886843a0092f84409610b1e1ff1ae3ab021109c1eae35", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:99bb0ea29b9fed45aed8391344ea9b785b1c044101332d218bcb3da585429d37", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:cb99f378ba0cbc6878f8c2605eb1a98c4d6edaeeaea8f8262d4f923f7d6afdc4", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:fdb3456dfa64b48e42662b52c698ea7bba4d9fc6504d54f814a759c4ab0b0258", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:5c45880dc14f79c5f4dbb20feeba6656384ea7ef1863f59fdedbdf306d693b77", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6f982d7fc0ce4a370d443c1ae74adbb93e47355bcfa7a2a3f731a04496bb4c3d" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:e24223c34b933c671723f0bd5bf0b0f2a01aecd2028613b69d42ee62bb84799d", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:9bc0f56a1ab47031e1470d0e67764c3b7d37a144c967de0723fd3ffdf3bc29f2", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:8f8113ee41fcbd991d9bb8d67932d14ee5ed13a76e88af8584cba96e8911d91a", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:5a675578272c5751bb90d94b09d22286be63b3710d95244607af0140e7376579", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:a7a53eddbd9f30ab052a4cb051c0668261691bf08718c72ef8b3be0e3a704ff0", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:65c288d12a7546190770008bbe63ef44de84dafe21aa086e155923e6986bbe78", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ee11058b5d987dc10dbc3bd77b88767b535804f40c1f98b0d5a80c26db164bec", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:a7587edc911af89c59892a63e03894593115e334b12f1e9b75075a82a75d188d", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:d1d3cf966dc748871cc8165425d84937326e734ee76a21073cf6a13e34b9a152", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:3fe547fb4fc740e26a6a4f9949dc18b7d6bb640be25b5198d496c99ab05f4f1c" } } diff --git a/assets/optional/sriov/release-sriov-x86_64.json b/assets/optional/sriov/release-sriov-x86_64.json index ffb0e88e87..2a1be8b22a 100644 --- a/assets/optional/sriov/release-sriov-x86_64.json +++ b/assets/optional/sriov/release-sriov-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.20.0-202602261925" + "base": "4.21.0-202603092144" }, "images": { - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:866bd03f50228e938d475fb2daa3feceeaedb532a7079e25e95af2536e5a78d7", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:602dc9f92b7a8e84e6eb998191263d186d1d10d378eeef0845435715bee812dc", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:3dcf9e4d16a3d9cb297363f5e13def08350e2e8b4af6488c70fe2a3322302460", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:0aefbfbeba10fa66e6988f6b571749c4df965b4ecb99678488685be26e80c543", - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:419a7edf1893e5ae2ccc8bdd927ba79f0994865a41a2a41b8b003f48d11a61c2", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:b134ed51c7f6e9c8b529cc26dd4f840b20b3fed57b5dabffed6ee968d3b6c542", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:69887c1d3777bb1f6334783926e63295bf574b762faeb481eba8550c916a9159", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:6febc5de880f61a38ea6b4e001ac567a6f05ba742714845a33cc663013332e12", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:eb33beb5c0387c53709ca90e4a34bd3bc6423f40f2c3f87d1259e26838d30b69", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:9c27ea1bca8365b8b66d03e838d48ec7510714bc954e1f89c5f19d4a24db072b" + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:b38a19c77b253e6ca0a4e7bf1f2f020b7fbcfdbbc6b5a52892a2681c3b5f4c7a", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:e99cd629414427a7792ccecda36d856dbe549682438f7b0dfb0ee2e7af536dd6", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:d37f8b44d4ae0a83483ba0e3074709b0d5fa7ad1661f86d1758650bc727e45f8", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:5c1848ecdc8da4a2c5fd5ab86af14d8b19552775fe8e9b0d2f69242627d92342", + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:3c0a313acbd8d6010324dd526146a91ae14e296581d8abffadfcc4541fd5ee3e", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:304031da3d64e572648e18a105dd8c2967500531dc8b1a622caca69762785db4", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:4d13e672aa36bea01cc23c8a2bc0c3590acee8a30a66023633b03f2f1abdc924", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:ef10354a70b61a69e1a925f9262cc7e9883fdccb66fa47ab67e51fa8b876f9c2", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:cc4a79fd0502e836d4e4e84ebd4ed105e4ea3f3f34362bee41065b55e15c9d95", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:3018c39e1fe65ad6bc4f2700c2789bf4a15bcdc0c7d9210f96cc32da3eca7617" } } diff --git a/scripts/auto-rebase/last_rebase_sriov.sh b/scripts/auto-rebase/last_rebase_sriov.sh index 7eabd6e8b2..dee2ba751d 100755 --- a/scripts/auto-rebase/last_rebase_sriov.sh +++ b/scripts/auto-rebase/last_rebase_sriov.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase_sriov.sh to "registry.redhat.io/openshift4/ose-sriov-network-operator-bundle:v4.20" +./scripts/auto-rebase/rebase_sriov.sh to "registry.redhat.io/openshift4/ose-sriov-network-operator-bundle:v4.21" diff --git a/scripts/auto-rebase/rebase_job_entrypoint.sh b/scripts/auto-rebase/rebase_job_entrypoint.sh index 74b1dce1ea..6f2c5ad365 100755 --- a/scripts/auto-rebase/rebase_job_entrypoint.sh +++ b/scripts/auto-rebase/rebase_job_entrypoint.sh @@ -91,7 +91,7 @@ fi # https://catalog.redhat.com/software/containers/rhoai/odh-operator-bundle/659803ca929f3c931af06f28 rhoai_release="registry.redhat.io/rhoai/odh-operator-bundle:v2.25" # SR-IOV Operator is available through OLM and is not part of the OCP release. -sriov_release="registry.redhat.io/openshift4/ose-sriov-network-operator-bundle:v4.20" +sriov_release="registry.redhat.io/openshift4/ose-sriov-network-operator-bundle:v4.21" opm_release="registry.redhat.io/redhat/redhat-operator-index:v4.20" APP_ID=$(cat /secrets/pr-creds/app_id) \ KEY=/secrets/pr-creds/key.pem \ diff --git a/scripts/auto-rebase/rebase_sriov.sh b/scripts/auto-rebase/rebase_sriov.sh index 6e1963698e..14695c87fc 100755 --- a/scripts/auto-rebase/rebase_sriov.sh +++ b/scripts/auto-rebase/rebase_sriov.sh @@ -339,9 +339,10 @@ patch_sriov_manifests() { select(.name == \"METRICS_EXPORTER_PROMETHEUS_OPERATOR_ENABLED\") ).value = \"false\" | - .spec.template.spec.containers[0].env += [ - {\"name\": \"CLUSTER_TYPE\", \"value\": \"kubernetes\"} - ] + ( + .spec.template.spec.containers[0].env[] | + select(.name == \"CLUSTER_TYPE\") + ).value = \"kubernetes\" " "${STAGING_SRIOV}/${OPERATOR_FILENAME}" } diff --git a/test/scenarios-bootc/el10/periodics/el102-src@optional.sh b/test/scenarios-bootc/el10/periodics/el102-src@optional.sh index e5d23dba99..9d609a1071 100644 --- a/test/scenarios-bootc/el10/periodics/el102-src@optional.sh +++ b/test/scenarios-bootc/el10/periodics/el102-src@optional.sh @@ -9,8 +9,7 @@ WEB_SERVER_URL="http://${VM_BRIDGE_IP}:${WEB_SERVER_PORT}" scenario_create_vms() { # Skip sriov network on ARM because the igb driver is not supported. - # TODO: Skip sriov on RHEL 10 until USHIFT-6400 is resolved. - local networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" #,sriov" + local networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK},sriov" if [[ "${UNAME_M}" =~ aarch64 ]]; then networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" fi @@ -24,8 +23,7 @@ scenario_remove_vms() { } scenario_run_tests() { - # TODO: Skip sriov on RHEL 10 until USHIFT-6400 is resolved. - local skip_args="--skip sriov" + local skip_args="" if [[ "${UNAME_M}" =~ aarch64 ]]; then skip_args="--skip sriov --skip tls-scanner" fi diff --git a/test/scenarios-bootc/el10/releases/el102-lrel@optional.sh b/test/scenarios-bootc/el10/releases/el102-lrel@optional.sh index ce6aa0be1d..a17d90753d 100644 --- a/test/scenarios-bootc/el10/releases/el102-lrel@optional.sh +++ b/test/scenarios-bootc/el10/releases/el102-lrel@optional.sh @@ -13,8 +13,7 @@ scenario_create_vms() { exit_if_image_not_found "${start_image}" # Skip sriov network on ARM because the igb driver is not supported. - # TODO: Skip sriov on RHEL 10 until USHIFT-6400 is resolved. - local networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" #,sriov" + local networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK},sriov" if [[ "${UNAME_M}" =~ aarch64 ]]; then networks="${VM_MULTUS_NETWORK},${VM_MULTUS_NETWORK}" fi @@ -33,8 +32,7 @@ scenario_remove_vms() { scenario_run_tests() { exit_if_image_not_found "${start_image}" - # TODO: Skip sriov on RHEL 10 until USHIFT-6400 is resolved. - local skip_args="--skip sriov" + local skip_args="" if [[ "${UNAME_M}" =~ aarch64 ]]; then skip_args="--skip sriov --skip tls-scanner" fi