diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 72fefd0d123..21b6ef9d0e7 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2024-12-04-113014 +OCP_VERSION := 4.18.0-0.nightly-2024-12-05-191355 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index f1d78b23eb0..8991e8a61f8 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1f01908e00887db34afac83077808d94849fe0db8e6fbef7874506818e1b497f + digest: sha256:9d41f7a9b3bdb9ff7d6c55e392c36b947e804858e72d0188e947e98413f6b023 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1b61ca5c3a20b5b6d5f38e722b3afb8f2ff61d15595836bb03fcf2ad5bccd7b8 + digest: sha256:243748c87e542ebc7a082fa852ed03a8576faa4f2463e3e8e88236d43a1a8f7f diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 9393ad2840e..cb1ee543dce 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-2024-12-04-113014" + "base": "4.18.0-0.nightly-2024-12-05-191355" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f01908e00887db34afac83077808d94849fe0db8e6fbef7874506818e1b497f", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b61ca5c3a20b5b6d5f38e722b3afb8f2ff61d15595836bb03fcf2ad5bccd7b8" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d41f7a9b3bdb9ff7d6c55e392c36b947e804858e72d0188e947e98413f6b023", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:243748c87e542ebc7a082fa852ed03a8576faa4f2463e3e8e88236d43a1a8f7f" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 1769a8f9cf8..07596188f35 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:01422baf1b52bd7a541783fa388af4338440aac5add2986b647590c4e1cdf3ee + digest: sha256:04249f6c4622c43ce8403163f15b0e893222d6fa920b0a1af7b230e2f5a546f2 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6e6f2e7c6ef604c13246f81e186e02d591daa7380448ab2a785250531625f1f5 + digest: sha256:514f949b9023b6e406b85209c7b3756d35b8abd9d8432de4459e16ede068b780 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:be249375b13e36d22d0ceda03188e35a85aab7e072247783d2c3930d32cd3c78 + digest: sha256:4069e7cb83c49a058cac392aeffaec5c0c1aab98220c6197b82623f46f1e92c9 patches: - patch: |- @@ -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:6e6f2e7c6ef604c13246f81e186e02d591daa7380448ab2a785250531625f1f5 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:514f949b9023b6e406b85209c7b3756d35b8abd9d8432de4459e16ede068b780 - 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:01422baf1b52bd7a541783fa388af4338440aac5add2986b647590c4e1cdf3ee + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04249f6c4622c43ce8403163f15b0e893222d6fa920b0a1af7b230e2f5a546f2 target: kind: Deployment labelSelector: app=catalog-operator 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 ce7cf5d5eb7..5d2497ec0e9 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-04-113014" + "base": "4.18.0-0.nightly-2024-12-05-191355" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01422baf1b52bd7a541783fa388af4338440aac5add2986b647590c4e1cdf3ee", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e6f2e7c6ef604c13246f81e186e02d591daa7380448ab2a785250531625f1f5", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be249375b13e36d22d0ceda03188e35a85aab7e072247783d2c3930d32cd3c78" + "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", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4069e7cb83c49a058cac392aeffaec5c0c1aab98220c6197b82623f46f1e92c9" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index d8447543979..ba4be28cce5 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.18.0-0.nightly-2024-12-04-113014" + "base": "4.18.0-0.nightly-2024-12-05-191355" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:457a25b6df6af613eb9fb7bae58a4652bf05050806fbd786d984cd93fa1f375e", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76f6b7973922191eff658d353ea3b71092518ce97c6e8f2f72587137285a3cf5", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65489545df4a044647f8867b13a716e62978e00f5d92427b74509c733433993d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be249375b13e36d22d0ceda03188e35a85aab7e072247783d2c3930d32cd3c78", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20704be2f7d8fc15c9ab58d297f474cb244b697f332e0e074a4fcc274be33bbf", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c66ed7d92217db9126393d3c8e9e7ed6e5ea084b5a0bb3f60321da89b29fede", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4513c95e72cb0eaa197caac8e0651e64a6c2cb8c3b72d61781cc0c5ab33cd82d", + "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", + "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", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0183cde4c3a8db7421f6c8fb19941edeebdecd32e671fbde75ff51f5e277904e", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8e2ae05c22418027d172f4843eb6cdc98956f4730cebb1b2fffd8a1b0446a39" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aeddcbcf88a4f7f2915d6e08f9b982846f6cdd140b3e0acb55f871c26ce7f9a1", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:591c406147c675b584c9af1b6ca0aa1fc2022a74e1815f8714b4bfa94ec6bb12" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 6276928ee99..20b321ed4cc 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c66ed7d92217db9126393d3c8e9e7ed6e5ea084b5a0bb3f60321da89b29fede" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a46884531bca32ff8222b9b3c5b9148d8139580a7bdca811ec4fa3808ce6be8" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2d..315330269e3 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,3 @@ +- oc image-amd64 9e568296a9b2f774e9321825e2b0c314ee9df566 to c64c430e48013ced1705344bb95ba1bdfb2a1a0b + - a6fd1c8b 2024-12-04T14:50:13+00:00 adm node-logs: Also parse logs when encountered with standard html header + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 38188b4936d..dfcfbaf3ca6 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -17,7 +17,7 @@ https://github.com/openshift/openshift-controller-manager embedded-component 3eb https://github.com/openshift/operator-framework-olm embedded-component e27da48ff810af17f4863a19af8291f46c262197 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 9e568296a9b2f774e9321825e2b0c314ee9df566 +https://github.com/openshift/oc image-amd64 c64c430e48013ced1705344bb95ba1bdfb2a1a0b 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 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index ee51e77ac88..6b8cf828ea0 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-04-113014" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-11-27-205553" +./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-11-27-205553"