diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 190ee0830b..4dddf27295 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-19-012306 +OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-20-010045 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index f815d627f4..d0af4bbd0d 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2024-12-18-105230 +OCP_VERSION := 4.18.0-0.nightly-2024-12-19-155122 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 52a53ad54b..eaa15880b0 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-12-19-012306" + "base": "4.18.0-0.nightly-arm64-2024-12-20-010045" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05394287fd690e589778264f7272c968e4cf87137005272af48082729d35c5af", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index f5f61c62f9..a7686c5d08 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2024-12-18-105230" + "base": "4.18.0-0.nightly-2024-12-19-155122" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9561a8aebe6978367bb21b607369a9c23c7651ddb3002f7b3cdd01b18c89adf", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 4a807ab640..c721407c60 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:afc414ba3a90860a3150269c2eef790cb453825ec90fce150831af1dae493d60 + digest: sha256:cb8a571aaacdbc3653d4a6b93e3e854c7f4bb8ccc4b50d47eca0df178dd935e3 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f205051a40385561b94bb1b3ecfefc78962b509bc8ad29fd91b5dfae897337b3 + digest: sha256:931bef903c15d32f8495a9fc5e3f900f3ae5c517b7e4a4ba7f3ffe9ce2df7183 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:03f1644f600af057ccf8ae3fd544d6a0dc72f079f97f9db98e00ed8c9779c26d @@ -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:f205051a40385561b94bb1b3ecfefc78962b509bc8ad29fd91b5dfae897337b3 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:931bef903c15d32f8495a9fc5e3f900f3ae5c517b7e4a4ba7f3ffe9ce2df7183 - 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:afc414ba3a90860a3150269c2eef790cb453825ec90fce150831af1dae493d60 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8a571aaacdbc3653d4a6b93e3e854c7f4bb8ccc4b50d47eca0df178dd935e3 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 00319ea3c5..0b7248a900 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:daf9c59b74c3aae197dab170e78440ed4e9d7268662f63a4dfd9fbf58658ff88 + digest: sha256:b9a495a5377a92c64bf23b5d770d6e08d7ce6f1f17716bf53bcbb9c2ac412561 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:84277c847ab4020c3a2d61775136180922778c8087575cbd8bd96e22e1e3919c + digest: sha256:17c99bb1f3755da5e5f00c693a8593c2db677ee3a78b292f05ca20a9d1cb161e - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:cef15546af8dd88a07a4c9715bfc81bc2f43f2e36c80a2d95c3fb3485fb31d48 @@ -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:84277c847ab4020c3a2d61775136180922778c8087575cbd8bd96e22e1e3919c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17c99bb1f3755da5e5f00c693a8593c2db677ee3a78b292f05ca20a9d1cb161e - 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:daf9c59b74c3aae197dab170e78440ed4e9d7268662f63a4dfd9fbf58658ff88 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a495a5377a92c64bf23b5d770d6e08d7ce6f1f17716bf53bcbb9c2ac412561 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 8522dcd2cb..4ecac5dea0 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-12-19-012306" + "base": "4.18.0-0.nightly-arm64-2024-12-20-010045" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:afc414ba3a90860a3150269c2eef790cb453825ec90fce150831af1dae493d60", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f205051a40385561b94bb1b3ecfefc78962b509bc8ad29fd91b5dfae897337b3", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb8a571aaacdbc3653d4a6b93e3e854c7f4bb8ccc4b50d47eca0df178dd935e3", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:931bef903c15d32f8495a9fc5e3f900f3ae5c517b7e4a4ba7f3ffe9ce2df7183", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03f1644f600af057ccf8ae3fd544d6a0dc72f079f97f9db98e00ed8c9779c26d" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index ffdd9670fe..b98a95677a 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-2024-12-18-105230" + "base": "4.18.0-0.nightly-2024-12-19-155122" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:daf9c59b74c3aae197dab170e78440ed4e9d7268662f63a4dfd9fbf58658ff88", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84277c847ab4020c3a2d61775136180922778c8087575cbd8bd96e22e1e3919c", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a495a5377a92c64bf23b5d770d6e08d7ce6f1f17716bf53bcbb9c2ac412561", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17c99bb1f3755da5e5f00c693a8593c2db677ee3a78b292f05ca20a9d1cb161e", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cef15546af8dd88a07a4c9715bfc81bc2f43f2e36c80a2d95c3fb3485fb31d48" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 245a5bc411..3a4493b4ac 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-12-19-012306" + "base": "4.18.0-0.nightly-arm64-2024-12-20-010045" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b5be7b37095eca816e3c3742e4b14c1aa4cd9b43c73d555de4233109a7b224c", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 5418a25d3c..e638622443 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.18.0-0.nightly-2024-12-18-105230" + "base": "4.18.0-0.nightly-2024-12-19-155122" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:035d06c0fc13e38da7d622d42764315273b4f55db6d8e6f1c89d95461c0aa263", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..e6b28f9314 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,6 @@ +- machine-config-operator embedded-component 434269de72a280d7edf9f2f2d9d2380782f3a68e to 2bc91afa09de6fba41e1bca2178c1a49ef30db1a + - 30dcfb22 2024-12-13T13:13:41-06:00 added required-scc annotation release 4.18 + +- operator-framework-olm embedded-component 57a4299d9f3d8c3ee3c7f60971fdc57ed47b6d35 to 6156b61b05d6e345db44edfa7d38138ea0373631 + - 0787bf26 2024-12-17T15:30:09-05:00 [release-4.18] OCPBUGS-46474:catalog-operator: Delete Pods that were evicted (#3459) + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 8c39cd4e51..92c1e03314 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -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 434269de72a280d7edf9f2f2d9d2380782f3a68e +https://github.com/openshift/machine-config-operator embedded-component 2bc91afa09de6fba41e1bca2178c1a49ef30db1a https://github.com/openshift/openshift-controller-manager embedded-component 3ebe2f4f3900d6a3748ef0faf3535f635dbf7d11 -https://github.com/openshift/operator-framework-olm embedded-component 57a4299d9f3d8c3ee3c7f60971fdc57ed47b6d35 +https://github.com/openshift/operator-framework-olm embedded-component 6156b61b05d6e345db44edfa7d38138ea0373631 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 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 06e85e102d..d0dfb0458c 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -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-18-105230" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-19-012306" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-12-19-155122" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-20-010045"