From 4434157b864fcbcf7b966ef8e568fdd9a430018a Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 3 Mar 2023 12:08:22 -0500 Subject: [PATCH 1/4] apply isort to rebase.py import list https://pycqa.github.io/isort/ --- scripts/auto-rebase/rebase.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/auto-rebase/rebase.py b/scripts/auto-rebase/rebase.py index 29d8cce575..586db1fa6c 100755 --- a/scripts/auto-rebase/rebase.py +++ b/scripts/auto-rebase/rebase.py @@ -1,16 +1,16 @@ #!/usr/bin/env python -import os -import sys import json import logging +import os import subprocess +import sys from collections import namedtuple +from pathlib import Path from timeit import default_timer as timer -from git import Repo, PushInfo # GitPython -from github import GithubIntegration, Github, GithubException # pygithub -from pathlib import Path +from git import PushInfo, Repo # GitPython +from github import Github, GithubException, GithubIntegration # pygithub APP_ID_ENV = "APP_ID" # GitHub App's ID KEY_ENV = "KEY" # Path to GitHub App's key From bb770ade7a69dc311d5440b597c24f7a3a097eee Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 3 Mar 2023 12:08:36 -0500 Subject: [PATCH 2/4] use textwrap.dedent to manage multi-line pr description --- scripts/auto-rebase/rebase.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/auto-rebase/rebase.py b/scripts/auto-rebase/rebase.py index 586db1fa6c..d73ef6ed99 100755 --- a/scripts/auto-rebase/rebase.py +++ b/scripts/auto-rebase/rebase.py @@ -5,6 +5,7 @@ import os import subprocess import sys +import textwrap from collections import namedtuple from pathlib import Path from timeit import default_timer as timer @@ -192,11 +193,13 @@ def try_get_pr(gh_repo, org, base_branch, branch_name): def generate_pr_description(branch_name, amd_tag, arm_tag, prow_job_url, rebase_script_succeded): - base = (f"amd64: {amd_tag}\n" - f"arm64: {arm_tag}\n" - f"prow job: {prow_job_url}\n" - "\n" - "/label tide/merge-method-squash\n") + base = textwrap.dedent(f""" + amd64: {amd_tag} + arm64: {arm_tag} + prow job: {prow_job_url} + + /label tide/merge-method-squash + """) return (base if rebase_script_succeded else "# rebase.sh failed - check committed rebase_sh.log\n\n" + base) From a7c3f343bf9a810d7fb5b5486efcd59b244d8965 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 3 Mar 2023 12:10:31 -0500 Subject: [PATCH 3/4] add full changelog to rebase PR descriptions --- scripts/auto-rebase/rebase.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/auto-rebase/rebase.py b/scripts/auto-rebase/rebase.py index d73ef6ed99..6903b8dbeb 100755 --- a/scripts/auto-rebase/rebase.py +++ b/scripts/auto-rebase/rebase.py @@ -193,11 +193,20 @@ def try_get_pr(gh_repo, org, base_branch, branch_name): def generate_pr_description(branch_name, amd_tag, arm_tag, prow_job_url, rebase_script_succeded): + try: + with open("scripts/auto-rebase/changelog.txt", "r") as f: + changelog = f.read() + except Exception as e: + logging.warn(f"Unable to read changelog file: {e}") + changelog = "" + base = textwrap.dedent(f""" amd64: {amd_tag} arm64: {arm_tag} prow job: {prow_job_url} + {changelog} + /label tide/merge-method-squash """) return (base if rebase_script_succeded From f694cb82ee885a61e7ffe6477062b8c72c6d821f Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 3 Mar 2023 12:22:29 -0500 Subject: [PATCH 4/4] update changelog format for use in pr descriptions Reformat the changelog as nested lists so it looks a bit nicer in the PR descriptions for rebases. --- scripts/auto-rebase/changelog.txt | 243 ++++++++++++++++-------------- scripts/auto-rebase/rebase.sh | 9 +- 2 files changed, 133 insertions(+), 119 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 2703ef6107..1d8e1c0a0e 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,115 +1,128 @@ -# cluster-dns-operator embedded-component e17caca25c52b60692925c007b7157ad7f688f81 to ccd55d043b09c64ed4d5d8ed102cc2a0cb09cb3b -0f7a4bfbc3dc1edaa7b32d5ccf2f6988960739c4 2023-02-22T13:56:17+01:00 OCPBUGS-6382: Address CVE-2022-41717 -# cluster-ingress-operator embedded-component ed7b2ccbe91cba42b9198f34c3cdca67c3f0fca5 to 8eb2c667fd31a67d52c4d0ea6c5f014a9fe2ce0d -82c67578f1d1ec69cfd8c88fba1ce2479ffe07ff 2023-02-23T15:33:16-05:00 dns: azure: add unit test for scope -a8ba16a06f9f03c95471fea1c818042a049f9a5a 2023-02-23T15:33:14-05:00 dns: azure: vendor in changes -10af42cec224e89190293a79602b1e182997d8ec 2023-02-23T15:29:42-05:00 dns: azure: use azidentity with an adapter -e8f3f45aec4ee7d1dc602bdd3ba8a3a841ddc336 2023-02-22T17:43:03-05:00 dns/aws: Store target hosted zone id in annotation -71c424dd9d50bb3d38daecb6b3c64f6f8c9271b8 2023-02-22T17:41:10-05:00 Add gateway-service-dns controller -043dc7542bedadf08377b42c1720e9b99cbd5177 2023-02-22T17:35:22-05:00 dns: Reconcile dnsrecords in the operand namespace -18337156bdd5a2c0ff9d4e7f219b8e4fd0105540 2023-02-22T17:35:17-05:00 dns: Don't require an owning ingresscontroller -851568ffbce7621d06653da917deff76ef3313ce 2023-02-22T17:35:11-05:00 dnsrecord: New package for managing DNSRecords -d1ebee332f1e3fe834eee70947caf10971210d5e 2023-02-22T17:35:05-05:00 Rename toYaml to ToYaml and move it to pkg/util -d5eaf71fe849c4f19ae3e0620ebcc9f3c802dc1b 2023-02-22T17:34:59-05:00 ensureWildcardDNSRecord: Delete receiver -3b8efcc3d8d3de9e72ed051cb438db2457e510e2 2023-02-22T17:34:53-05:00 ensureWildcardDNSRecord: Delete ic parameter -05c0bcb4409fcd5c4a7b349bc1961ce61dd346f6 2023-02-22T17:34:46-05:00 Add gatewayclass controller -d7ffd6e7a9cd89805e273b37fff6e6cca6298677 2023-02-21T20:15:58-05:00 Add gatewayapi controller -# cluster-kube-apiserver-operator embedded-component 4134462c6c60429941a309342d027463fe875b38 to 6ad0a9407be5d5229d605665986899be4b531b5e -7c69f56d5f44634d4ffa252ccfc480a185b88032 2023-01-24T15:00:48-07:00 STOR-1051: Allow CSI inline volumes in all SCCs -# cluster-network-operator embedded-component 3b5212db0bbc69f4dadb9fe353e3e5ac7eee3e33 to 4d5a093d41e45def540ffbe4c5dc214550864d53 -cb8d5e179a3c5c205ef57d056e88f1f589764f6b 2022-11-21T10:14:41-05:00 update apf configuration to use v1beta3 -# kubernetes embedded-component 518f3edfe79c93dcc01145153247ebffcd4fe6e6 to 89232647de67ea787d339b1bd7c780a0ed97f3f9 -04ff5090bae1cb181a2464696adde8709cdd0a93 2023-02-22T10:49:29-05:00 UPSTREAM: : node admission plugin for cpu partitioning -78f50d0821f84cdcaac42a69748713c90123f8fd 2023-02-22T10:45:12-05:00 UPSTREAM: : bump(openshift/api,openshift/client-go) -# machine-config-operator embedded-component 8671aa4a777a940b1e45c97b6bd72e26d76acace to c078cdd2614e409faf0e9b13d97c426c065a71da -b5162960131e1eced0fa2af17e10d7800285ec2c 2023-02-23T09:08:14-05:00 resolv-prepender: Chmod before mv, and set SELinux label -375ac973533e00c6bdf15c34494d7d3ddbcc0c7e 2023-02-22T14:57:00-06:00 Fix permissions on resolv.conf -3d2c9220d25fc344a5f4bd79eae646aed08d5a9c 2023-02-22T18:41:46+02:00 OCPBUGS-7896: MCO should not add keepalived pod manifests in case of VSPHERE UPI -7902af5612d10be566ddf8a15bd2040b087dd040 2023-02-22T12:56:31+01:00 Regenerate controllerconfig.crd.yaml -474b6755ef7cb9448e700a87d78b449b18d03896 2023-02-22T12:13:15+01:00 Bump openshift/api to enable DynamicResourceAllocation through TechPreviewNoUpgrade -9eccd87c6198254231fb5d3842a5361e9559b0bd 2023-02-20T16:17:02-06:00 Remove timeout and separate image pull from prepender script -3725f991c90d93dc1a112b0106c03b418d607336 2023-02-17T16:27:35-06:00 Forklift most of resolv-prepender dispatcher script to systemd -ace1d87e143792a4da9bbe2848b222dd88bf7619 2023-02-15T23:30:50+02:00 MGMT-13645: Adding dnsmasq config for sno SNO upgrade from 4.12 to 4.13 rhel9.2 is broken cause of dnsmasq default config -# openshift-controller-manager embedded-component 67fcbf2f6e3d5922a1c451197d497eadddedcb8d to 1c8021fcf40ccdc95a16bd8569b5ce53ecc09f0a -ffcebbe74b001c0eb430ffacc00dac733bf25b9f 2023-02-15T14:12:53-05:00 Revert "remove tech preview feature gate for build csi volumes" -# oc image-amd64 49b1e9f681b3dbdd4f43ca3d288ac64f4c681e2d to 83fd126d7c7c598b1bfa398641d330e24596c2cf -ba4172a0f2e504c62f4fbfc43d2ebac0469c8d35 2023-02-21T17:48:59-05:00 Adding CommitDate to the Changelog json output -ed394856a5c5309b9f58b0b1aa532ba918047329 2023-02-20T15:51:14-08:00 pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates -# ovn-kubernetes image-amd64 e75917d7dcd961d39b4c7768d88aa5d13ba67eb0 to b244c306b58db1afb6bdd9124bfbcadc7aec8371 -5d3b54a97e904a67194e20282b98f59335f2642d 2023-02-23T09:03:59+01:00 Changes due to `pkg/ovn/controller/services` move -da57d5f0be119598948391308c3cdcd80c56bda8 2023-02-22T19:27:38+01:00 Move OCP hack in its own test file -80e0b66e930bf75ce66bb93d4b0507464d9f8a95 2023-02-22T09:49:10-06:00 rhel9: bump to openvswitch3.1-3.1.0-2.el9fdp -c945e2db5ae835f4138b5c1e0374e3726f84a862 2023-02-20T09:34:02+08:00 Print ovnkube node exit error -7cc073e6bc3b83bf6d577cd37419cb20d36de6ea 2023-02-17T14:55:11+01:00 e2e, flatl2: add a traffic test without IPAM -351ba9d8f5c376c879b75b941989edf5c6d0ac21 2023-02-17T14:55:09+01:00 multi-homing, flatL2: make subnet optional -7bb967c38b2247fadac20de8fdf83e4ab4089da6 2023-02-17T11:34:17+01:00 Flush route cache from all nodes -dfe17dda437adfb5dca17e3399ed599b4a25d809 2023-02-16T15:58:31-05:00 Dockerfile.fedora: bump OVN to 22.12.0-25 and to fedora 37. -0ab5c2dc0904d6afed8cccdfa53141f740f1c335 2023-02-16T11:21:35-05:00 correct cleanup of hybrid overlay annotations -25dc30975cea0d383d0c31a1f5333a716c29c5e5 2023-02-16T16:46:35+01:00 multi-homing: rename waitForNodeLogicalSwitchInCache function -7091592d1ca90b492c1c9daa42b2e11041d6d892 2023-02-15T13:28:01+01:00 EgressIPs: Allow moving IP -2e052072bc288bd16f0ba5fc95ac620bf95b36f8 2023-02-14T16:13:52-05:00 Remove MTU on service routes -b15827df0cb9a35c22ae17f35a9ab7422d7b7eb7 2023-02-13T09:48:42-05:00 Skip dualstack conversion e2e flake test -9a141bb0ef008d4c9be684d201cc188a8e73e44b 2023-02-13T14:20:26+01:00 Service: Avoid rejecting when service is unidled -8fe5f857fd8ca13f5b006957cb269697b79a44cf 2023-02-10T11:53:20+08:00 Enable LDFLAGS for building ovnk binaries other than ovnkube -c7fd02c133233cf940fc7537e481a95700e060a3 2023-02-09T22:19:28+00:00 services controller: renames -f63796ec18450c9a241336f4be01238c5eed9621 2023-02-09T22:19:11+00:00 services controller: fold go-controller/pkg/ovn/loadbalancer into go-controller/pkg/ovn/controller/services -b64d072270a1ce4f865b363f926fa60a54294d7c 2023-02-09T22:16:24+00:00 consts: types.LoadBalancerKindExternalID and types.LoadBalancerOwnerExternalID -36991fb2cac69c8d91e1a63d262badc73fd9a310 2023-02-09T22:16:15+00:00 services controller: remove lb_cache -2000f2e057267414d5c639326e31f5472cb39f06 2023-02-09T22:15:54+00:00 services controller: make ensureLbs use top level cache -624c23ec24d511fc0b42ab7f5f2a29144a98a386 2023-02-09T23:07:16+01:00 Always send packets from OVN to Host -7db9a35bcb73c14440e6676e57947831d31c020a 2023-02-09T21:43:58+01:00 Don't retry fetching pod ips on delete if it failed once. -c05399a5eaea16886dd81f3786ea3e92ece40f2e 2023-02-09T19:36:16+01:00 Expose resource max retry failed metric -97c91c2e6485ddf9157f1fa5f7dd3d973925d5c0 2023-02-08T20:50:06+00:00 services controller: removal of legacy lbs is no longer needed -c0274194ebedb8a60420ce24fe4ad954f5db4cd2 2023-02-08T18:55:53+01:00 multi-homing, e2e: multiple attachments to the same network -399d3ab3521b4764930c38edfd9fb2f1ed607aa6 2023-02-08T10:22:22-05:00 Consolidate dualstack conversion jobs -d6827a6a08f976c1e11ea58cde6d4908422c98ce 2023-02-08T11:20:28+01:00 Use Update() instead of Patch() for concurrent node annotation update with the same key. Default and secondary controllers both update "k8s.ovn.org/node-subnets" annotation on node events. Since annotation value is a string, they will try to push conflicting changes, but if we use Update(), it will return error on resource version mismatch, and changes will be applied sequentially after retry. -3aeda210acfe72646e3071fe5ac78e165bb10954 2023-02-08T11:20:26+01:00 Separate Kube and KubeOVN interfaces to make sure all required clients are always set. Add OVNMasterClientset and OVNNodeClientset in addition to OVNClientset for the same purpose. Define cni.ClientSet and cni.shimClientset for the same purpose. Remove cni.Server.rundir field, since it is only used during initialization, pass it to cni.Server.Start(). -d029343f3c451f5e8377a0f6fd6584cb981e3f17 2023-02-08T10:33:54+01:00 multi-homing, e2e: ensure workloads are scheduled in diff nodes -c778ccec8e5efb5bb3f1cede2ee4ab131b585d78 2023-02-08T10:33:46+01:00 e2e, multi-homing: refactor the test suite -ead05f8f23773bcb7a0b2640e630e53364f8b877 2023-02-07T11:43:34+01:00 Commit egress IP pod config as one libovsdb transaction -9604a9c39affd623143cfc816f54133888497f3d 2023-02-07T11:11:32+01:00 Refactor handleEgressReroutePolicy into separate functions -7c856ae26aea90b8298a8e86bffc79fe101da419 2023-02-07T11:11:31+01:00 Rename MatchIPNetFamily to MatchFirstIPNetFamily -fcb87247fa78be6372d5ff063ab1cd3abb4adc8a 2023-02-01T11:52:18-06:00 config: add unit tests for enable-multi-network -# kubernetes image-amd64 518f3edfe79c93dcc01145153247ebffcd4fe6e6 to 89232647de67ea787d339b1bd7c780a0ed97f3f9 -04ff5090bae1cb181a2464696adde8709cdd0a93 2023-02-22T10:49:29-05:00 UPSTREAM: : node admission plugin for cpu partitioning -78f50d0821f84cdcaac42a69748713c90123f8fd 2023-02-22T10:45:12-05:00 UPSTREAM: : bump(openshift/api,openshift/client-go) -# oc image-arm64 a04d9dc7e12a1d251da3502df69d8dc8a48e18b8 to 83fd126d7c7c598b1bfa398641d330e24596c2cf -ba4172a0f2e504c62f4fbfc43d2ebac0469c8d35 2023-02-21T17:48:59-05:00 Adding CommitDate to the Changelog json output -# ovn-kubernetes image-arm64 e75917d7dcd961d39b4c7768d88aa5d13ba67eb0 to b244c306b58db1afb6bdd9124bfbcadc7aec8371 -5d3b54a97e904a67194e20282b98f59335f2642d 2023-02-23T09:03:59+01:00 Changes due to `pkg/ovn/controller/services` move -da57d5f0be119598948391308c3cdcd80c56bda8 2023-02-22T19:27:38+01:00 Move OCP hack in its own test file -80e0b66e930bf75ce66bb93d4b0507464d9f8a95 2023-02-22T09:49:10-06:00 rhel9: bump to openvswitch3.1-3.1.0-2.el9fdp -c945e2db5ae835f4138b5c1e0374e3726f84a862 2023-02-20T09:34:02+08:00 Print ovnkube node exit error -7cc073e6bc3b83bf6d577cd37419cb20d36de6ea 2023-02-17T14:55:11+01:00 e2e, flatl2: add a traffic test without IPAM -351ba9d8f5c376c879b75b941989edf5c6d0ac21 2023-02-17T14:55:09+01:00 multi-homing, flatL2: make subnet optional -7bb967c38b2247fadac20de8fdf83e4ab4089da6 2023-02-17T11:34:17+01:00 Flush route cache from all nodes -dfe17dda437adfb5dca17e3399ed599b4a25d809 2023-02-16T15:58:31-05:00 Dockerfile.fedora: bump OVN to 22.12.0-25 and to fedora 37. -0ab5c2dc0904d6afed8cccdfa53141f740f1c335 2023-02-16T11:21:35-05:00 correct cleanup of hybrid overlay annotations -25dc30975cea0d383d0c31a1f5333a716c29c5e5 2023-02-16T16:46:35+01:00 multi-homing: rename waitForNodeLogicalSwitchInCache function -7091592d1ca90b492c1c9daa42b2e11041d6d892 2023-02-15T13:28:01+01:00 EgressIPs: Allow moving IP -2e052072bc288bd16f0ba5fc95ac620bf95b36f8 2023-02-14T16:13:52-05:00 Remove MTU on service routes -b15827df0cb9a35c22ae17f35a9ab7422d7b7eb7 2023-02-13T09:48:42-05:00 Skip dualstack conversion e2e flake test -9a141bb0ef008d4c9be684d201cc188a8e73e44b 2023-02-13T14:20:26+01:00 Service: Avoid rejecting when service is unidled -8fe5f857fd8ca13f5b006957cb269697b79a44cf 2023-02-10T11:53:20+08:00 Enable LDFLAGS for building ovnk binaries other than ovnkube -c7fd02c133233cf940fc7537e481a95700e060a3 2023-02-09T22:19:28+00:00 services controller: renames -f63796ec18450c9a241336f4be01238c5eed9621 2023-02-09T22:19:11+00:00 services controller: fold go-controller/pkg/ovn/loadbalancer into go-controller/pkg/ovn/controller/services -b64d072270a1ce4f865b363f926fa60a54294d7c 2023-02-09T22:16:24+00:00 consts: types.LoadBalancerKindExternalID and types.LoadBalancerOwnerExternalID -36991fb2cac69c8d91e1a63d262badc73fd9a310 2023-02-09T22:16:15+00:00 services controller: remove lb_cache -2000f2e057267414d5c639326e31f5472cb39f06 2023-02-09T22:15:54+00:00 services controller: make ensureLbs use top level cache -624c23ec24d511fc0b42ab7f5f2a29144a98a386 2023-02-09T23:07:16+01:00 Always send packets from OVN to Host -7db9a35bcb73c14440e6676e57947831d31c020a 2023-02-09T21:43:58+01:00 Don't retry fetching pod ips on delete if it failed once. -c05399a5eaea16886dd81f3786ea3e92ece40f2e 2023-02-09T19:36:16+01:00 Expose resource max retry failed metric -97c91c2e6485ddf9157f1fa5f7dd3d973925d5c0 2023-02-08T20:50:06+00:00 services controller: removal of legacy lbs is no longer needed -c0274194ebedb8a60420ce24fe4ad954f5db4cd2 2023-02-08T18:55:53+01:00 multi-homing, e2e: multiple attachments to the same network -399d3ab3521b4764930c38edfd9fb2f1ed607aa6 2023-02-08T10:22:22-05:00 Consolidate dualstack conversion jobs -d6827a6a08f976c1e11ea58cde6d4908422c98ce 2023-02-08T11:20:28+01:00 Use Update() instead of Patch() for concurrent node annotation update with the same key. Default and secondary controllers both update "k8s.ovn.org/node-subnets" annotation on node events. Since annotation value is a string, they will try to push conflicting changes, but if we use Update(), it will return error on resource version mismatch, and changes will be applied sequentially after retry. -3aeda210acfe72646e3071fe5ac78e165bb10954 2023-02-08T11:20:26+01:00 Separate Kube and KubeOVN interfaces to make sure all required clients are always set. Add OVNMasterClientset and OVNNodeClientset in addition to OVNClientset for the same purpose. Define cni.ClientSet and cni.shimClientset for the same purpose. Remove cni.Server.rundir field, since it is only used during initialization, pass it to cni.Server.Start(). -d029343f3c451f5e8377a0f6fd6584cb981e3f17 2023-02-08T10:33:54+01:00 multi-homing, e2e: ensure workloads are scheduled in diff nodes -c778ccec8e5efb5bb3f1cede2ee4ab131b585d78 2023-02-08T10:33:46+01:00 e2e, multi-homing: refactor the test suite -ead05f8f23773bcb7a0b2640e630e53364f8b877 2023-02-07T11:43:34+01:00 Commit egress IP pod config as one libovsdb transaction -9604a9c39affd623143cfc816f54133888497f3d 2023-02-07T11:11:32+01:00 Refactor handleEgressReroutePolicy into separate functions -7c856ae26aea90b8298a8e86bffc79fe101da419 2023-02-07T11:11:31+01:00 Rename MatchIPNetFamily to MatchFirstIPNetFamily -fcb87247fa78be6372d5ff063ab1cd3abb4adc8a 2023-02-01T11:52:18-06:00 config: add unit tests for enable-multi-network -# kubernetes image-arm64 518f3edfe79c93dcc01145153247ebffcd4fe6e6 to 89232647de67ea787d339b1bd7c780a0ed97f3f9 -04ff5090bae1cb181a2464696adde8709cdd0a93 2023-02-22T10:49:29-05:00 UPSTREAM: : node admission plugin for cpu partitioning -78f50d0821f84cdcaac42a69748713c90123f8fd 2023-02-22T10:45:12-05:00 UPSTREAM: : bump(openshift/api,openshift/client-go) +- cluster-dns-operator embedded-component e17caca25c52b60692925c007b7157ad7f688f81 to ccd55d043b09c64ed4d5d8ed102cc2a0cb09cb3b + - 0f7a4bf 2023-02-22T13:56:17+01:00 OCPBUGS-6382: Address CVE-2022-41717 + +- cluster-ingress-operator embedded-component ed7b2ccbe91cba42b9198f34c3cdca67c3f0fca5 to 8eb2c667fd31a67d52c4d0ea6c5f014a9fe2ce0d + - 82c6757 2023-02-23T15:33:16-05:00 dns: azure: add unit test for scope + - a8ba16a 2023-02-23T15:33:14-05:00 dns: azure: vendor in changes + - 10af42c 2023-02-23T15:29:42-05:00 dns: azure: use azidentity with an adapter + - e8f3f45 2023-02-22T17:43:03-05:00 dns/aws: Store target hosted zone id in annotation + - 71c424d 2023-02-22T17:41:10-05:00 Add gateway-service-dns controller + - 043dc75 2023-02-22T17:35:22-05:00 dns: Reconcile dnsrecords in the operand namespace + - 1833715 2023-02-22T17:35:17-05:00 dns: Don't require an owning ingresscontroller + - 851568f 2023-02-22T17:35:11-05:00 dnsrecord: New package for managing DNSRecords + - d1ebee3 2023-02-22T17:35:05-05:00 Rename toYaml to ToYaml and move it to pkg/util + - d5eaf71 2023-02-22T17:34:59-05:00 ensureWildcardDNSRecord: Delete receiver + - 3b8efcc 2023-02-22T17:34:53-05:00 ensureWildcardDNSRecord: Delete ic parameter + - 05c0bcb 2023-02-22T17:34:46-05:00 Add gatewayclass controller + - d7ffd6e 2023-02-21T20:15:58-05:00 Add gatewayapi controller + +- cluster-kube-apiserver-operator embedded-component 4134462c6c60429941a309342d027463fe875b38 to 6ad0a9407be5d5229d605665986899be4b531b5e + - 7c69f56 2023-01-24T15:00:48-07:00 STOR-1051: Allow CSI inline volumes in all SCCs + +- cluster-network-operator embedded-component 3b5212db0bbc69f4dadb9fe353e3e5ac7eee3e33 to 4d5a093d41e45def540ffbe4c5dc214550864d53 + - cb8d5e1 2022-11-21T10:14:41-05:00 update apf configuration to use v1beta3 + +- kubernetes embedded-component 518f3edfe79c93dcc01145153247ebffcd4fe6e6 to 89232647de67ea787d339b1bd7c780a0ed97f3f9 + - 04ff5090b 2023-02-22T10:49:29-05:00 UPSTREAM: : node admission plugin for cpu partitioning + - 78f50d082 2023-02-22T10:45:12-05:00 UPSTREAM: : bump(openshift/api,openshift/client-go) + +- machine-config-operator embedded-component 8671aa4a777a940b1e45c97b6bd72e26d76acace to c078cdd2614e409faf0e9b13d97c426c065a71da + - b5162960 2023-02-23T09:08:14-05:00 resolv-prepender: Chmod before mv, and set SELinux label + - 375ac973 2023-02-22T14:57:00-06:00 Fix permissions on resolv.conf + - 3d2c9220 2023-02-22T18:41:46+02:00 OCPBUGS-7896: MCO should not add keepalived pod manifests in case of VSPHERE UPI + - 7902af56 2023-02-22T12:56:31+01:00 Regenerate controllerconfig.crd.yaml + - 474b6755 2023-02-22T12:13:15+01:00 Bump openshift/api to enable DynamicResourceAllocation through TechPreviewNoUpgrade + - 9eccd87c 2023-02-20T16:17:02-06:00 Remove timeout and separate image pull from prepender script + - 3725f991 2023-02-17T16:27:35-06:00 Forklift most of resolv-prepender dispatcher script to systemd + - ace1d87e 2023-02-15T23:30:50+02:00 MGMT-13645: Adding dnsmasq config for sno SNO upgrade from 4.12 to 4.13 rhel9.2 is broken cause of dnsmasq default config + +- openshift-controller-manager embedded-component 67fcbf2f6e3d5922a1c451197d497eadddedcb8d to 1c8021fcf40ccdc95a16bd8569b5ce53ecc09f0a + - ffcebbe 2023-02-15T14:12:53-05:00 Revert "remove tech preview feature gate for build csi volumes" + +- oc image-amd64 49b1e9f681b3dbdd4f43ca3d288ac64f4c681e2d to 83fd126d7c7c598b1bfa398641d330e24596c2cf + - ba4172a 2023-02-21T17:48:59-05:00 Adding CommitDate to the Changelog json output + - ed39485 2023-02-20T15:51:14-08:00 pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates + +- ovn-kubernetes image-amd64 e75917d7dcd961d39b4c7768d88aa5d13ba67eb0 to b244c306b58db1afb6bdd9124bfbcadc7aec8371 + - 5d3b54a 2023-02-23T09:03:59+01:00 Changes due to `pkg/ovn/controller/services` move + - da57d5f 2023-02-22T19:27:38+01:00 Move OCP hack in its own test file + - 80e0b66 2023-02-22T09:49:10-06:00 rhel9: bump to openvswitch3.1-3.1.0-2.el9fdp + - c945e2d 2023-02-20T09:34:02+08:00 Print ovnkube node exit error + - 7cc073e 2023-02-17T14:55:11+01:00 e2e, flatl2: add a traffic test without IPAM + - 351ba9d 2023-02-17T14:55:09+01:00 multi-homing, flatL2: make subnet optional + - 7bb967c 2023-02-17T11:34:17+01:00 Flush route cache from all nodes + - dfe17dd 2023-02-16T15:58:31-05:00 Dockerfile.fedora: bump OVN to 22.12.0-25 and to fedora 37. + - 0ab5c2d 2023-02-16T11:21:35-05:00 correct cleanup of hybrid overlay annotations + - 25dc309 2023-02-16T16:46:35+01:00 multi-homing: rename waitForNodeLogicalSwitchInCache function + - 7091592 2023-02-15T13:28:01+01:00 EgressIPs: Allow moving IP + - 2e05207 2023-02-14T16:13:52-05:00 Remove MTU on service routes + - b15827d 2023-02-13T09:48:42-05:00 Skip dualstack conversion e2e flake test + - 9a141bb 2023-02-13T14:20:26+01:00 Service: Avoid rejecting when service is unidled + - 8fe5f85 2023-02-10T11:53:20+08:00 Enable LDFLAGS for building ovnk binaries other than ovnkube + - c7fd02c 2023-02-09T22:19:28+00:00 services controller: renames + - f63796e 2023-02-09T22:19:11+00:00 services controller: fold go-controller/pkg/ovn/loadbalancer into go-controller/pkg/ovn/controller/services + - b64d072 2023-02-09T22:16:24+00:00 consts: types.LoadBalancerKindExternalID and types.LoadBalancerOwnerExternalID + - 36991fb 2023-02-09T22:16:15+00:00 services controller: remove lb_cache + - 2000f2e 2023-02-09T22:15:54+00:00 services controller: make ensureLbs use top level cache + - 624c23e 2023-02-09T23:07:16+01:00 Always send packets from OVN to Host + - 7db9a35 2023-02-09T21:43:58+01:00 Don't retry fetching pod ips on delete if it failed once. + - c05399a 2023-02-09T19:36:16+01:00 Expose resource max retry failed metric + - 97c91c2 2023-02-08T20:50:06+00:00 services controller: removal of legacy lbs is no longer needed + - c027419 2023-02-08T18:55:53+01:00 multi-homing, e2e: multiple attachments to the same network + - 399d3ab 2023-02-08T10:22:22-05:00 Consolidate dualstack conversion jobs + - d6827a6 2023-02-08T11:20:28+01:00 Use Update() instead of Patch() for concurrent node annotation update with the same key. Default and secondary controllers both update "k8s.ovn.org/node-subnets" annotation on node events. Since annotation value is a string, they will try to push conflicting changes, but if we use Update(), it will return error on resource version mismatch, and changes will be applied sequentially after retry. + - 3aeda21 2023-02-08T11:20:26+01:00 Separate Kube and KubeOVN interfaces to make sure all required clients are always set. Add OVNMasterClientset and OVNNodeClientset in addition to OVNClientset for the same purpose. Define cni.ClientSet and cni.shimClientset for the same purpose. Remove cni.Server.rundir field, since it is only used during initialization, pass it to cni.Server.Start(). + - d029343 2023-02-08T10:33:54+01:00 multi-homing, e2e: ensure workloads are scheduled in diff nodes + - c778cce 2023-02-08T10:33:46+01:00 e2e, multi-homing: refactor the test suite + - ead05f8 2023-02-07T11:43:34+01:00 Commit egress IP pod config as one libovsdb transaction + - 9604a9c 2023-02-07T11:11:32+01:00 Refactor handleEgressReroutePolicy into separate functions + - 7c856ae 2023-02-07T11:11:31+01:00 Rename MatchIPNetFamily to MatchFirstIPNetFamily + - fcb8724 2023-02-01T11:52:18-06:00 config: add unit tests for enable-multi-network + +- kubernetes image-amd64 518f3edfe79c93dcc01145153247ebffcd4fe6e6 to 89232647de67ea787d339b1bd7c780a0ed97f3f9 + - 04ff5090b 2023-02-22T10:49:29-05:00 UPSTREAM: : node admission plugin for cpu partitioning + - 78f50d082 2023-02-22T10:45:12-05:00 UPSTREAM: : bump(openshift/api,openshift/client-go) + +- oc image-arm64 a04d9dc7e12a1d251da3502df69d8dc8a48e18b8 to 83fd126d7c7c598b1bfa398641d330e24596c2cf + - ba4172a 2023-02-21T17:48:59-05:00 Adding CommitDate to the Changelog json output + +- ovn-kubernetes image-arm64 e75917d7dcd961d39b4c7768d88aa5d13ba67eb0 to b244c306b58db1afb6bdd9124bfbcadc7aec8371 + - 5d3b54a 2023-02-23T09:03:59+01:00 Changes due to `pkg/ovn/controller/services` move + - da57d5f 2023-02-22T19:27:38+01:00 Move OCP hack in its own test file + - 80e0b66 2023-02-22T09:49:10-06:00 rhel9: bump to openvswitch3.1-3.1.0-2.el9fdp + - c945e2d 2023-02-20T09:34:02+08:00 Print ovnkube node exit error + - 7cc073e 2023-02-17T14:55:11+01:00 e2e, flatl2: add a traffic test without IPAM + - 351ba9d 2023-02-17T14:55:09+01:00 multi-homing, flatL2: make subnet optional + - 7bb967c 2023-02-17T11:34:17+01:00 Flush route cache from all nodes + - dfe17dd 2023-02-16T15:58:31-05:00 Dockerfile.fedora: bump OVN to 22.12.0-25 and to fedora 37. + - 0ab5c2d 2023-02-16T11:21:35-05:00 correct cleanup of hybrid overlay annotations + - 25dc309 2023-02-16T16:46:35+01:00 multi-homing: rename waitForNodeLogicalSwitchInCache function + - 7091592 2023-02-15T13:28:01+01:00 EgressIPs: Allow moving IP + - 2e05207 2023-02-14T16:13:52-05:00 Remove MTU on service routes + - b15827d 2023-02-13T09:48:42-05:00 Skip dualstack conversion e2e flake test + - 9a141bb 2023-02-13T14:20:26+01:00 Service: Avoid rejecting when service is unidled + - 8fe5f85 2023-02-10T11:53:20+08:00 Enable LDFLAGS for building ovnk binaries other than ovnkube + - c7fd02c 2023-02-09T22:19:28+00:00 services controller: renames + - f63796e 2023-02-09T22:19:11+00:00 services controller: fold go-controller/pkg/ovn/loadbalancer into go-controller/pkg/ovn/controller/services + - b64d072 2023-02-09T22:16:24+00:00 consts: types.LoadBalancerKindExternalID and types.LoadBalancerOwnerExternalID + - 36991fb 2023-02-09T22:16:15+00:00 services controller: remove lb_cache + - 2000f2e 2023-02-09T22:15:54+00:00 services controller: make ensureLbs use top level cache + - 624c23e 2023-02-09T23:07:16+01:00 Always send packets from OVN to Host + - 7db9a35 2023-02-09T21:43:58+01:00 Don't retry fetching pod ips on delete if it failed once. + - c05399a 2023-02-09T19:36:16+01:00 Expose resource max retry failed metric + - 97c91c2 2023-02-08T20:50:06+00:00 services controller: removal of legacy lbs is no longer needed + - c027419 2023-02-08T18:55:53+01:00 multi-homing, e2e: multiple attachments to the same network + - 399d3ab 2023-02-08T10:22:22-05:00 Consolidate dualstack conversion jobs + - d6827a6 2023-02-08T11:20:28+01:00 Use Update() instead of Patch() for concurrent node annotation update with the same key. Default and secondary controllers both update "k8s.ovn.org/node-subnets" annotation on node events. Since annotation value is a string, they will try to push conflicting changes, but if we use Update(), it will return error on resource version mismatch, and changes will be applied sequentially after retry. + - 3aeda21 2023-02-08T11:20:26+01:00 Separate Kube and KubeOVN interfaces to make sure all required clients are always set. Add OVNMasterClientset and OVNNodeClientset in addition to OVNClientset for the same purpose. Define cni.ClientSet and cni.shimClientset for the same purpose. Remove cni.Server.rundir field, since it is only used during initialization, pass it to cni.Server.Start(). + - d029343 2023-02-08T10:33:54+01:00 multi-homing, e2e: ensure workloads are scheduled in diff nodes + - c778cce 2023-02-08T10:33:46+01:00 e2e, multi-homing: refactor the test suite + - ead05f8 2023-02-07T11:43:34+01:00 Commit egress IP pod config as one libovsdb transaction + - 9604a9c 2023-02-07T11:11:32+01:00 Refactor handleEgressReroutePolicy into separate functions + - 7c856ae 2023-02-07T11:11:31+01:00 Rename MatchIPNetFamily to MatchFirstIPNetFamily + - fcb8724 2023-02-01T11:52:18-06:00 config: add unit tests for enable-multi-network + +- kubernetes image-arm64 518f3edfe79c93dcc01145153247ebffcd4fe6e6 to 89232647de67ea787d339b1bd7c780a0ed97f3f9 + - 04ff5090b 2023-02-22T10:49:29-05:00 UPSTREAM: : node admission plugin for cpu partitioning + - 78f50d082 2023-02-22T10:45:12-05:00 UPSTREAM: : bump(openshift/api,openshift/client-go) + diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh index 39daa4a858..abbbaaf61a 100755 --- a/scripts/auto-rebase/rebase.sh +++ b/scripts/auto-rebase/rebase.sh @@ -851,7 +851,7 @@ update_changelog() { if [[ -z "${old_commit}" ]] then - echo "# ${repo##*/} is a new ${purpose} dependency" >> "${changelog}" + echo "- ${repo##*/} is a new ${purpose} dependency" >> "${changelog}" echo >> "${changelog}" continue fi @@ -873,19 +873,20 @@ update_changelog() { repodir="${STAGING_DIR}/${image_arch}/${repo##*/}" ;; *) - echo "Unknown commit purpose \"${purpose}\" for ${repo}" >> "${changelog}" + echo "- Unknown commit purpose \"${purpose}\" for ${repo}" >> "${changelog}" continue ;; esac pushd "${repodir}" >/dev/null - echo "# ${repo##*/} ${purpose} ${old_commit} to ${new_commit}" >> "${changelog}" + echo "- ${repo##*/} ${purpose} ${old_commit} to ${new_commit}" >> "${changelog}" (git log \ --no-merges \ - --pretty="format:%H %cI %s" \ + --pretty="format: - %h %cI %s" \ --no-decorate \ "${old_commit}..${new_commit}" \ || echo "There was an error determining the changes") >> "${changelog}" echo >> "${changelog}" + echo >> "${changelog}" popd >/dev/null done < "${new_commits_file}"