Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2025-01-22-112731_amd64-2025-01-22_arm64-2025-01-22 #4453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
microshift-rebase-script wants to merge 4 commits into from
Closed

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2025-01-22-112731_amd64-2025-01-22_arm64-2025-01-22 #4453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57999f8
update last_rebase.sh
Jan 23, 2025
1b25846
update changelog
Jan 23, 2025
4c42307
update manifests
Jan 23, 2025
d5268d7
update buildfiles
Jan 23, 2025
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.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-arm64-2025-01-19-194339
OCP_VERSION := 4.15.0-0.nightly-arm64-2025-01-22-202431
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-2025-01-19-194338
OCP_VERSION := 4.15.0-0.nightly-2025-01-22-112731
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2ef8532a6cd5de770c46dde8541dcb12176c4d397cd9bed2579b229b8534bfea
digest: sha256:af1c152180108aac0b150e81addfbc6ceb81ec1a0df864147f25cf8707fbb36f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cfbfeb2ae2f5f7eafc15c3869c392fcabfb6101bd379f46e113e371bfa6fbab1
digest: sha256:8fec3510f476c600716a2798c30c3abe34a902117e104957223095587c0dc05a
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:1d53592e1637ee5e9b170057d8069ca6eb362ef41e8dca9b96d891ea91183d09
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfbfeb2ae2f5f7eafc15c3869c392fcabfb6101bd379f46e113e371bfa6fbab1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fec3510f476c600716a2798c30c3abe34a902117e104957223095587c0dc05a
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ef8532a6cd5de770c46dde8541dcb12176c4d397cd9bed2579b229b8534bfea
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af1c152180108aac0b150e81addfbc6ceb81ec1a0df864147f25cf8707fbb36f
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3bd163da208b0c30529cc95362ef7bd2ca603f4550ed4c773d9b47910fea31e4
digest: sha256:4b11bb4b7da75ab1dca818dcb1f59c6e0cef5c8c8f9bea2af4e353942ad91f29
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:32275f0f0c48fb8a0d778885858879725ea58174cbb4d1910232935663a68110
digest: sha256:312e184c0c10359fd3de4da585b9a227cac7d3afe5fae5f2481f8bc2cecbe221
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b55f908e38695496011dbe334431cbdf5488c215f6850af3dffa528707c70a56
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32275f0f0c48fb8a0d778885858879725ea58174cbb4d1910232935663a68110
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:312e184c0c10359fd3de4da585b9a227cac7d3afe5fae5f2481f8bc2cecbe221
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bd163da208b0c30529cc95362ef7bd2ca603f4550ed4c773d9b47910fea31e4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b11bb4b7da75ab1dca818dcb1f59c6e0cef5c8c8f9bea2af4e353942ad91f29
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2025-01-19-194339"
"base": "4.15.0-0.nightly-arm64-2025-01-22-202431"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ef8532a6cd5de770c46dde8541dcb12176c4d397cd9bed2579b229b8534bfea",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfbfeb2ae2f5f7eafc15c3869c392fcabfb6101bd379f46e113e371bfa6fbab1",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af1c152180108aac0b150e81addfbc6ceb81ec1a0df864147f25cf8707fbb36f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fec3510f476c600716a2798c30c3abe34a902117e104957223095587c0dc05a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d53592e1637ee5e9b170057d8069ca6eb362ef41e8dca9b96d891ea91183d09"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-2025-01-19-194338"
"base": "4.15.0-0.nightly-2025-01-22-112731"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bd163da208b0c30529cc95362ef7bd2ca603f4550ed4c773d9b47910fea31e4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32275f0f0c48fb8a0d778885858879725ea58174cbb4d1910232935663a68110",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b11bb4b7da75ab1dca818dcb1f59c6e0cef5c8c8f9bea2af4e353942ad91f29",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:312e184c0c10359fd3de4da585b9a227cac7d3afe5fae5f2481f8bc2cecbe221",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b55f908e38695496011dbe334431cbdf5488c215f6850af3dffa528707c70a56"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2025-01-19-194339"
"base": "4.15.0-0.nightly-arm64-2025-01-22-202431"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:449bf530e7780314a6a8cc6c51a86667cf3b9bb0d21201702cc16c8d5367b7e4",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-2025-01-19-194338"
"base": "4.15.0-0.nightly-2025-01-22-112731"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f72767f683f2855e0669ed92adba5bf6e4cd184b82dee5724fb30c7f1f23999",
Expand Down
17 changes: 4 additions & 13 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
- cluster-network-operator embedded-component fee8c3129c028c6b72eff93a0f814678d997951e to d69278e76edaa4fcde0c9c78edd686fecad16a95
- e2c948c 2024-12-24T12:35:15+00:00 Prevent live migration process from flapping between step-2 and step-3

- openshift-controller-manager embedded-component f2afd434358966ccc09f55d4915d2689ed2cb1b6 to ff69ddfb8f9c752f77e96e867f667e5b8c149935
- 9c9a7a5 2025-01-10T15:07:46+00:00 NO-JIRA: Add team members to the OWNERS file

- ovn-kubernetes image-amd64 9c4d3010d46a438f5fe3e2da14832ac0b38de7c2 to cc1522a772fbd586a192a8ceb02980a41734f7b6
- defd136 2025-01-06T17:34:56+00:00 interconenct: Ask ovn-northd to bind the remote ports.
- 70aa8bf 2024-12-18T17:01:37+08:00 Add hybird overlay pod IPs to the namespace address_set

- ovn-kubernetes image-arm64 9c4d3010d46a438f5fe3e2da14832ac0b38de7c2 to cc1522a772fbd586a192a8ceb02980a41734f7b6
- defd136 2025-01-06T17:34:56+00:00 interconenct: Ask ovn-northd to bind the remote ports.
- 70aa8bf 2024-12-18T17:01:37+08:00 Add hybird overlay pod IPs to the namespace address_set
- operator-framework-olm embedded-component f690dd8788b7334ff6d593a2d2f9db077db73d08 to b500cb365122dd2c1c0234c5227723bb9d36c2f1
- df32b3ef 2025-01-20T11:24:58+01:00 bump golang.org/x/net to 0.34.0 (#3485)
- 1076c3b6 2025-01-20T11:24:27+01:00 Upgrade github.com/joelanford/ignore from v0.1.0 to v0.1.1 (#1527)
- ae0feaca 2025-01-20T11:23:54+01:00 bump golang.org/x/net to 0.34.0 (#387)

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component ff493be70058d73244914
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb
https://github.com/openshift/machine-config-operator embedded-component 842b60b1ff77a2f2bcb263a4b9488651758eb7f9
https://github.com/openshift/openshift-controller-manager embedded-component ff69ddfb8f9c752f77e96e867f667e5b8c149935
https://github.com/openshift/operator-framework-olm embedded-component f690dd8788b7334ff6d593a2d2f9db077db73d08
https://github.com/openshift/operator-framework-olm embedded-component b500cb365122dd2c1c0234c5227723bb9d36c2f1
https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4
https://github.com/openshift/service-ca-operator embedded-component 19f312e96bb4e5b7da9f61ea4cab202b227a60c6
https://github.com/openshift/oc image-amd64 82316376e25f6453b58258df6bf1e11ec4abb670
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
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.15.0-0.nightly-2025-01-19-194338" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2025-01-19-194339"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2025-01-22-112731" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2025-01-22-202431"