From 7d1e9db661be217a930e2f00303b2c35c3a946d2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 3 Jul 2023 05:08:44 +0000 Subject: [PATCH 1/4] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index e929f41c3f..084309a0a3 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-29-065352" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-29-194122" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2023-06-30-131338" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2023-06-30-080147" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12" From 546ec0e8ddcdfaf205a9fedb7ef54e7ec2166c78 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 3 Jul 2023 05:08:45 +0000 Subject: [PATCH 2/4] update changelog --- scripts/auto-rebase/changelog.txt | 105 ++++++++++++++++++++++++++---- scripts/auto-rebase/commits.txt | 6 +- 2 files changed, 95 insertions(+), 16 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 9bfd77cdc4..c6825980ae 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,16 +1,95 @@ -- cluster-dns-operator embedded-component 5c85a318807b790705c16816f5022d0cc31148ba to 47be7b57fbc7eecdd91bc3960f6bc4d7d0304133 - - f2508c3 2023-06-21T08:35:51-04:00 OCPBUGS-14395: Set controller-runtime logger to a null logger +- cluster-ingress-operator embedded-component d0be04b7aff1bf56d36b9753019e3000cab1c179 to 4c92a6d1ee80b6b120dd750855a40145a530153c + - 8ad42fa 2023-06-28T23:12:25-04:00 OCPBUGS-15100 Add the trailing dot to the hostname if missing, early enough so that all references use the trailing dot. Update hashed DNS record names in unit tests. -- cluster-ingress-operator embedded-component ecb3786b1397cb93865952c98db72d1990587bd0 to d0be04b7aff1bf56d36b9753019e3000cab1c179 - - 8a61255 2023-06-28T10:11:07-04:00 OCPBUGS-14396: Set controller-runtime logger to a null logger for E2E - - 047bd98 2023-06-26T10:29:51-04:00 OCPBUGS-14998: Only use RoleARN for Route53 API +- ovn-kubernetes image-amd64 fb1c5655ec121f3f08eb0f2013e0d4252f8d982b to 083b00f6bef560b5c8deddcf5485894b46dfcb77 + - 1c8cd59 2023-06-28T16:59:22-04:00 Fixes ovnkube-controller not waiting for zone + - 5461292 2023-06-28T16:09:21-04:00 ovspinning: use klog.Infof() instead of klog.Info() + - 404ed91 2023-06-28T16:32:01+00:00 Fix bad error logs in egressip e2e tests + - c089c2e 2023-06-28T14:35:32+02:00 Fix bad expected NAT on egressip unit test flake + - 462815d 2023-06-28T13:36:58+02:00 APB: Use label selector to match against namespace labels + - b7ac83a 2023-06-28T13:36:58+02:00 Add static hops when a new pod is added to a target namespace + - 9ebefc4 2023-06-28T13:36:58+02:00 Add check to validate if an event to a namespace impacts a namespace selector in a dynamic hop and queue the impacted policy + - 127c20c 2023-06-28T13:36:58+02:00 APB node controller: Store policy as key in the queue + - 70161d4 2023-06-28T13:36:58+02:00 Consolidate gateway IPs from static and dynamic hops before deleting them and update log levels. + - fc5d3df 2023-06-28T13:36:58+02:00 APB Controllers: use single loop level driven model + - f21d8ee 2023-06-28T11:11:31+00:00 Don't run commands workflow if not a command + - 01a2c4d 2023-06-28T10:49:17+02:00 Skip adding service flows to gateway bridge when no uplink in the bridge + - 1541b58 2023-06-28T00:37:36-04:00 Fixes panic with delete NAT operations + - 812f44e 2023-06-28T00:25:48+02:00 Don't enable multicast querier on transit switches. + - 4622d61 2023-06-27T17:42:45-04:00 Do not restart ovn-controller if encap IP doesn't change + - 64758a4 2023-06-27T17:34:22+00:00 Delete cleanup action + - a53550f 2023-06-27T17:34:05+00:00 Limit per-PR concurrency for the ovn-ci workflow + - 046e0e9 2023-06-27T16:10:24+02:00 EgressService: Do not try to remove the chain creation rule on startup + - 3c6a56c 2023-06-27T09:28:01-04:00 delete dead code from util/ovs, init() had impact on performance without being used by anyone + - ad7df09 2023-06-27T09:28:01-04:00 syncNodesPeriodic: get nodes from cache. Use nodeName lists for syncChassis to make sure cache objects are not modified. + - a5e770e 2023-06-26T22:06:24-04:00 Remove duplicate e2e control-plane job + - 9b50dd7 2023-06-26T22:04:15-04:00 test_syncNodes: Fix sync nodes to not remove transit switch + - 01ea116 2023-06-26T22:04:06-04:00 egressip_test: fix expected db after pod deletion flake + - e832ede 2023-06-26T17:03:33-04:00 Fix sync nodes to not remove transit switch + - 2dcddda 2023-06-26T11:31:03-04:00 Fixes dualstack check in e2e tests + - 253da92 2023-06-26T11:31:03-04:00 Clean up egress IP e2e tests + - 30f0661 2023-06-26T11:31:03-04:00 Fix e2e control plane tests to use wrapped framework + - d7b28e0 2023-06-24T00:48:37-04:00 Fixup for IC related changes + - cf116ea 2023-06-24T00:48:37-04:00 Split external gateway tests to their own CI lanes + - ee5ee70 2023-06-24T00:48:37-04:00 Add check to ensure the pod's node is in the same local zone when deleting the pod SNAT + - 5490d97 2023-06-24T00:48:37-04:00 Add Interconnect support in APB External Routecontroller and legacy Egress GW + - 7a43438 2023-06-24T00:48:37-04:00 Revert "Skip APB External Route tests in e2e when IC is enabled" + - 6e1a04d 2023-06-23T19:28:38+02:00 Delete POD IPs from the global EgressService address set + - 4dedbd9 2023-06-22T21:09:56-04:00 APB: remove init policy cache in repair.go + - 95397a2 2023-06-22T20:46:36+00:00 Trivial: add debug log when ensuring the pod zone + - b0c47f6 2023-06-22T20:26:27+00:00 Fix IC local -> remote + - 487bba3 2023-06-22T20:26:27+00:00 Improve syncNodes to remove stale data + - ee6a035 2023-06-22T12:53:07-04:00 Moved controllerName as parameter to northBound client + - ad985d2 2023-06-22T12:31:06-04:00 Fix libovsdbops panic when testing apb external controller due to empty controllerName value + - 074ff6e 2023-06-21T22:07:30-04:00 Fixes control plane shared gateway jobs + - 198c316 2023-06-21T17:48:33-04:00 Fix egressFirewall cleanup on failed Add. Return nil instead of error when egressFirewall is not found on delete. + - b5df6f4 2023-06-16T14:44:18+00:00 Don't run command jobs concurrently for a PR + - e4d4014 2023-06-12T15:28:05-05:00 pods: ensure Cluster and Service CIDR traffic always go to OVN interface + - 4763c62 2023-06-12T15:27:09-05:00 pods: always add join subnet route to pod network namespace -- machine-config-operator embedded-component fc79ca7b7ccb23ec588aeb4a73901ca0730340b4 to 63eb79470dd6f29d07535770d194f23ee83afc04 - - 7b4cf162 2023-06-27T13:59:38-05:00 trivial: Fix namespace for kube api server operator - - 4aaf3bf8 2023-06-27T16:10:48+02:00 OWNERS: Update onwer list - - 79aa10bd 2023-06-27T12:47:41+02:00 removing verbose logs - - 88314ccb 2023-06-26T22:27:34+02:00 fixed glog - - 7ca06b8c 2023-06-26T22:21:47+02:00 fixed klog - - c3f5e62d 2023-06-26T19:47:21+02:00 Deleting SSH keys / password hashes should not degrade MachineConfigPool / node - - ace637f5 2023-06-23T15:53:47-04:00 Switch default SA to machine-config-operator +- ovn-kubernetes image-arm64 fb1c5655ec121f3f08eb0f2013e0d4252f8d982b to 083b00f6bef560b5c8deddcf5485894b46dfcb77 + - 1c8cd59 2023-06-28T16:59:22-04:00 Fixes ovnkube-controller not waiting for zone + - 5461292 2023-06-28T16:09:21-04:00 ovspinning: use klog.Infof() instead of klog.Info() + - 404ed91 2023-06-28T16:32:01+00:00 Fix bad error logs in egressip e2e tests + - c089c2e 2023-06-28T14:35:32+02:00 Fix bad expected NAT on egressip unit test flake + - 462815d 2023-06-28T13:36:58+02:00 APB: Use label selector to match against namespace labels + - b7ac83a 2023-06-28T13:36:58+02:00 Add static hops when a new pod is added to a target namespace + - 9ebefc4 2023-06-28T13:36:58+02:00 Add check to validate if an event to a namespace impacts a namespace selector in a dynamic hop and queue the impacted policy + - 127c20c 2023-06-28T13:36:58+02:00 APB node controller: Store policy as key in the queue + - 70161d4 2023-06-28T13:36:58+02:00 Consolidate gateway IPs from static and dynamic hops before deleting them and update log levels. + - fc5d3df 2023-06-28T13:36:58+02:00 APB Controllers: use single loop level driven model + - f21d8ee 2023-06-28T11:11:31+00:00 Don't run commands workflow if not a command + - 01a2c4d 2023-06-28T10:49:17+02:00 Skip adding service flows to gateway bridge when no uplink in the bridge + - 1541b58 2023-06-28T00:37:36-04:00 Fixes panic with delete NAT operations + - 812f44e 2023-06-28T00:25:48+02:00 Don't enable multicast querier on transit switches. + - 4622d61 2023-06-27T17:42:45-04:00 Do not restart ovn-controller if encap IP doesn't change + - 64758a4 2023-06-27T17:34:22+00:00 Delete cleanup action + - a53550f 2023-06-27T17:34:05+00:00 Limit per-PR concurrency for the ovn-ci workflow + - 046e0e9 2023-06-27T16:10:24+02:00 EgressService: Do not try to remove the chain creation rule on startup + - 3c6a56c 2023-06-27T09:28:01-04:00 delete dead code from util/ovs, init() had impact on performance without being used by anyone + - ad7df09 2023-06-27T09:28:01-04:00 syncNodesPeriodic: get nodes from cache. Use nodeName lists for syncChassis to make sure cache objects are not modified. + - a5e770e 2023-06-26T22:06:24-04:00 Remove duplicate e2e control-plane job + - 9b50dd7 2023-06-26T22:04:15-04:00 test_syncNodes: Fix sync nodes to not remove transit switch + - 01ea116 2023-06-26T22:04:06-04:00 egressip_test: fix expected db after pod deletion flake + - e832ede 2023-06-26T17:03:33-04:00 Fix sync nodes to not remove transit switch + - 2dcddda 2023-06-26T11:31:03-04:00 Fixes dualstack check in e2e tests + - 253da92 2023-06-26T11:31:03-04:00 Clean up egress IP e2e tests + - 30f0661 2023-06-26T11:31:03-04:00 Fix e2e control plane tests to use wrapped framework + - d7b28e0 2023-06-24T00:48:37-04:00 Fixup for IC related changes + - cf116ea 2023-06-24T00:48:37-04:00 Split external gateway tests to their own CI lanes + - ee5ee70 2023-06-24T00:48:37-04:00 Add check to ensure the pod's node is in the same local zone when deleting the pod SNAT + - 5490d97 2023-06-24T00:48:37-04:00 Add Interconnect support in APB External Routecontroller and legacy Egress GW + - 7a43438 2023-06-24T00:48:37-04:00 Revert "Skip APB External Route tests in e2e when IC is enabled" + - 6e1a04d 2023-06-23T19:28:38+02:00 Delete POD IPs from the global EgressService address set + - 4dedbd9 2023-06-22T21:09:56-04:00 APB: remove init policy cache in repair.go + - 95397a2 2023-06-22T20:46:36+00:00 Trivial: add debug log when ensuring the pod zone + - b0c47f6 2023-06-22T20:26:27+00:00 Fix IC local -> remote + - 487bba3 2023-06-22T20:26:27+00:00 Improve syncNodes to remove stale data + - ee6a035 2023-06-22T12:53:07-04:00 Moved controllerName as parameter to northBound client + - ad985d2 2023-06-22T12:31:06-04:00 Fix libovsdbops panic when testing apb external controller due to empty controllerName value + - 074ff6e 2023-06-21T22:07:30-04:00 Fixes control plane shared gateway jobs + - 198c316 2023-06-21T17:48:33-04:00 Fix egressFirewall cleanup on failed Add. Return nil instead of error when egressFirewall is not found on delete. + - b5df6f4 2023-06-16T14:44:18+00:00 Don't run command jobs concurrently for a PR + - e4d4014 2023-06-12T15:28:05-05:00 pods: ensure Cluster and Service CIDR traffic always go to OVN interface + - 4763c62 2023-06-12T15:27:09-05:00 pods: always add join subnet route to pod network namespace diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 99f801919c..41e5c1c3e0 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,5 +1,5 @@ https://github.com/openshift/cluster-dns-operator embedded-component 47be7b57fbc7eecdd91bc3960f6bc4d7d0304133 -https://github.com/openshift/cluster-ingress-operator embedded-component d0be04b7aff1bf56d36b9753019e3000cab1c179 +https://github.com/openshift/cluster-ingress-operator embedded-component 4c92a6d1ee80b6b120dd750855a40145a530153c https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 8b642494e3bffc365cb24383b416dc0f530547d9 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 5f49f59c88c963d97dd90643e7c9fb7ef1820d0c https://github.com/openshift/cluster-kube-scheduler-operator embedded-component db92b6d9fcf410aa24efc4a70c4114925bb7b797 @@ -16,13 +16,13 @@ https://github.com/openshift/oc image-amd64 c078876cc5aa434a02f14c28b8c2a56b9011 https://github.com/openshift/coredns image-amd64 a2c62dd3976b27d6a45e273532c63ba914700917 https://github.com/openshift/router image-amd64 0cd9a58dff77127562f7851ccfa5cda79b8cef48 https://github.com/openshift/kube-rbac-proxy image-amd64 86f31e2de5221ed4acd6509fa7a010a286089f1f -https://github.com/openshift/ovn-kubernetes image-amd64 fb1c5655ec121f3f08eb0f2013e0d4252f8d982b +https://github.com/openshift/ovn-kubernetes image-amd64 083b00f6bef560b5c8deddcf5485894b46dfcb77 https://github.com/openshift/kubernetes image-amd64 ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc https://github.com/openshift/service-ca-operator image-amd64 f0bd313003d3d79593b44936fb7cf0bab2a6daae https://github.com/openshift/oc image-arm64 c078876cc5aa434a02f14c28b8c2a56b9011aa13 https://github.com/openshift/coredns image-arm64 a2c62dd3976b27d6a45e273532c63ba914700917 https://github.com/openshift/router image-arm64 0cd9a58dff77127562f7851ccfa5cda79b8cef48 https://github.com/openshift/kube-rbac-proxy image-arm64 86f31e2de5221ed4acd6509fa7a010a286089f1f -https://github.com/openshift/ovn-kubernetes image-arm64 fb1c5655ec121f3f08eb0f2013e0d4252f8d982b +https://github.com/openshift/ovn-kubernetes image-arm64 083b00f6bef560b5c8deddcf5485894b46dfcb77 https://github.com/openshift/kubernetes image-arm64 ab0b8ee0d340f945f4bb4dabeef1bffa5fe5c6cc https://github.com/openshift/service-ca-operator image-arm64 f0bd313003d3d79593b44936fb7cf0bab2a6daae From 6afeae66a5a9a778c5791c2ce55815d93145c7f2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 3 Jul 2023 05:09:51 +0000 Subject: [PATCH 3/4] update manifests --- assets/release/release-aarch64.json | 4 ++-- assets/release/release-x86_64.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 0b489fdc00..cf0609af7f 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-arm64-2023-06-29-194122" + "base": "4.14.0-0.nightly-arm64-2023-06-30-080147" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc2b279b251166d1978be5fe6f6a94b613f312c6448380a77fe4b3e43340d71b", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb374be3ee4ac94a1ab443bb78f480dd11343040e54c5dca2c478d86059cc93e", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8677e225aa0c3b5723a9f6a98b150741cae39a7ded6118fbd55c1f3ca3cfe047", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d38af8ed6e97ed3b6c9ed14b189a9c7a85a35fd918e39e9d719cf0b11b08aa2f", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a80f61abe8c9ef0cc7cae43a33327da83d33dc865166736c59291c626ad0ca35", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8846cd5580cc1a21db010315cc3121a0327ec8f73c56ce2c087c49b929458db9", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4a852e9f278f8607be23385aea58a1db7d57f8d55546105c136e40c750b4da5", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 4e304752b9..3c04114590 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.14.0-0.nightly-2023-06-29-065352" + "base": "4.14.0-0.nightly-2023-06-30-131338" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b1fff8a7fbb0b7fef1ef652ffb95bd6fc61e8213338675d46bb455bd5be8bee", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5981b2e712b11e970bdd6554de2d9efc84309ea8be998ab63cce7b809525f5f", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cba7ed34cadb57ab09423273867ccbeb1384aa972bba62351e8aa26d8e20da64", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bfc7a60a69092d7b241fb93a2b00f6ecaff9fd1a0af1e277ee3512babdccf47", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30280732ee603a5c2ce900d70bb4d98ff3f9ed07edd7507b394d84c3d675ba80", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43299e6626796045fcd8843b29b1c679648669bea85925c685144e48f40bd776", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56fd6fd4410bb243c8500e7b88caaee2c07df43af0427ae506bd6a74ffb257ae", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", From afd4c9a8efa0fc16b520c078aba07b951e3b0b25 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 3 Jul 2023 05:09:53 +0000 Subject: [PATCH 4/4] update buildfiles --- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index bb3fc97dfa..e823d21a6e 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-arm64-2023-06-29-194122 +OCP_VERSION := 4.14.0-0.nightly-arm64-2023-06-30-080147 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index feb55c4a9f..c508fb5e89 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.14.0-0.nightly-2023-06-29-065352 +OCP_VERSION := 4.14.0-0.nightly-2023-06-30-131338