Skip to content

Commit

Permalink
Merge pull request #950 from bn222/release-4.17
Browse files Browse the repository at this point in the history
OCPBUGS-36268: bump to 4.17
  • Loading branch information
openshift-merge-bot[bot] authored Jul 15, 2024
2 parents e78aa8e + 89a70b4 commit 8fc0b41
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion Makefile.bundle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include Makefile
# Current Operator version
VERSION ?= 4.16.0
VERSION ?= 4.17.0
# Default bundle image tag
BUNDLE_IMG ?= controller-bundle:$(VERSION)

Expand Down
28 changes: 14 additions & 14 deletions bundle/manifests/sriov-network-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ metadata:
capabilities: Basic Install
categories: Networking
certified: "false"
containerImage: quay.io/openshift/origin-sriov-network-operator:4.16
createdAt: "2024-07-03T10:39:35Z"
containerImage: quay.io/openshift/origin-sriov-network-operator:4.17
createdAt: "2024-05-30T16:54:58Z"
description: An operator for configuring SR-IOV components and initializing SRIOV
network devices in Openshift cluster.
features.operators.openshift.io/cnf: "false"
Expand All @@ -113,7 +113,7 @@ metadata:
features.operators.openshift.io/token-auth-aws: "false"
features.operators.openshift.io/token-auth-azure: "false"
features.operators.openshift.io/token-auth-gcp: "false"
olm.skipRange: '>=4.3.0-0 <4.16.0'
olm.skipRange: '>=4.3.0-0 <4.17.0'
operatorframework.io/initialization-resource: |-
{
"apiVersion": "sriovnetwork.openshift.io/v1",
Expand Down Expand Up @@ -150,7 +150,7 @@ metadata:
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.ppc64le: supported
name: sriov-network-operator.v4.16.0
name: sriov-network-operator.v4.17.0
namespace: openshift-sriov-network-operator
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -371,19 +371,19 @@ spec:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: SRIOV_CNI_IMAGE
value: quay.io/openshift/origin-sriov-cni:4.16
value: quay.io/openshift/origin-sriov-cni:4.17
- name: SRIOV_DEVICE_PLUGIN_IMAGE
value: quay.io/openshift/origin-sriov-network-device-plugin:4.16
value: quay.io/openshift/origin-sriov-network-device-plugin:4.17
- name: NETWORK_RESOURCES_INJECTOR_IMAGE
value: quay.io/openshift/origin-sriov-dp-admission-controller:4.16
value: quay.io/openshift/origin-sriov-dp-admission-controller:4.17
- name: OPERATOR_NAME
value: sriov-network-operator
- name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE
value: quay.io/openshift/origin-sriov-network-config-daemon:4.16
value: quay.io/openshift/origin-sriov-network-config-daemon:4.17
- name: SRIOV_NETWORK_WEBHOOK_IMAGE
value: quay.io/openshift/origin-sriov-network-webhook:4.16
value: quay.io/openshift/origin-sriov-network-webhook:4.17
- name: SRIOV_INFINIBAND_CNI_IMAGE
value: quay.io/openshift/origin-sriov-infiniband-cni:4.16
value: quay.io/openshift/origin-sriov-infiniband-cni:4.17
- name: RESOURCE_PREFIX
value: openshift.io
- name: ADMISSION_CONTROLLERS_ENABLED
Expand All @@ -405,8 +405,8 @@ spec:
fieldRef:
fieldPath: metadata.name
- name: RELEASE_VERSION
value: 4.16.0
image: quay.io/openshift/origin-sriov-network-operator:4.16
value: 4.17.0
image: quay.io/openshift/origin-sriov-network-operator:4.17
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down Expand Up @@ -581,7 +581,7 @@ spec:
- sriov
labels:
olm-owner-enterprise-app: sriov-network-operator
olm-status-descriptors: sriov-network-operator.v4.16.0
olm-status-descriptors: sriov-network-operator.v4.17.0
links:
- name: Source Code
url: https://github.com/k8snetworkplumbingwg/sriov-network-operator
Expand All @@ -590,4 +590,4 @@ spec:
name: Red Hat
provider:
name: Red Hat
version: 4.16.0
version: 4.17.0
16 changes: 8 additions & 8 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
operator: Exists
containers:
- name: sriov-network-operator
image: quay.io/openshift/origin-sriov-network-operator:4.16
image: quay.io/openshift/origin-sriov-network-operator:4.17
command:
- sriov-network-operator
args:
Expand All @@ -60,19 +60,19 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: SRIOV_CNI_IMAGE
value: quay.io/openshift/origin-sriov-cni:4.16
value: quay.io/openshift/origin-sriov-cni:4.17
- name: SRIOV_DEVICE_PLUGIN_IMAGE
value: quay.io/openshift/origin-sriov-network-device-plugin:4.16
value: quay.io/openshift/origin-sriov-network-device-plugin:4.17
- name: NETWORK_RESOURCES_INJECTOR_IMAGE
value: quay.io/openshift/origin-sriov-dp-admission-controller:4.16
value: quay.io/openshift/origin-sriov-dp-admission-controller:4.17
- name: OPERATOR_NAME
value: sriov-network-operator
- name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE
value: quay.io/openshift/origin-sriov-network-config-daemon:4.16
value: quay.io/openshift/origin-sriov-network-config-daemon:4.17
- name: SRIOV_NETWORK_WEBHOOK_IMAGE
value: quay.io/openshift/origin-sriov-network-webhook:4.16
value: quay.io/openshift/origin-sriov-network-webhook:4.17
- name: SRIOV_INFINIBAND_CNI_IMAGE
value: quay.io/openshift/origin-sriov-infiniband-cni:4.16
value: quay.io/openshift/origin-sriov-infiniband-cni:4.17
- name: RESOURCE_PREFIX
value: openshift.io
- name: ADMISSION_CONTROLLERS_ENABLED
Expand All @@ -94,4 +94,4 @@ spec:
fieldRef:
fieldPath: metadata.name
- name: RELEASE_VERSION
value: 4.16.0
value: 4.17.0
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
capabilities: Basic Install
categories: Networking
certified: "false"
containerImage: quay.io/openshift/origin-sriov-network-operator:4.16
containerImage: quay.io/openshift/origin-sriov-network-operator:4.17
createdAt: 2019/04/30
description: An operator for configuring SR-IOV components and initializing SRIOV
network devices in Openshift cluster.
Expand All @@ -20,7 +20,7 @@ metadata:
features.operators.openshift.io/token-auth-aws: "false"
features.operators.openshift.io/token-auth-azure: "false"
features.operators.openshift.io/token-auth-gcp: "false"
olm.skipRange: '>=4.3.0-0 <4.16.0'
olm.skipRange: '>=4.3.0-0 <4.17.0'
operatorframework.io/initialization-resource: |-
{
"apiVersion": "sriovnetwork.openshift.io/v1",
Expand Down Expand Up @@ -146,7 +146,7 @@ spec:
- sriov
labels:
olm-owner-enterprise-app: sriov-network-operator
olm-status-descriptors: sriov-network-operator.v4.16.0
olm-status-descriptors: sriov-network-operator.v4.17.0
links:
- name: Source Code
url: https://github.com/k8snetworkplumbingwg/sriov-network-operator
Expand All @@ -155,4 +155,4 @@ spec:
name: Red Hat
provider:
name: Red Hat
version: 4.16.0
version: 4.17.0
2 changes: 1 addition & 1 deletion manifests/sriov-network-operator.package.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
packageName: sriov-network-operator
channels:
- name: "stable"
currentCSV: sriov-network-operator.v4.16.0
currentCSV: sriov-network-operator.v4.17.0
14 changes: 7 additions & 7 deletions manifests/stable/image-references
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,28 @@ spec:
- name: sriov-network-operator
from:
kind: DockerImage
name: quay.io/openshift/origin-sriov-network-operator:4.16
name: quay.io/openshift/origin-sriov-network-operator:4.17
- name: sriov-network-config-daemon
from:
kind: DockerImage
name: quay.io/openshift/origin-sriov-network-config-daemon:4.16
name: quay.io/openshift/origin-sriov-network-config-daemon:4.17
- name: sriov-cni
from:
kind: DockerImage
name: quay.io/openshift/origin-sriov-cni:4.16
name: quay.io/openshift/origin-sriov-cni:4.17
- name: sriov-network-device-plugin
from:
kind: DockerImage
name: quay.io/openshift/origin-sriov-network-device-plugin:4.16
name: quay.io/openshift/origin-sriov-network-device-plugin:4.17
- name: sriov-dp-admission-controller
from:
kind: DockerImage
name: quay.io/openshift/origin-sriov-dp-admission-controller:4.16
name: quay.io/openshift/origin-sriov-dp-admission-controller:4.17
- name: sriov-network-webhook
from:
kind: DockerImage
name: quay.io/openshift/origin-sriov-network-webhook:4.16
name: quay.io/openshift/origin-sriov-network-webhook:4.17
- name: sriov-infiniband-cni
from:
kind: DockerImage
name: quay.io/openshift/origin-sriov-infiniband-cni:4.16
name: quay.io/openshift/origin-sriov-infiniband-cni:4.17
28 changes: 14 additions & 14 deletions manifests/stable/sriov-network-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ metadata:
capabilities: Basic Install
categories: Networking
certified: "false"
containerImage: quay.io/openshift/origin-sriov-network-operator:4.16
createdAt: "2024-07-03T10:39:35Z"
containerImage: quay.io/openshift/origin-sriov-network-operator:4.17
createdAt: "2024-05-30T16:54:58Z"
description: An operator for configuring SR-IOV components and initializing SRIOV
network devices in Openshift cluster.
features.operators.openshift.io/cnf: "false"
Expand All @@ -113,7 +113,7 @@ metadata:
features.operators.openshift.io/token-auth-aws: "false"
features.operators.openshift.io/token-auth-azure: "false"
features.operators.openshift.io/token-auth-gcp: "false"
olm.skipRange: '>=4.3.0-0 <4.16.0'
olm.skipRange: '>=4.3.0-0 <4.17.0'
operatorframework.io/initialization-resource: |-
{
"apiVersion": "sriovnetwork.openshift.io/v1",
Expand Down Expand Up @@ -150,7 +150,7 @@ metadata:
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.ppc64le: supported
name: sriov-network-operator.v4.16.0
name: sriov-network-operator.v4.17.0
namespace: openshift-sriov-network-operator
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -371,19 +371,19 @@ spec:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: SRIOV_CNI_IMAGE
value: quay.io/openshift/origin-sriov-cni:4.16
value: quay.io/openshift/origin-sriov-cni:4.17
- name: SRIOV_DEVICE_PLUGIN_IMAGE
value: quay.io/openshift/origin-sriov-network-device-plugin:4.16
value: quay.io/openshift/origin-sriov-network-device-plugin:4.17
- name: NETWORK_RESOURCES_INJECTOR_IMAGE
value: quay.io/openshift/origin-sriov-dp-admission-controller:4.16
value: quay.io/openshift/origin-sriov-dp-admission-controller:4.17
- name: OPERATOR_NAME
value: sriov-network-operator
- name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE
value: quay.io/openshift/origin-sriov-network-config-daemon:4.16
value: quay.io/openshift/origin-sriov-network-config-daemon:4.17
- name: SRIOV_NETWORK_WEBHOOK_IMAGE
value: quay.io/openshift/origin-sriov-network-webhook:4.16
value: quay.io/openshift/origin-sriov-network-webhook:4.17
- name: SRIOV_INFINIBAND_CNI_IMAGE
value: quay.io/openshift/origin-sriov-infiniband-cni:4.16
value: quay.io/openshift/origin-sriov-infiniband-cni:4.17
- name: RESOURCE_PREFIX
value: openshift.io
- name: ADMISSION_CONTROLLERS_ENABLED
Expand All @@ -405,8 +405,8 @@ spec:
fieldRef:
fieldPath: metadata.name
- name: RELEASE_VERSION
value: 4.16.0
image: quay.io/openshift/origin-sriov-network-operator:4.16
value: 4.17.0
image: quay.io/openshift/origin-sriov-network-operator:4.17
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down Expand Up @@ -581,7 +581,7 @@ spec:
- sriov
labels:
olm-owner-enterprise-app: sriov-network-operator
olm-status-descriptors: sriov-network-operator.v4.16.0
olm-status-descriptors: sriov-network-operator.v4.17.0
links:
- name: Source Code
url: https://github.com/k8snetworkplumbingwg/sriov-network-operator
Expand All @@ -590,4 +590,4 @@ spec:
name: Red Hat
provider:
name: Red Hat
version: 4.16.0
version: 4.17.0
4 changes: 2 additions & 2 deletions pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
var (
// Raw is the string representation of the version. This will be replaced
// with the calculated version at build time.
Raw = "v4.16.0"
Raw = "v4.17.0"

// Version is semver representation of the version.
Version = semver.MustParse("4.16.0")
Version = semver.MustParse("4.17.0")

// String is the human-friendly representation of the version.
String = fmt.Sprintf("SriovNetworkConfigOperator %s", Raw)
Expand Down

0 comments on commit 8fc0b41

Please sign in to comment.