Skip to content

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2024-12-12-133926_amd64-2024-12-12_arm64-2024-12-12 #4317

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

Merged
openshift-merge-bot merged 4 commits into from
Dec 13, 2024
Merged

NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2024-12-12-133926_amd64-2024-12-12_arm64-2024-12-12 #4317

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
28b2bf3
update last_rebase.sh
Dec 13, 2024
c894cbf
update changelog
Dec 13, 2024
6f5b682
update manifests
Dec 13, 2024
cc9974b
update buildfiles
Dec 13, 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-12-10-224335
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-12-224335
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-12-05-191355
OCP_VERSION := 4.18.0-0.nightly-2024-12-12-133926
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-12-10-224335"
"base": "4.18.0-0.nightly-arm64-2024-12-12-224335"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eab4512b45eb0de157c22747828bd79e3318df748a450fd3b5ede86986bdbdb0",
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-12-05-191355"
"base": "4.18.0-0.nightly-2024-12-12-133926"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d41f7a9b3bdb9ff7d6c55e392c36b947e804858e72d0188e947e98413f6b023",
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:1c67667a54bbbe571e2ccb7e7df209dce55f5c298529a332db243d7319baec9d
digest: sha256:1e61afed951fe3cb3903f0c33a09fb3acba28796399719f139b10ceae19ee68e
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7ce5e56eacf25188e0afc04996f63abb4e07831d62339a5da1d135272891200e
digest: sha256:0a88819acfec2ae08bb59be5398ae93348f7ada1eeb5a2232d43005135606e6d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:274b237ef96b691604dfc0161a6ac936477b0b7b2faad4147ccf1a34237aff67
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:7ce5e56eacf25188e0afc04996f63abb4e07831d62339a5da1d135272891200e
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a88819acfec2ae08bb59be5398ae93348f7ada1eeb5a2232d43005135606e6d
- 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:1c67667a54bbbe571e2ccb7e7df209dce55f5c298529a332db243d7319baec9d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e61afed951fe3cb3903f0c33a09fb3acba28796399719f139b10ceae19ee68e
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:04249f6c4622c43ce8403163f15b0e893222d6fa920b0a1af7b230e2f5a546f2
digest: sha256:c4fd8da485e212c532b81f2cf9ff2783f180a5cc330bec8bec9174a2fa497f8a
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:514f949b9023b6e406b85209c7b3756d35b8abd9d8432de4459e16ede068b780
digest: sha256:90cb0cc8c4749805eafb72e01be8bbce6401a8700c1b6d106c1e38af0dcc96c7
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4069e7cb83c49a058cac392aeffaec5c0c1aab98220c6197b82623f46f1e92c9
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:514f949b9023b6e406b85209c7b3756d35b8abd9d8432de4459e16ede068b780
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90cb0cc8c4749805eafb72e01be8bbce6401a8700c1b6d106c1e38af0dcc96c7
- 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:04249f6c4622c43ce8403163f15b0e893222d6fa920b0a1af7b230e2f5a546f2
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4fd8da485e212c532b81f2cf9ff2783f180a5cc330bec8bec9174a2fa497f8a
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-12-10-224335"
"base": "4.18.0-0.nightly-arm64-2024-12-12-224335"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c67667a54bbbe571e2ccb7e7df209dce55f5c298529a332db243d7319baec9d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ce5e56eacf25188e0afc04996f63abb4e07831d62339a5da1d135272891200e",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e61afed951fe3cb3903f0c33a09fb3acba28796399719f139b10ceae19ee68e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a88819acfec2ae08bb59be5398ae93348f7ada1eeb5a2232d43005135606e6d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:274b237ef96b691604dfc0161a6ac936477b0b7b2faad4147ccf1a34237aff67"
}
}
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-12-05-191355"
"base": "4.18.0-0.nightly-2024-12-12-133926"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04249f6c4622c43ce8403163f15b0e893222d6fa920b0a1af7b230e2f5a546f2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:514f949b9023b6e406b85209c7b3756d35b8abd9d8432de4459e16ede068b780",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4fd8da485e212c532b81f2cf9ff2783f180a5cc330bec8bec9174a2fa497f8a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90cb0cc8c4749805eafb72e01be8bbce6401a8700c1b6d106c1e38af0dcc96c7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4069e7cb83c49a058cac392aeffaec5c0c1aab98220c6197b82623f46f1e92c9"
}
}
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,13 +1,13 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-12-10-224335"
"base": "4.18.0-0.nightly-arm64-2024-12-12-224335"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa169e76af6fd508295475f940dc839c00db67b0e1ac99e3141586a34c9c3e6e",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6515b0e02e7517c6f46d66d24f4d50c6ebecf2f9cc08a97d00665b1f10a30e6e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2f5120ce0e89f5ada4b08f6fd3e60bed3ad1ded01c4a9d589f03a332bd84b63",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:274b237ef96b691604dfc0161a6ac936477b0b7b2faad4147ccf1a34237aff67",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bd67736dcd2134cb585f4cbef03950ce365f43880f1c94f05b802558538c690",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35050aadec0d7d96125b788a21b4ac97b5b3f0599299ce6525eecbdd7a9d78ec",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48ce6b45ba42bf1d22fdc20294c28c24f00c56a595febb644a18f91550a97966",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9cce974fe9f6a49573317bbb2a38471b69266225bb139907b171ea3cd499e428",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
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,13 +1,13 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-12-05-191355"
"base": "4.18.0-0.nightly-2024-12-12-133926"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45743e7a7b7e55d7288ebf983b35f246c816ced3541f9159d6870cf3a04c939c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:581c7557c8e5e04e75936540d2b3e49384096e8e16c9b847bf217b3468b7577e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52a3ef96d69c44212e44377150b87f0f40d57b896ef1ad383b6b974a730413fd",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4069e7cb83c49a058cac392aeffaec5c0c1aab98220c6197b82623f46f1e92c9",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05517bf4391e5b65a6c1d62a70f0b7ba3ed4a13e4ed21714113c6e50d32ce76e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cded3de05b594633b7d553a76e33764684b2c09bf09cb2aa6e15e5f35f9e206f",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a46884531bca32ff8222b9b3c5b9148d8139580a7bdca811ec4fa3808ce6be8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee0ea513149b6d81a7d8b708f2cbd2aca8c544c600d46125822ffb23af216bc8",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
Expand Down
21 changes: 21 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
- api embedded-component a09992e80c6891cc0bfa2fa7ec6af42af37c452e to 29859d55727bb0b6294838e93898424ac57e4c04
- 65e5a9c 2024-12-09T11:48:23-05:00 OCPBUGS-45309: disable pod security admission by default in 4.18

- cluster-kube-apiserver-operator embedded-component 8ef2c1d874971a0badd9d55b122d907f34dedc0d to 4babb3f18c19d2bef584a8389f34b8428cf52b9c
- d8f62b7 2024-12-09T11:24:50-05:00 revert dev cert rotation

- machine-config-operator embedded-component c761b7cabfe50839e573299b02de148559e652eb to 434269de72a280d7edf9f2f2d9d2380782f3a68e
- 3232b901 2024-12-09T09:25:42+00:00 Remove trailing periods from AWS provided hostnames

- operator-framework-olm embedded-component e27da48ff810af17f4863a19af8291f46c262197 to 57a4299d9f3d8c3ee3c7f60971fdc57ed47b6d35
- 8668a8a6 2024-12-10T21:00:57+00:00 CRD upgrade existing CR validation fix (#3442)

- ovn-kubernetes image-amd64 99c44e88d2c7aa7a95f950dc182a2979ae729e97 to 24e9946a28826e1c4f4a135674261c62bc89a3b8
- 31f76ecf 2024-12-11T09:32:53+00:00 Bump OVS version to 3.4.0-18
- 776e76a0 2024-12-09T00:11:39+00:00 pin libreswan to 4.6-3.el9_0.3
- cb59972c 2024-09-05T21:14:00+00:00 Updating ovn-kubernetes-microshift-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ovn-kubernetes-microshift.yml

- ovn-kubernetes image-arm64 5fda1fe2286bf20138dd407ddd05410e80490be3 to 24e9946a28826e1c4f4a135674261c62bc89a3b8
- 31f76ecf 2024-12-11T09:32:53+00:00 Bump OVS version to 3.4.0-18
- cb59972c 2024-09-05T21:14:00+00:00 Updating ovn-kubernetes-microshift-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ovn-kubernetes-microshift.yml

12 changes: 6 additions & 6 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
https://github.com/openshift/api embedded-component a09992e80c6891cc0bfa2fa7ec6af42af37c452e
https://github.com/openshift/api embedded-component 29859d55727bb0b6294838e93898424ac57e4c04
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 42ed4cc366a40c28b22e0aea02ba8075dc2831eb
https://github.com/openshift/cluster-dns-operator embedded-component 208d50c1a5e0aaeb991366daa749abdffa803224
https://github.com/openshift/cluster-ingress-operator embedded-component 8be174945db79b0660bd0fd21ed279ab7b6aafbf
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 8ef2c1d874971a0badd9d55b122d907f34dedc0d
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4babb3f18c19d2bef584a8389f34b8428cf52b9c
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ce2c021f23f5d178da6ea35d98a229137e5a81c4
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e4c772cd344e538342a4e1cd91635b387e1c18ba
https://github.com/openshift/cluster-network-operator embedded-component ee9c01de80d4a2f57847018a0e48701c718dba91
Expand All @@ -12,9 +12,9 @@ https://github.com/openshift/csi-external-snapshotter embedded-component f52ce8b
https://github.com/openshift/etcd embedded-component 914783cae63a13b90971c65e28c3349c1ecb7dfb
https://github.com/openshift/kubernetes embedded-component 205ac00c56dd2340b90dc0e328be84e77219197c
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73
https://github.com/openshift/machine-config-operator embedded-component c761b7cabfe50839e573299b02de148559e652eb
https://github.com/openshift/machine-config-operator embedded-component 434269de72a280d7edf9f2f2d9d2380782f3a68e
https://github.com/openshift/openshift-controller-manager embedded-component 3ebe2f4f3900d6a3748ef0faf3535f635dbf7d11
https://github.com/openshift/operator-framework-olm embedded-component e27da48ff810af17f4863a19af8291f46c262197
https://github.com/openshift/operator-framework-olm embedded-component 57a4299d9f3d8c3ee3c7f60971fdc57ed47b6d35
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 c64c430e48013ced1705344bb95ba1bdfb2a1a0b
Expand All @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 f52ce8b8b0799a
https://github.com/openshift/csi-external-snapshotter image-amd64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
https://github.com/openshift/router image-amd64 be319d0bb83f75b52b707df46422f6892dfaaa56
https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a96530ad7173f955e3fbe2
https://github.com/openshift/ovn-kubernetes image-amd64 99c44e88d2c7aa7a95f950dc182a2979ae729e97
https://github.com/openshift/ovn-kubernetes image-amd64 24e9946a28826e1c4f4a135674261c62bc89a3b8
https://github.com/openshift/kubernetes image-amd64 205ac00c56dd2340b90dc0e328be84e77219197c
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 c64c430e48013ced1705344bb95ba1bdfb2a1a0b
Expand All @@ -32,6 +32,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a
https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
https://github.com/openshift/router image-arm64 be319d0bb83f75b52b707df46422f6892dfaaa56
https://github.com/openshift/kube-rbac-proxy image-arm64 526498ab32996a0f67a96530ad7173f955e3fbe2
https://github.com/openshift/ovn-kubernetes image-arm64 5fda1fe2286bf20138dd407ddd05410e80490be3
https://github.com/openshift/ovn-kubernetes image-arm64 24e9946a28826e1c4f4a135674261c62bc89a3b8
https://github.com/openshift/kubernetes image-arm64 205ac00c56dd2340b90dc0e328be84e77219197c
https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755
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-12-05-191355" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-10-224335"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-12-12-133926" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-12-224335"