Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-10-31-190119_amd64-2024-10-31_arm64-2024-10-31 #4126

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-main-4.18.0-0.nightly-2024-10-31-190119_amd64-2024-10-31_arm64-2024-10-31 #4126

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
2453b87
update last_rebase.sh
Nov 1, 2024
dd250d9
update changelog
Nov 1, 2024
7d2ef85
update manifests
Nov 1, 2024
5ccc5e1
update buildfiles
Nov 1, 2024
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.18.0-0.nightly-arm64-2024-10-30-201653
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-31-201653
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.18.0-0.nightly-2024-10-30-122220
OCP_VERSION := 4.18.0-0.nightly-2024-10-31-190119
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-10-30-201653"
"base": "4.18.0-0.nightly-arm64-2024-10-31-201653"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fed16f6fca30c2bdf59dffe7d02110be21ded32eabe2b1d96220d3838c0857fd",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-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.18.0-0.nightly-2024-10-30-122220"
"base": "4.18.0-0.nightly-2024-10-31-190119"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6a863d5beff574d72bdcd1c48e6a441d875f878eaca203dd3702988293e7024",
Expand Down
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:8cff3c3b3b6215f20200363e15521d5e7f8d054687d1ab0d4b0586f14159e30d
digest: sha256:d1bde69c2393377700c5ea614c571c321527c27953b6da07ecccd7ef2089995d
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:41de8a6a302b713a3d56c44e53559b626a69b82cf9508444ca7c2075432562b1
digest: sha256:613fa2fa9850c8f8c5899e945eb9dbb7e48a9314779d43d0b29acf778be67efc
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb
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:41de8a6a302b713a3d56c44e53559b626a69b82cf9508444ca7c2075432562b1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:613fa2fa9850c8f8c5899e945eb9dbb7e48a9314779d43d0b29acf778be67efc
- 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:8cff3c3b3b6215f20200363e15521d5e7f8d054687d1ab0d4b0586f14159e30d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1bde69c2393377700c5ea614c571c321527c27953b6da07ecccd7ef2089995d
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:3f8242f977f72e3b517bb75547b8d0b786c12494388f1e7a57c5a64508aba16c
digest: sha256:f6729e5265cf30c53b0b310a9c4490b7dd54e1508b77515b7d535a38e11cfb8d
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:72c5ef8bd769afe6e70cb29097e1697da8738c872e3344640a870fdecb548927
digest: sha256:8a0fc4d93dbe9a6758f665785b6340fd06f741bc9364880434871c343c5021bc
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6
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:72c5ef8bd769afe6e70cb29097e1697da8738c872e3344640a870fdecb548927
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a0fc4d93dbe9a6758f665785b6340fd06f741bc9364880434871c343c5021bc
- 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:3f8242f977f72e3b517bb75547b8d0b786c12494388f1e7a57c5a64508aba16c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6729e5265cf30c53b0b310a9c4490b7dd54e1508b77515b7d535a38e11cfb8d
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.18.0-0.nightly-arm64-2024-10-30-201653"
"base": "4.18.0-0.nightly-arm64-2024-10-31-201653"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cff3c3b3b6215f20200363e15521d5e7f8d054687d1ab0d4b0586f14159e30d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41de8a6a302b713a3d56c44e53559b626a69b82cf9508444ca7c2075432562b1",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1bde69c2393377700c5ea614c571c321527c27953b6da07ecccd7ef2089995d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:613fa2fa9850c8f8c5899e945eb9dbb7e48a9314779d43d0b29acf778be67efc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb"
}
}
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.18.0-0.nightly-2024-10-30-122220"
"base": "4.18.0-0.nightly-2024-10-31-190119"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f8242f977f72e3b517bb75547b8d0b786c12494388f1e7a57c5a64508aba16c",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72c5ef8bd769afe6e70cb29097e1697da8738c872e3344640a870fdecb548927",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6729e5265cf30c53b0b310a9c4490b7dd54e1508b77515b7d535a38e11cfb8d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a0fc4d93dbe9a6758f665785b6340fd06f741bc9364880434871c343c5021bc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-10-30-201653"
"base": "4.18.0-0.nightly-arm64-2024-10-31-201653"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19dd81d38f155b0c9f8bd1d59d915732a015ab8a31d9aea8c918569243e663ac",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79163a7f3c41dd6fee2f2e1eecc33ded552dc7de0948233d37017f6b1dfac48f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08d70c98fd079964f5be126cb62edece672f86c0a1ce191c8e1b0cd594e36aa6",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81c1a10e114040fdabb833838a41a65ad553562e48eedc7ab03182d445b9cdd5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-10-30-122220"
"base": "4.18.0-0.nightly-2024-10-31-190119"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66080fa737cf46146d371f7fd140e16321bda206760627a37eb2de92c94278cb",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:158f7ed92780f7fc7c629e857d99acf05a86489c6db1794e39ae5829886b77d9",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4a1372b849882dd2da0127cbd5068a4e3076db82ca9ae641b9b7189d3dcc8b5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ae743b405c52cc8589d838efd88c32bc4d8f8a442a88e47b7dd2e57f7443e59",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6",
Expand Down
18 changes: 10 additions & 8 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
- etcd embedded-component fd65559cbf04ccbaf79c8b028a866f1492c0e63a to 825fc46f2c1be39640edce95c49d3b70243e9d6b
- a435a4ab 2024-10-28T16:23:23-04:00 Add support for cachi2 based deps Konflux is replacing RH's internal build system OSBS. OSBS supported a build-time dependency injection system called "cachito". Konflux replaces this with "cachi2" which works differently. REMOTE_SOURCES no longer need to be copied into place and there is no need to source cachito's environment information (Konflux automatically rewrites the Dockerfile to source cachi2/cachi2.env before running the original RUN commands). Additionally, cachito appears to have provided go.sum dependencies whereas cachi2 requires all build-time dependencies in go.mod. Missing dependencies are added to go.mod as // indirect in this change.
- machine-config-operator embedded-component b3a562be44deb94fa4ea86e25a9d83395c3d188d to 9d8a8e3953c696a653647e472547ce9296ca37a8
- b5264639 2024-10-29T09:58:43-04:00 pinnedimagests: set resolver to passthrough

- machine-config-operator embedded-component c499c1b28590e520514f2dbacd78111f13c81c4d to b3a562be44deb94fa4ea86e25a9d83395c3d188d
- 3f9acedb 2024-10-25T11:51:50+02:00 OPNET-569: Do not run resolv-prepender from NM dispatcher
- operator-framework-olm embedded-component 29f4d1afaf2329f5c14b538fed79078ce9b6dedf to e8c0592c5805643b5b1e5ef4b0b66d9676764db4
- 8828035a 2024-10-31T00:03:10+00:00 build(deps): bump k8s.io/api from 0.31.1 to 0.31.2 (#3422)

- operator-framework-olm embedded-component b980e95a56dc213fa987f55db2f8fb426093e51f to 29f4d1afaf2329f5c14b538fed79078ce9b6dedf
- 0f1b3ead 2024-10-30T00:05:48+00:00 fix: buggy nextY logic for maxOCPVersion (#3416)
- oc image-amd64 62471c258d8e92d2d07c97515cc82013cc431cbe to 8e9a2be04f902d58b3be21b92ed9016854640cd6
- 833cc92e 2024-10-29T06:47:14-04:00 add MCO owners file
- 4e5ca2ba 2024-10-29T06:47:14-04:00 ensure mcs secret type before rotation

- oc image-amd64 ee93eb5a82af5b61c625df9d3a9b50da9740a7d4 to 62471c258d8e92d2d07c97515cc82013cc431cbe
- 39272ca9 2024-10-23T18:22:00-04:00 OCPBUGS-43513: Show node-joiner container logs when error occurs
- oc image-arm64 62471c258d8e92d2d07c97515cc82013cc431cbe to 8e9a2be04f902d58b3be21b92ed9016854640cd6
- 833cc92e 2024-10-29T06:47:14-04:00 add MCO owners file
- 4e5ca2ba 2024-10-29T06:47:14-04:00 ensure mcs secret type before rotation

8 changes: 4 additions & 4 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ https://github.com/openshift/csi-external-snapshotter embedded-component f52ce8b
https://github.com/openshift/etcd embedded-component 825fc46f2c1be39640edce95c49d3b70243e9d6b
https://github.com/openshift/kubernetes embedded-component 7ca9eb1e9e5ced974033c2b6f26560e22535244c
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73
https://github.com/openshift/machine-config-operator embedded-component b3a562be44deb94fa4ea86e25a9d83395c3d188d
https://github.com/openshift/machine-config-operator embedded-component 9d8a8e3953c696a653647e472547ce9296ca37a8
https://github.com/openshift/openshift-controller-manager embedded-component 3ebe2f4f3900d6a3748ef0faf3535f635dbf7d11
https://github.com/openshift/operator-framework-olm embedded-component 29f4d1afaf2329f5c14b538fed79078ce9b6dedf
https://github.com/openshift/operator-framework-olm embedded-component e8c0592c5805643b5b1e5ef4b0b66d9676764db4
https://github.com/openshift/route-controller-manager embedded-component 07daee4d2f0b5c7aaca56ee45ff6dfdf97680db0
https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-amd64 62471c258d8e92d2d07c97515cc82013cc431cbe
https://github.com/openshift/oc image-amd64 8e9a2be04f902d58b3be21b92ed9016854640cd6
https://github.com/openshift/coredns image-amd64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
https://github.com/openshift/csi-external-snapshotter image-amd64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
https://github.com/openshift/csi-external-snapshotter image-amd64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
Expand All @@ -26,7 +26,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a9653
https://github.com/openshift/ovn-kubernetes image-amd64 e816f5899f31572c0c93dad9e241557c307a7728
https://github.com/openshift/kubernetes image-amd64 7ca9eb1e9e5ced974033c2b6f26560e22535244c
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 62471c258d8e92d2d07c97515cc82013cc431cbe
https://github.com/openshift/oc image-arm64 8e9a2be04f902d58b3be21b92ed9016854640cd6
https://github.com/openshift/coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
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.18.0-0.nightly-2024-10-30-122220" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-30-201653"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-10-31-190119" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-31-201653"