diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e28d038d6b9..69eb6219f70 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-12-224335 +OCP_VERSION := 4.18.0-0.nightly-arm64-2024-12-15-170752 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 3fc40bb8c5a..1f313814f3a 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2024-12-12-133926 +OCP_VERSION := 4.18.0-0.nightly-2024-12-14-152515 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 9b7c9d11f26..6ce79c8b7b9 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:eab4512b45eb0de157c22747828bd79e3318df748a450fd3b5ede86986bdbdb0 + digest: sha256:0d8599d57ace1d3d3d383f1f55c4b525a84b774042be5208c7715db3f6723998 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e5a6ffa9905d74343681af9308475cf3c01513368b359eda722089a91515d42c + digest: sha256:a7e426c4b0b6cb4d2ecf2018c2ff28315f04720a8dad02564964ee713b49109f diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 8991e8a61f8..1f8387e73f1 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:9d41f7a9b3bdb9ff7d6c55e392c36b947e804858e72d0188e947e98413f6b023 + digest: sha256:d6a847307dd2d421e2c9da40687171d469ed0f8738e2b7b50384cf02feec18cf - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:243748c87e542ebc7a082fa852ed03a8576faa4f2463e3e8e88236d43a1a8f7f + digest: sha256:4ff82be8c34fbc247845dffbb75f3e8b7a18164a95a048da6624f587adf0c1f5 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index cd225583490..220ba8dfaf5 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-12-12-224335" + "base": "4.18.0-0.nightly-arm64-2024-12-15-170752" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eab4512b45eb0de157c22747828bd79e3318df748a450fd3b5ede86986bdbdb0", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5a6ffa9905d74343681af9308475cf3c01513368b359eda722089a91515d42c" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d8599d57ace1d3d3d383f1f55c4b525a84b774042be5208c7715db3f6723998", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7e426c4b0b6cb4d2ecf2018c2ff28315f04720a8dad02564964ee713b49109f" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 0b4937b2630..73f14f77f4d 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-12-133926" + "base": "4.18.0-0.nightly-2024-12-14-152515" }, "images": { - "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" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6a847307dd2d421e2c9da40687171d469ed0f8738e2b7b50384cf02feec18cf", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ff82be8c34fbc247845dffbb75f3e8b7a18164a95a048da6624f587adf0c1f5" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 93bbeef80d3..71901b142d6 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:1e61afed951fe3cb3903f0c33a09fb3acba28796399719f139b10ceae19ee68e + digest: sha256:5ada23cadfa2dd959d952aa74d48615d0127150394db87b19a8c95b9f21f4ff6 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0a88819acfec2ae08bb59be5398ae93348f7ada1eeb5a2232d43005135606e6d + digest: sha256:59ccd2dd7607cf13c004b2507971e6f9b499599b8ebd5601f2a0d95e4d1ff620 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:274b237ef96b691604dfc0161a6ac936477b0b7b2faad4147ccf1a34237aff67 + digest: sha256:6b3b0a344403b383812ff10d7989360d503e2a0f5b2740678ad632e2c99a9aa5 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:0a88819acfec2ae08bb59be5398ae93348f7ada1eeb5a2232d43005135606e6d + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59ccd2dd7607cf13c004b2507971e6f9b499599b8ebd5601f2a0d95e4d1ff620 - 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:1e61afed951fe3cb3903f0c33a09fb3acba28796399719f139b10ceae19ee68e + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ada23cadfa2dd959d952aa74d48615d0127150394db87b19a8c95b9f21f4ff6 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 8c2c054eabb..6bcc9dc0716 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:c4fd8da485e212c532b81f2cf9ff2783f180a5cc330bec8bec9174a2fa497f8a + digest: sha256:f8b45efacbebda5c76a94a5a5a0b1c51f8985f2ba807401a4325d54b247b1393 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:90cb0cc8c4749805eafb72e01be8bbce6401a8700c1b6d106c1e38af0dcc96c7 + digest: sha256:ebc21ea00a0654038cf13f75a4a269c05dd43bbd55cbde78011ad439e443657a - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4069e7cb83c49a058cac392aeffaec5c0c1aab98220c6197b82623f46f1e92c9 + digest: sha256:3a4aa46c4c5bf44aaaa15d4d884aa27748165adeaf41e0b283cf8183cec34d40 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:90cb0cc8c4749805eafb72e01be8bbce6401a8700c1b6d106c1e38af0dcc96c7 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ebc21ea00a0654038cf13f75a4a269c05dd43bbd55cbde78011ad439e443657a - 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:c4fd8da485e212c532b81f2cf9ff2783f180a5cc330bec8bec9174a2fa497f8a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8b45efacbebda5c76a94a5a5a0b1c51f8985f2ba807401a4325d54b247b1393 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 9a31428fcda..0eb8c344a6a 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-12-224335" + "base": "4.18.0-0.nightly-arm64-2024-12-15-170752" }, "images": { - "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" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ada23cadfa2dd959d952aa74d48615d0127150394db87b19a8c95b9f21f4ff6", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59ccd2dd7607cf13c004b2507971e6f9b499599b8ebd5601f2a0d95e4d1ff620", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b3b0a344403b383812ff10d7989360d503e2a0f5b2740678ad632e2c99a9aa5" } } 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 e436a83ff26..14bc6ae0d01 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-12-133926" + "base": "4.18.0-0.nightly-2024-12-14-152515" }, "images": { - "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" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8b45efacbebda5c76a94a5a5a0b1c51f8985f2ba807401a4325d54b247b1393", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ebc21ea00a0654038cf13f75a4a269c05dd43bbd55cbde78011ad439e443657a", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a4aa46c4c5bf44aaaa15d4d884aa27748165adeaf41e0b283cf8183cec34d40" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 39640c13084..773a5b9d67d 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2024-12-12-224335" + "base": "4.18.0-0.nightly-arm64-2024-12-15-170752" }, "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: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", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:950e8c34b617b48b8e5a2a2aa39737a6a1aace80644723cc2e0be257c1c832ee", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d866e6227a5f9861ab003e04a7eb86f18c55ebb7b65f4621eff6693172ab4ae4", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:247efcc92a4c9b6133da2526d8c79f7b6b6b3a7dfe8b5feef47211ddabb57ed2", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b3b0a344403b383812ff10d7989360d503e2a0f5b2740678ad632e2c99a9aa5", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c639c678498ccaec9ffc2dd7de17840cf4b3b03cc345fbabb4656849bb02e8c", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d57bbd6a240e6343819e7b378923f9a29ace16f47d315e084d64138711bbf35", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4912a68367ce7926b0749388792074f1f4b4823081da63c22009f593749a527", "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:0edbad0db89c0fe22e3de30e877af458c48ba0610a1eb5e896873c147280521b", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03342f05cb8179acc8ac2e487aa3d622fad98beb994660941ac437177f175c7b" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc3196c414c4f100807793f0baba5d1905734ca50331f1a587236581a656a007", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ab5eedac871ab75a6347c1e78f28f8f811882494190ba82b487894f820f5615" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index b8e994733a4..df0860567e0 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-12-133926" + "base": "4.18.0-0.nightly-2024-12-14-152515" }, "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: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", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bb82d081495c2bb42f1b553b9a9bccac884d5e9b50ad341686912d3ad9c5108", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bde335525ce4e297f94f6dd086e894724604b83cd7c2fcac61f9df2b2cc3016c", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24572c990e25eb081fa7045ccd5cb56b385433e95007c11a8f5433d1b52aa617", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a4aa46c4c5bf44aaaa15d4d884aa27748165adeaf41e0b283cf8183cec34d40", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1253d9b74f4c46f684777ab47c74b6a6590d2236ba11df92e8b2cd15462ce1d", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6068a4d7654b6854f8430abf7352f2cc41d1fd9f724e76dd1fd18b1a45f211b2", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20a2409ad9fca47218e43362bc4845e12ed84b98c772a973e76084f07a6924cb", "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:aeddcbcf88a4f7f2915d6e08f9b982846f6cdd140b3e0acb55f871c26ce7f9a1", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:591c406147c675b584c9af1b6ca0aa1fc2022a74e1815f8714b4bfa94ec6bb12" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c507e060dac3aef8c9d4c31560fff23ccb24236c7ae32d284956394076501f2", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4106eefaa876b4ed875e82c24c31360984011b0b3220975cfa9220b5932d99b9" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 20b321ed4cc..6cee044914c 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:6a46884531bca32ff8222b9b3c5b9148d8139580a7bdca811ec4fa3808ce6be8" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6068a4d7654b6854f8430abf7352f2cc41d1fd9f724e76dd1fd18b1a45f211b2" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index c7941d1efb6..f754e18a636 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.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:48ce6b45ba42bf1d22fdc20294c28c24f00c56a595febb644a18f91550a97966" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d57bbd6a240e6343819e7b378923f9a29ace16f47d315e084d64138711bbf35" 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 ad567462640..018d32b45fa 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,21 +1,5 @@ -- 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 +- cluster-network-operator embedded-component ee9c01de80d4a2f57847018a0e48701c718dba91 to 911d8ef7e9e6d70bb68aeaae0849b206d9b487b5 + - 00cc503 2024-12-12T14:49:36+01:00 Skip including default crypto policies to avoid authby issue + - e58b561 2024-12-12T08:20:55+00:00 Cleanup ipsec entries from sidecar container + - ea18156 2024-12-12T08:20:55+00:00 Remove ip xfrm state when IPsec is disabled diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 1576294e0d9..8c39cd4e518 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -5,7 +5,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 8be1749 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 +https://github.com/openshift/cluster-network-operator embedded-component 911d8ef7e9e6d70bb68aeaae0849b206d9b487b5 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 20af082dea1e932a5be3cc8f1f2c166959302e18 https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9 https://github.com/openshift/csi-external-snapshotter embedded-component f52ce8b8b0799a341caf1fb864bba5d9d040a856 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index c33f4e97e5a..d503d43275a 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-12-133926" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-12-224335" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-12-14-152515" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-12-15-170752"