Skip to content

NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-06-28-115226_amd64-2025-06-28_arm64-2025-06-30#5122

Merged
openshift-merge-bot[bot] merged 10 commits intomainfrom
rebase-main-4.20.0-0.nightly-2025-06-28-115226_amd64-2025-06-28_arm64-2025-06-30
Jul 1, 2025
Merged

NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-06-28-115226_amd64-2025-06-28_arm64-2025-06-30#5122
openshift-merge-bot[bot] merged 10 commits intomainfrom
rebase-main-4.20.0-0.nightly-2025-06-28-115226_amd64-2025-06-28_arm64-2025-06-30

Conversation

@microshift-rebase-script
Copy link
Contributor

@microshift-rebase-script microshift-rebase-script bot commented Jul 1, 2025

amd64: 4.20.0-0.nightly-2025-06-28-115226
arm64: 4.20.0-0.nightly-arm64-2025-06-30-210738
prow job: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-microshift-main-rebase-on-nightlies/1939897007585890304

  • api embedded-component a8cbc218cd2ce740bad87e5e16d92ef598f19107 to 41708f6123394c18afbb4bef1bac526f46960769

  • cluster-csi-snapshot-controller-operator embedded-component 8a596ec94c65dbcf667447d6ce16c14416c8497d to ef2152f52b992addcbe24b402f1ddbf180049d85

    • ec4a366 2025-06-25T16:15:51-06:00 STOR-2340: Subscribe to Network Policies for csi-snapshot-controller
  • cluster-kube-apiserver-operator embedded-component 5cc2e26769521c6da40bc41f3838da1f38f063d4 to aab4c503b665c958a743517f7381692912c1915b

    • 88aca46 2025-06-26T10:45:08-03:00 Revert "NO-JIRA: Enable watch termination grace period"
    • c1a309a 2025-06-25T13:13:20+02:00 certregenerationcontroller: start configInformers again
    • 81ecf24 2025-06-24T14:03:04-04:00 Enable watch termination grace period.
  • cluster-kube-controller-manager-operator embedded-component 07401428d6188f3e2209f61dc84602c035721c08 to e9a24940d18e4a1b0f2f8367a4e4a0909b819a2b

    • 9b47ce4 2025-06-25T12:42:55+02:00 recoverycontroller: fix informers startup
    • 53764bf 2025-06-21T16:45:42+02:00 Revert "Revert "CNTRLPLANE-343: certrotationcontroller: use minutes instead of days when FeatureShortCertRotation is enabled""
    • ae48293 2025-06-21T13:37:51+02:00 Revert "CNTRLPLANE-343: certrotationcontroller: use minutes instead of days when FeatureShortCertRotation is enabled"
    • 50e9fe2 2025-06-20T06:54:01+02:00 certrotationcontroller: use minutes instead of days when FeatureShortCertRotation is enabled
    • a259355 2025-06-18T09:26:46+02:00 Bump library-go
  • cluster-kube-scheduler-operator embedded-component 0d060e4b9cfbe1bdbc5991dde5424161ff44c932 to e68b158bb4c0bf56876b4d09d0344979592c7b3c

  • cluster-network-operator embedded-component 0a42f1a1e52724ecdd37755c9babed9eb5146deb to bd863a88a0b2fbd25c51fd967ba4fbe92bf911fd

    • 5cc28c6 2025-06-26T08:54:12+02:00 FRR-K8s webhook: promote to priviledged
    • 7056e67 2025-06-25T07:57:23+02:00 FRRK8s CRDs: align to upstream
    • 0b29885 2025-06-25T07:51:39+02:00 FRRK8s webhook: align to upstream
  • kubernetes embedded-component d92880b14300b76b867a83ec887e280a5b77b52e to 02b9b7e65987d5aa4559c318725354713838b5a2

    • 9b547a64e 2025-06-26T09:35:55-03:00 UPSTREAM: 132502: Fix flake caused by invalid detection of active policies in VAP integration tests
    • 25a5bda9d 2025-06-20T10:56:32-04:00 UPSTREAM: : Update rebase.sh to handle go versions major.minor.patch instead of just major.minor
  • machine-config-operator embedded-component a4ec776a829dbb473a2091180a0e9537a6721a9e to a08d5ec38c4f037766b4114dff5831b1c59a0772

    • db096c0b 2025-06-27T15:58:37-05:00 Add control-plane label for master nodes on legacy clusters
    • 32f97677 2025-06-23T10:19:10-06:00 Remove all code related to the Image Registry workaround Config Map
    • 57cf4385 2025-06-23T16:22:28+02:00 Fix dependencies
    • a0d42d89 2025-06-23T16:22:28+02:00 Fill test provider with origin info
    • 26679ccf 2025-06-23T16:22:27+02:00 Cleanup for MVP
    • 63ba68f3 2025-06-18T13:17:29+02:00 PoC to port the internal MCO test suite
    • 5e332d5b 2025-06-17T16:22:41-04:00 msbic: only update from a known boot image
    • 3e5a13a1 2025-06-16T09:48:48-04:00 add MachineConfiguration to related objects
    • 15e7e5e6 2025-06-04T10:59:35-04:00 OCPBUGS-57072: configure-ovs: don't escape : in nmcli output
    • 84e407b7 2025-05-12T18:07:30+02:00 Improve Ignition conversions handling
  • openshift-controller-manager embedded-component 42665fbed9780635a01d0205bf6ab1892f2da96b to bef75e9ea2df7cf2d417299c353da4c360f22d02

    • eb82c8c 2025-06-20T15:24:06-04:00 OCPBUGS-57918: handle secret not found more gracefully
  • operator-framework-olm embedded-component d5a91adaeab7e45176928f057a9913830564c323 to 3b01b7b18a17f38952f7155d719bc7de23f6ff16

The change list was truncated. See scripts/auto-rebase/changelog.txt in the PR for the full details.

/label tide/merge-method-squash
/label cherry-pick-approved
/label backport-risk-assessed
/label jira/valid-bug

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 1, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 1, 2025

@microshift-rebase-script[bot]: This pull request explicitly references no jira issue.

Details

In response to this:

amd64: 4.20.0-0.nightly-2025-06-28-115226
arm64: 4.20.0-0.nightly-arm64-2025-06-30-210738
prow job: https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/periodic-ci-openshift-microshift-main-rebase-on-nightlies/1939897007585890304

  • api embedded-component a8cbc218cd2ce740bad87e5e16d92ef598f19107 to 41708f6123394c18afbb4bef1bac526f46960769

  • ef76696b 2025-06-24T21:41:16+05:30 Modify api description for masquerade subnet

  • ee7fb834 2025-06-24T21:21:44+05:30 Modify api description for join and transit subnets

  • d681228a 2025-06-20T03:47:44+00:00 Updating ose-cluster-config-api-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/ose-cluster-config-api.yml

  • af4c63cf 2025-06-17T13:30:20-04:00 fixup! fix botched rebase

  • eda0c6af 2025-06-17T09:23:36-04:00 remove rolebindingrestriction CRD from payload

  • cluster-csi-snapshot-controller-operator embedded-component 8a596ec94c65dbcf667447d6ce16c14416c8497d to ef2152f52b992addcbe24b402f1ddbf180049d85

  • ec4a366 2025-06-25T16:15:51-06:00 STOR-2340: Subscribe to Network Policies for csi-snapshot-controller

  • cluster-kube-apiserver-operator embedded-component 5cc2e26769521c6da40bc41f3838da1f38f063d4 to aab4c503b665c958a743517f7381692912c1915b

  • 88aca46 2025-06-26T10:45:08-03:00 Revert "NO-JIRA: Enable watch termination grace period"

  • c1a309a 2025-06-25T13:13:20+02:00 certregenerationcontroller: start configInformers again

  • 81ecf24 2025-06-24T14:03:04-04:00 Enable watch termination grace period.

  • cluster-kube-controller-manager-operator embedded-component 07401428d6188f3e2209f61dc84602c035721c08 to e9a24940d18e4a1b0f2f8367a4e4a0909b819a2b

  • 9b47ce4 2025-06-25T12:42:55+02:00 recoverycontroller: fix informers startup

  • 53764bf 2025-06-21T16:45:42+02:00 Revert "Revert "CNTRLPLANE-343: certrotationcontroller: use minutes instead of days when FeatureShortCertRotation is enabled""

  • ae48293 2025-06-21T13:37:51+02:00 Revert "CNTRLPLANE-343: certrotationcontroller: use minutes instead of days when FeatureShortCertRotation is enabled"

  • 50e9fe2 2025-06-20T06:54:01+02:00 certrotationcontroller: use minutes instead of days when FeatureShortCertRotation is enabled

  • a259355 2025-06-18T09:26:46+02:00 Bump library-go

  • cluster-kube-scheduler-operator embedded-component 0d060e4b9cfbe1bdbc5991dde5424161ff44c932 to e68b158bb4c0bf56876b4d09d0344979592c7b3c

  • fc94308 2025-06-24T17:46:36+02:00 bump(k8s): fitting

  • d3bf78a 2025-06-24T16:56:47+02:00 bump(go)=1.24.0

  • 36c0f07 2025-06-20T08:47:54+00:00 Updating ose-cluster-kube-scheduler-operator-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/8f77fc475c95f9d98c348deb2feb88f5952d7357/images/ose-cluster-kube-scheduler-operator.yml

  • cluster-network-operator embedded-component 0a42f1a1e52724ecdd37755c9babed9eb5146deb to bd863a88a0b2fbd25c51fd967ba4fbe92bf911fd

  • 5cc28c6 2025-06-26T08:54:12+02:00 FRR-K8s webhook: promote to priviledged

  • 7056e67 2025-06-25T07:57:23+02:00 FRRK8s CRDs: align to upstream

  • 0b29885 2025-06-25T07:51:39+02:00 FRRK8s webhook: align to upstream

  • kubernetes embedded-component d92880b14300b76b867a83ec887e280a5b77b52e to 02b9b7e65987d5aa4559c318725354713838b5a2

  • 9b547a64e 2025-06-26T09:35:55-03:00 UPSTREAM: 132502: Fix flake caused by invalid detection of active policies in VAP integration tests

  • 25a5bda9d 2025-06-20T10:56:32-04:00 UPSTREAM: : Update rebase.sh to handle go versions major.minor.patch instead of just major.minor

  • machine-config-operator embedded-component a4ec776a829dbb473a2091180a0e9537a6721a9e to a08d5ec38c4f037766b4114dff5831b1c59a0772

  • db096c0b 2025-06-27T15:58:37-05:00 Add control-plane label for master nodes on legacy clusters

  • 32f97677 2025-06-23T10:19:10-06:00 Remove all code related to the Image Registry workaround Config Map

  • 57cf4385 2025-06-23T16:22:28+02:00 Fix dependencies

  • a0d42d89 2025-06-23T16:22:28+02:00 Fill test provider with origin info

  • 26679ccf 2025-06-23T16:22:27+02:00 Cleanup for MVP

  • 63ba68f3 2025-06-18T13:17:29+02:00 PoC to port the internal MCO test suite

  • 5e332d5b 2025-06-17T16:22:41-04:00 msbic: only update from a known boot image

  • 3e5a13a1 2025-06-16T09:48:48-04:00 add MachineConfiguration to related objects

  • 15e7e5e6 2025-06-04T10:59:35-04:00 OCPBUGS-57072: configure-ovs: don't escape : in nmcli output

  • 84e407b7 2025-05-12T18:07:30+02:00 Improve Ignition conversions handling

  • openshift-controller-manager embedded-component 42665fbed9780635a01d0205bf6ab1892f2da96b to bef75e9ea2df7cf2d417299c353da4c360f22d02

  • eb82c8c 2025-06-20T15:24:06-04:00 OCPBUGS-57918: handle secret not found more gracefully

  • operator-framework-olm embedded-component d5a91adaeab7e45176928f057a9913830564c323 to 3b01b7b18a17f38952f7155d719bc7de23f6ff16

  • 25a49599 2025-06-25T00:04:05+00:00 Upgrade bingo deps ([release-4.16] Remove invalid images & scenarios such as rhel{92,93} x 4.16 #3601)

  • a6980f04 2025-06-25T00:03:22+00:00 :seedling: Bump github.com/prometheus/common from 0.64.0 to 0.65.0 (NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-07-08-042329_amd64-2024-07-08_arm64-2024-07-08 #3604)

  • bc111a9c 2025-06-25T00:03:03+00:00 :bug: OCPBUGS-37982: Reduce Frequency of Update Requests for Copied CSVs (NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-07-07-041929_amd64-2024-07-07_arm64-2024-07-08 #3597)

  • 7b6943d1

The change list was truncated. See scripts/auto-rebase/changelog.txt in the PR for the full details.

/label tide/merge-method-squash
/label cherry-pick-approved
/label backport-risk-assessed
/label jira/valid-bug

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Jul 1, 2025
@openshift-ci openshift-ci bot requested review from dhensel-rh and eslutsky July 1, 2025 04:21
@pmtk
Copy link
Member

pmtk commented Jul 1, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 1, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: microshift-rebase-script[bot], pmtk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 1, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 1, 2025

@microshift-rebase-script: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 3aaa6f4 into main Jul 1, 2025
13 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the rebase-main-4.20.0-0.nightly-2025-06-28-115226_amd64-2025-06-28_arm64-2025-06-30 branch July 1, 2025 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants