Skip to content

Commit

Permalink
Merge pull request #1550 from openshift/rebase-4.12.0-0.nightly_amd64…
Browse files Browse the repository at this point in the history 
…-2023-03-22-232458_arm64-2023-03-22-233451

rebase-4.12.0-0.nightly_amd64-2023-03-22-232458_arm64-2023-03-22-233451
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Mar 23, 2023
2 parents 9c8b23b + b93382c commit 24ed533
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 12 deletions.
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-arm64-2023-03-21-212756"
"base": "4.12.0-0.nightly-arm64-2023-03-22-233451"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f29bf239c71887b07f481b1482444180827c2a85c9ccbe49049cc89388ed71a3",
Expand All @@ -13,7 +13,7 @@
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3fd455946b2d560d3b94e8f67da29ef9cc68a44dda18a656383402654b86aff7",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:606d01cb729ec2beecb44f01afad79ba02316071cf72977212b992b0f9b05c47",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0cbda39b6b749ceff0d50250f4392510e0faa6ea37fafc05710f17ab15177b7",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a935a0c2afc8376d7e276198666720577cbdeea9e60c26103d75a279227f5284",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e25c075cce5c677d15c7510fa6db6d301a1e05a3b1c1a682612a543c6a7a454",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ea2ee51af63638d0ab30712e80e19613ae59f001339ec491d9acf6df381fe72",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cce29e1ed642420af789112d8a690a03c22df515e16713f444bb0ca6724e338e"
}
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-x86_64.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"release": {
"base": "4.12.0-0.nightly-2023-03-15-163541"
"base": "4.12.0-0.nightly-2023-03-22-232458"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a45573281e6750075b942b58f14c977a2420fc8b85cafe29e75ed46b969228f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd5d25974e32c1b9f79be13d1034e4f21916f46b9d7eaf7b7d20ea2a75bfbd23",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bc1c378acc4c3c7b6e12b98cbe1f069d88b3b3eb9780acbf938003f289ab055",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01f84a78de43f2e932738b2924e0af49728f8ac362521179542952f98d62ea12",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b30aa7fc1920751620828d3c9aa38cc5f65c107b0f99de6d8f0565ad51ce4d58",
"lvms-topolvm": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38f0adf74a602371bddf928484dee323b834e580e4dab3087bb6d7b85718ea05",
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f0955ca0d477471e03d9847457cf7437c9307dc62c8b8c8ffba61e3ab6876d1",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd22ae8c0c2d989d7a71d6f25f41e740795a1092c61578ef9928f83e8bd9b94c",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3e6bed4d30d26c963796a3b34ebabc2bd37149608f343c8ea2910c80910d53a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50a7c08b2fecca4954f8c5a6b23b426f4a5c369c271e36fa8f4cbe8e6db285b7",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df9df42cd54206a3e505112dbc09b5d8be884f4b944882c05c1556dec4230693",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ebaf01d4701f52663fd6018da01f0f6b8a524cf82244cdc00ba41000e7b2eb3",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:354615838c447363e35c9721416d4bdaec72cb3bc00e3d37ccb50dfd0017e78b"
}
Expand Down
20 changes: 19 additions & 1 deletion scripts/auto-rebase/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,20 @@
# ovn-kubernetes image-arm64 da42356e194579af8be4c7367ebf250d6e97d78c to 34a028a1e17471a797662701c405e361dfcf7952
# cluster-network-operator embedded-component 6f5e144f260333ad0f70a88a55eab4fc81ecd7a2 to 41a8c00b633446c2ee05fc19b924240de2d8b18f
dcb9c4fd8f4f5d6e05f286154c74edf506db9baf 2023-03-15T10:23:47+00:00 HyperShift: Set priority class for CNCC
bd1a5dfce88be9eae38e990a19807eb84d685181 2023-03-15T10:23:47+00:00 HyperShift: Adapt affinity and tolerations
2693dff4ed419454ac3ee166ef3f7eda434fc3b1 2023-03-15T10:23:47+00:00 HyperShift: Co-locate CNCC and multus admission controller with other hcp pods
f0b1a5c9f0b5671e9f3036837ad42d5bcb1f3fde 2023-03-09T15:33:56+01:00 Set healthz-bind-address to 0.0.0.0:10256 for ovnk
f5829e9512e9fc889bbfc2cf7a0c695dc5cad803 2023-03-09T15:33:27+01:00 Pass POD_NAME to ovnkube node for node healthz server checks
e68f4544baf91dcd51d2040ed0ed77de31784b36 2023-02-28T09:07:48+00:00 Bug 2104997: add default noProxy config for Azure
# etcd embedded-component 978cfefd2f21c4ec1ac84ed95130cbff510fbe1b to 1f438849661e691748dc3b24fc373444439415b6
d9ba334e195930833bb7a70c99993491ca78c16a 2022-11-22T10:53:27+00:00 Updating ose-etcd images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/82677d9ecf22d7b5589bbcd83e507a10fb6a89c6/images/ose-etcd.yml
# machine-config-operator embedded-component 731341b89e72d53abb349aff98d09e281e471066 to f6c21976e39cf6cb9e2ca71141478d5e612fb53f
1d35900a3b929c2e8a2046b31d3a39e4f2aa9176 2023-03-17T18:45:41+00:00 daemon: Drop duplicate `--authfile` used in `run`
7c35afd89d49230379c0ecceec67253d1bdd533b 2023-03-15T22:35:59+00:00 Remove hard requirement for the afterburn from early-running aws-related services
# ovn-kubernetes image-amd64 1ec7d41fac8e6489013847a3b45bee4658b95d1a to b99f9300d6563ab4637941dd98e16c72297299e7
cc79d2606a14af32f36110e15eb316278f157355 2023-03-17T12:12:26+01:00 Move checkForStaleOVSInterfaces and related code to node.go
5ee65cb283570e5f8bedd549132369ea03782259 2023-03-13T12:53:13-04:00 Fully remove dependency on default gateway for services
f2b6a8d66ad3d53d1676276aeca899ae6fe8d34b 2023-03-09T13:14:54+01:00 node: add node healthz server for cloud load balancers
1a2774d35517757f73f7a2d974266f1bd09b203f 2023-03-09T12:57:05+01:00 node: split openflowManager and service health check code
048ece68d496f011c31bc80c25e7386ed7db7398 2023-02-23T23:25:27+00:00 [release-4.12] OCPBUGS-7732: Fix leak in service controller cache
# ovn-kubernetes image-arm64 34a028a1e17471a797662701c405e361dfcf7952 to b99f9300d6563ab4637941dd98e16c72297299e7
048ece68d496f011c31bc80c25e7386ed7db7398 2023-02-23T23:25:27+00:00 [release-4.12] OCPBUGS-7732: Fix leak in service controller cache
10 changes: 5 additions & 5 deletions scripts/auto-rebase/commits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 992b43b
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2076f3d0e4fea6fca54028ec7831407173ea81f5
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component b108134de5b1c7ef179fc523ffd62bc5898106a3
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 845ae423e831b1cacf0bcae5e6528f1d21b5ddf2
https://github.com/openshift/cluster-network-operator embedded-component 6f5e144f260333ad0f70a88a55eab4fc81ecd7a2
https://github.com/openshift/cluster-network-operator embedded-component 41a8c00b633446c2ee05fc19b924240de2d8b18f
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d1915d130481541b8bacb5b98eddbc1541809d0a
https://github.com/openshift/cluster-policy-controller embedded-component 139ac0499ac4d744023827ceb6d16aa6b467be27
https://github.com/openshift/etcd embedded-component 978cfefd2f21c4ec1ac84ed95130cbff510fbe1b
https://github.com/openshift/etcd embedded-component 1f438849661e691748dc3b24fc373444439415b6
https://github.com/openshift/kubernetes embedded-component eab9cc98fe4c002916621ace6cdd623afa519203
https://github.com/openshift/machine-config-operator embedded-component 731341b89e72d53abb349aff98d09e281e471066
https://github.com/openshift/machine-config-operator embedded-component f6c21976e39cf6cb9e2ca71141478d5e612fb53f
https://github.com/openshift/openshift-controller-manager embedded-component b6528f9ea28164af9f1ceea0e50f18116fe3c90e
https://github.com/openshift/route-controller-manager embedded-component 9e74d175e81ef6a2beb3718398e3fc99dded037c
https://github.com/openshift/service-ca-operator embedded-component 299b7097a49385fdd4f86eccedc07f3a192e2504
Expand All @@ -20,7 +20,7 @@ https://github.com/openshift/csi-livenessprobe image-amd64 720e1d6e3e828dec99080
https://github.com/openshift/csi-node-driver-registrar image-amd64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2
https://github.com/openshift/router image-amd64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33
https://github.com/openshift/kube-rbac-proxy image-amd64 513fd32175af4bb03f2e8a31030477e63380b5bc
https://github.com/openshift/ovn-kubernetes image-amd64 1ec7d41fac8e6489013847a3b45bee4658b95d1a
https://github.com/openshift/ovn-kubernetes image-amd64 b99f9300d6563ab4637941dd98e16c72297299e7
https://github.com/openshift/kubernetes image-amd64 eab9cc98fe4c002916621ace6cdd623afa519203
https://github.com/openshift/service-ca-operator image-amd64 299b7097a49385fdd4f86eccedc07f3a192e2504
https://github.com/openshift/oc image-arm64 846602e50eb29ecdc7441ebed2fc846048959eaa
Expand All @@ -31,6 +31,6 @@ https://github.com/openshift/csi-livenessprobe image-arm64 720e1d6e3e828dec99080
https://github.com/openshift/csi-node-driver-registrar image-arm64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2
https://github.com/openshift/router image-arm64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33
https://github.com/openshift/kube-rbac-proxy image-arm64 513fd32175af4bb03f2e8a31030477e63380b5bc
https://github.com/openshift/ovn-kubernetes image-arm64 34a028a1e17471a797662701c405e361dfcf7952
https://github.com/openshift/ovn-kubernetes image-arm64 b99f9300d6563ab4637941dd98e16c72297299e7
https://github.com/openshift/kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203
https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
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.12.0-0.nightly-2023-03-15-163541" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-21-212756"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-03-22-232458" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-22-233451"

0 comments on commit 24ed533

Please sign in to comment.