Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=26
KUBE_GIT_VERSION=v1.26.0
KUBE_GIT_VERSION=v1.26.3
KUBE_GIT_COMMIT=b40493584076fb1ab29f3bed1d05d16cbc5b17f1
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.13.0-0.nightly-arm64-2023-05-02-214748
OCP_VERSION := 4.13.0-0.nightly-arm64-2023-05-16-183144
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.13.0-0.nightly-2023-05-02-134729
OCP_VERSION := 4.13.0-0.nightly-2023-05-16-154455
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.13.0-0.nightly-arm64-2023-05-02-214748"
"base": "4.13.0-0.nightly-arm64-2023-05-16-183144"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25b1bb086a4eee276897911075a9034ddbf44d2ccce39c3c4b79cc59bfb6f226",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.13.0-0.nightly-2023-05-02-134729"
"base": "4.13.0-0.nightly-2023-05-16-154455"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:800f0bb464dc9d622c3a670e503bee267670395c9bea0fb6247737b6f826ba7d",
Expand Down
42 changes: 9 additions & 33 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,33 +1,9 @@
# cluster-kube-controller-manager-operator embedded-component cdde94837bec1810dbad71ca070a84f212de0cbb to 9f53628279a765cccb234b1ef992075ad7cddf96
575641955b551b25f46d9a488e6b628586059f73 2023-04-06T11:51:33-06:00 STOR-1287: make imports more consistent, add env only to KCM
34bb79751d8e539538c505f4a611f377be724861 2023-04-05T17:05:54-06:00 STOR-1287: KCMO and MCO must set env var for CSI migration
efbc7b8f1e7326a05a8900ca2dff489d355cd942 2023-03-31T14:45:03-06:00 STOR-1267: Bump openshift/api
# cluster-policy-controller embedded-component d02c85ab3203fe22eddcc4694e17504ef34935de to 20a47733b59ba746aa3c6410dca2d1a1ab6339de
75fbc68ef756126cf0f44ea700ca614a5fa99526 2023-04-06T09:24:30+00:00 fixup! psalabelsyncer: handle empty namespace of a rolebinding subject
55b7373652b533381ca2a38ff774ab4fc49194f5 2023-04-06T09:24:30+00:00 psalabelsyncer: handle empty namespace of a rolebinding subject
# kubernetes embedded-component 379cd9f22597a7a7f6ea57471f590c1abf01ce92 to b40493584076fb1ab29f3bed1d05d16cbc5b17f1
67514bd97ffc19c35df84a3bd5143091f05728aa 2023-04-18T10:42:09-06:00 UPSTREAM: <carry>: STOR-1270: Admission plugin to deny deletion of storages.operator.openshift.io
152fe4e59b4c1270cdd7db47f38c4a740e9f3467 2023-04-18T10:42:09-06:00 UPSTREAM: <carry>: STOR-1270: Enable CSI migration configuration via env vars
ee8faf43953bfecc4ef2c2725cd5688a774e4493 2023-04-18T10:42:09-06:00 UPSTREAM: <carry>: STOR-1270: Restore carry patch that enables CSI migration in any order
8d0fd272f6d4ff78d58bc249e914c3c8e8f68384 2023-04-18T10:41:47-06:00 UPSTREAM: 116396: Unlock CSIMigrationvSphere feature gate until there is a supported vSphere CSI driver available
# machine-config-operator embedded-component 35b049f9d3eaac15fdf6632e2ecd8cf55bd539e3 to 70aa0a560c0b0a01093f695cb358a8749d30b3d2
c5705132563d12a4c6648d07bd1779acf84bd991 2023-04-19T17:49:10+00:00 Revert "openshift-azure-routes: Avoid synchronizing too quickly"
2bdde549f884a035a95463ab7a81e455908a07aa 2023-04-19T17:49:10+00:00 Do not trigger openshift-azure-routes service based on file existence
7f43eafb0a8cd942be74e8944a7fecf0e6a5bd7b 2023-04-17T04:12:34-04:00 add a bootstrap e2e test for Storage CR
31ce8359c4aebdea9c7ca6e18bbe411872d75509 2023-04-12T16:21:39-04:00 add handling for Storage CR and vSphere CSI migration
bd7ecc7e0aeb23121dd2b6782cfd57c15db7b9ab 2023-04-04T14:17:25-04:00 update vendor for openshift/api
# ovn-kubernetes image-amd64 e3bef98aa599a90a7f24ab077e7b979d688eb537 to 49f6f059507ed04116d91d8f9e8dadd6fd1978d9
49cca4708e73f4bbee3960e761dfe82049032837 2023-04-20T15:19:44-04:00 clustermanager: update node annotations on dual->single stack converstion
d9beb4c5423411354404858ed3590e0c53d32225 2023-04-20T15:19:36-04:00 Cannot create routed secondary network with an IPv6 subnet
a37fa030cf89edd729f8c38a7173328c2776f478 2023-04-20T14:15:43-04:00 Small cleanups to log messages and test suite name
1e95c2ca8c55c575d0e4384166c88d1265af4104 2023-04-06T10:43:17+02:00 Delete equivalent ACLs when searching by predicate.
ccf1a4b36b8cfcdb5989fed29819a8eb795da5fb 2023-03-30T15:21:45+02:00 Fix default node network controller initialization
e9ccb2057db4aa000d376e05483da92579d56db5 2023-03-30T15:17:21+02:00 Node healthz server: return unhealthy when pod is to be deleted
# kubernetes image-amd64 379cd9f22597a7a7f6ea57471f590c1abf01ce92 to b40493584076fb1ab29f3bed1d05d16cbc5b17f1
67514bd97ffc19c35df84a3bd5143091f05728aa 2023-04-18T10:42:09-06:00 UPSTREAM: <carry>: STOR-1270: Admission plugin to deny deletion of storages.operator.openshift.io
152fe4e59b4c1270cdd7db47f38c4a740e9f3467 2023-04-18T10:42:09-06:00 UPSTREAM: <carry>: STOR-1270: Enable CSI migration configuration via env vars
ee8faf43953bfecc4ef2c2725cd5688a774e4493 2023-04-18T10:42:09-06:00 UPSTREAM: <carry>: STOR-1270: Restore carry patch that enables CSI migration in any order
8d0fd272f6d4ff78d58bc249e914c3c8e8f68384 2023-04-18T10:41:47-06:00 UPSTREAM: 116396: Unlock CSIMigrationvSphere feature gate until there is a supported vSphere CSI driver available
# ovn-kubernetes image-arm64 e114945aeb8f405413f695673bdc0df605ac65a5 to 49f6f059507ed04116d91d8f9e8dadd6fd1978d9
ccf1a4b36b8cfcdb5989fed29819a8eb795da5fb 2023-03-30T15:21:45+02:00 Fix default node network controller initialization
e9ccb2057db4aa000d376e05483da92579d56db5 2023-03-30T15:17:21+02:00 Node healthz server: return unhealthy when pod is to be deleted
# cluster-ingress-operator embedded-component 6aa482c551de22016dc2b6c87ca11ef4ac2be04d to 7262c34b3a6434b49851ff5f0cceec87a2ee9706
7015b26e3144dd744059a96e191763fe7aa694dc 2023-05-05T12:25:24+00:00 OCPBUGS-12913: Deflake TestRouterCompressionOperation
e0078fd9c69ac1d901456eaefdc802cd7fad8bf7 2023-05-03T19:55:53+00:00 waitForDeploymentCompleteWithOldPodTermination fix
2e514cb78daba4ac79ab6586fa0206c4db34cc58 2023-05-03T19:55:53+00:00 Rename waitForDeploymentCompleteWithCleanup to waitForDeploymentCompleteWithOldPodTermination
7bc9214b66b07c0301835eef7bccbbd19f8bcd8e 2023-05-03T19:55:53+00:00 Fix TestClientTLS: Wait for old router pods to be cleaned up before testing new mTLS config
# cluster-network-operator embedded-component 823319ac7f3f51593a0956d5ba44e9f385f4e6cf to fed9560d379fa9e178441642a69746a126ac39b5
7ec99008e321deaa249e10ed14456e63f7a43ca1 2023-04-27T13:49:01+00:00 rbac: ovn-kubernetes: add aggregate-to-cluster-reader permissions
# machine-config-operator embedded-component 70aa0a560c0b0a01093f695cb358a8749d30b3d2 to f2cdca82301940d827f763dcdeaeb1d860c0bf6d
03479518cf796fdabe761d346351040d927f20b5 2023-05-09T16:29:08+00:00 daemon: event only on actual OS updates
6 changes: 3 additions & 3 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
https://github.com/openshift/cluster-dns-operator embedded-component d96022a4d0d091955d73e7e99fc8cc81db56c86a
https://github.com/openshift/cluster-ingress-operator embedded-component 6aa482c551de22016dc2b6c87ca11ef4ac2be04d
https://github.com/openshift/cluster-ingress-operator embedded-component 7262c34b3a6434b49851ff5f0cceec87a2ee9706
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 02ea4a4120dd0f8eb49d070b1fe420ed6d1debba
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 9f53628279a765cccb234b1ef992075ad7cddf96
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component dc5cba57ddcdb5a4b43240d1c2ab908fa953d887
https://github.com/openshift/cluster-network-operator embedded-component 823319ac7f3f51593a0956d5ba44e9f385f4e6cf
https://github.com/openshift/cluster-network-operator embedded-component fed9560d379fa9e178441642a69746a126ac39b5
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9a8aba8cad6491a31e743a7e366d758351482d88
https://github.com/openshift/cluster-policy-controller embedded-component 20a47733b59ba746aa3c6410dca2d1a1ab6339de
https://github.com/openshift/etcd embedded-component f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d
https://github.com/openshift/kubernetes embedded-component b40493584076fb1ab29f3bed1d05d16cbc5b17f1
https://github.com/openshift/machine-config-operator embedded-component 70aa0a560c0b0a01093f695cb358a8749d30b3d2
https://github.com/openshift/machine-config-operator embedded-component f2cdca82301940d827f763dcdeaeb1d860c0bf6d
https://github.com/openshift/openshift-controller-manager embedded-component 87de83867ac51730f506138ee790a56ca21d9fc9
https://github.com/openshift/route-controller-manager embedded-component d7a8e22db412b6fabb7028ca0da8de8f3d9ac3c3
https://github.com/openshift/service-ca-operator embedded-component 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-05-02-134729" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-05-02-214748" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-05-16-154455" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-05-16-183144" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"