Skip to content

Commit 93c25ae

Browse files
authored
Merge pull request #669 from ingvagabund/sync-with-release-4.20
no-jira: Sync with release 4.20
2 parents 10db985 + d74cb9c commit 93c25ae

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Run the descheduler in your OpenShift cluster to move pods based on specific str
1414
| 5.1.2 | 4.17, 4.18 | 1.31 | 1.22 |
1515
| 5.1.3 | 4.17, 4.18 | 1.31 | 1.22 |
1616
| 5.2.0 | 4.19, 4.20 | 1.32 | 1.23 |
17+
| 5.3.0 | 4.20, 4.21 | 1.33 | 1.24 |
1718

1819
## Rebase instruction
1920

bundle.Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ LABEL com.redhat.component="kube-descheduler-operator-bundle-container"
3636
LABEL description="Descheduler support for OpenShift based on RHEL 9"
3737
LABEL distribution-scope="public"
3838
LABEL name="cluster-kube-descheduler-operator-metadata-rhel-9"
39-
LABEL release="5.2.0"
40-
LABEL version="5.2.0"
39+
LABEL release="5.3.0"
40+
LABEL version="5.3.0"
4141
LABEL url="https://github.com/openshift/cluster-kube-descheduler-operator"
4242
LABEL vendor="Red Hat, Inc."
4343
LABEL summary="Descheduler support for OpenShift"
@@ -46,7 +46,7 @@ LABEL io.k8s.display-name="kube-descheduler-operator based on RHEL 9"
4646
LABEL io.k8s.description="Descheduler support for OpenShift based on RHEL 9"
4747
LABEL io.openshift.tags="openshift,kube-descheduler-operator"
4848
LABEL com.redhat.delivery.operator.bundle=true
49-
LABEL com.redhat.openshift.versions="v4.19"
49+
LABEL com.redhat.openshift.versions="v4.20"
5050
LABEL com.redhat.delivery.appregistry=true
5151
LABEL maintainer="AOS workloads team, <[email protected]>"
5252

manifests/cluster-kube-descheduler-operator.clusterserviceversion.yaml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1
22
kind: ClusterServiceVersion
33
metadata:
44
# The version value is substituted by the ART pipeline
5-
name: clusterkubedescheduleroperator.v5.2.0
5+
name: clusterkubedescheduleroperator.v5.3.0
66
namespace: openshift-kube-descheduler-operator
77
labels:
88
operatorframework.io/arch.amd64: supported
@@ -29,7 +29,7 @@ metadata:
2929
]
3030
certified: "false"
3131
containerImage: registry-proxy.engineering.redhat.com/rh-osbs/kube-descheduler-operator-rhel-9:latest
32-
createdAt: 2025/05/12
32+
createdAt: 2025/08/27
3333
features.operators.openshift.io/disconnected: "true"
3434
features.operators.openshift.io/fips-compliant: "true"
3535
features.operators.openshift.io/proxy-aware: "false"
@@ -40,7 +40,7 @@ metadata:
4040
features.operators.openshift.io/cnf: "false"
4141
features.operators.openshift.io/cni: "false"
4242
features.operators.openshift.io/csi: "false"
43-
olm.skipRange: ">=5.1.0 <5.2.0"
43+
olm.skipRange: ">=5.2.0 <5.3.0"
4444
description: An operator to run descheduler in Openshift cluster.
4545
repository: https://github.com/openshift/cluster-kube-descheduler-operator
4646
support: Red Hat, Inc.
@@ -51,7 +51,7 @@ metadata:
5151
operatorframework.io/suggested-namespace: "openshift-kube-descheduler-operator"
5252
console.openshift.io/operator-monitoring-default: "true"
5353
spec:
54-
replaces: clusterkubedescheduleroperator.v5.1.0
54+
replaces: clusterkubedescheduleroperator.v5.2.0
5555
# buffering up to 6 5.0.z releases to allow to include these in all supported bundle index images
5656
# The buffer len 6 should be sufficient for normal cadance. Including CVE releases.
5757
# The buffer can be extened later as needed.
@@ -69,6 +69,13 @@ spec:
6969
- clusterkubedescheduleroperator.v5.1.4
7070
- clusterkubedescheduleroperator.v5.1.5
7171
- clusterkubedescheduleroperator.v5.1.6
72+
- clusterkubedescheduleroperator.v5.2.0
73+
- clusterkubedescheduleroperator.v5.2.1
74+
- clusterkubedescheduleroperator.v5.2.2
75+
- clusterkubedescheduleroperator.v5.2.3
76+
- clusterkubedescheduleroperator.v5.2.4
77+
- clusterkubedescheduleroperator.v5.2.5
78+
- clusterkubedescheduleroperator.v5.2.6
7279
customresourcedefinitions:
7380
owned:
7481
- displayName: Kube Descheduler
@@ -117,7 +124,7 @@ spec:
117124
provider:
118125
name: Red Hat, Inc.
119126
maturity: beta
120-
version: 5.2.0
127+
version: 5.3.0
121128
relatedImages:
122129
- name: descheduler-operand
123130
image: registry-proxy.engineering.redhat.com/rh-osbs/descheduler-rhel-9:latest
@@ -132,10 +139,10 @@ spec:
132139
maintainers:
133140
134141
name: Red Hat
135-
minKubeVersion: 1.32.0
142+
minKubeVersion: 1.33.0
136143
labels:
137144
olm-owner-enterprise-app: cluster-kube-descheduler-operator
138-
olm-status-descriptors: cluster-kube-descheduler-operator.v5.2.0
145+
olm-status-descriptors: cluster-kube-descheduler-operator.v5.3.0
139146
installModes:
140147
- supported: true
141148
type: OwnNamespace
@@ -405,7 +412,7 @@ spec:
405412
- name: RELATED_IMAGE_SOFTTAINTER_IMAGE
406413
value: registry-proxy.engineering.redhat.com/rh-osbs/kube-descheduler-operator-rhel-9:latest
407414
- name: OPERAND_VERSION
408-
value: 5.2.0
415+
value: 5.3.0
409416
volumeMounts:
410417
- name: tmp
411418
mountPath: "/tmp"

0 commit comments

Comments
 (0)