diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 2cd526c48b..ceb2e0e7bf 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=34 KUBE_GIT_VERSION=v1.34.2 -KUBE_GIT_COMMIT=9f57f51e3485ccc1cfd01ec94e9a0f5bef38eacb +KUBE_GIT_COMMIT=76cb1db555ed7a57f12025018d54622ef2e9458c KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 083fa0f3d5..6f520993b2 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-12-014247 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-01-04-032746 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 9497a2795d..21a9061557 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2025-12-10-193741 +OCP_VERSION := 4.22.0-0.nightly-2026-01-01-225210 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 82ea664142..92d75cf827 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/assets/components/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:3119d0f37bf3c0212395bfebcfaf06cb5fd7d564852353decd8a50529ec7df17 + digest: sha256:26965b6179c2914b617f3a6cd413d0143a9c4ea275377444ba5a5595fb188c7a - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:5315a414015c766eae633b6aeda7f0dcac245c758142679924b13436fe6b77e8 + digest: sha256:dc2cca14180b6add6a2e66489bc126603e337d974a961bf7a770adb47b424034 diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 4e45b71342..748bf09725 100644 --- a/assets/components/multus/kustomization.x86_64.yaml +++ b/assets/components/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:6e0db14df8cb8f36742991f3efa4ee2ae6b7f761c799ac3fd2243cfca516e0e1 + digest: sha256:c717e464f8eb9b62738f009caf81d3bff797b1fa4504d6bfe68563aa2896a3ca - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bc266d54f88ed5aed0e7747e2655eccb96ff51d1108b14418dd2bb22a6c71eef + digest: sha256:daa028fd713e3ceebaf533f53918619f405013f6bef46b9fad8f569c11fba519 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index ebc3635214..ffbc566d61 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-12-12-014247" + "base": "4.22.0-0.nightly-arm64-2026-01-04-032746" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3119d0f37bf3c0212395bfebcfaf06cb5fd7d564852353decd8a50529ec7df17", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5315a414015c766eae633b6aeda7f0dcac245c758142679924b13436fe6b77e8" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26965b6179c2914b617f3a6cd413d0143a9c4ea275377444ba5a5595fb188c7a", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc2cca14180b6add6a2e66489bc126603e337d974a961bf7a770adb47b424034" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index c85411437c..ae73e6996c 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.21.0-0.nightly-2025-12-10-193741" + "base": "4.22.0-0.nightly-2026-01-01-225210" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e0db14df8cb8f36742991f3efa4ee2ae6b7f761c799ac3fd2243cfca516e0e1", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc266d54f88ed5aed0e7747e2655eccb96ff51d1108b14418dd2bb22a6c71eef" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c717e464f8eb9b62738f009caf81d3bff797b1fa4504d6bfe68563aa2896a3ca", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:daa028fd713e3ceebaf533f53918619f405013f6bef46b9fad8f569c11fba519" } } diff --git a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json index 4e924e5ecc..5fa5c8628f 100644 --- a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json +++ b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "2.25.0" + "base": "2.25.1" }, "images": { "ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest", diff --git a/assets/optional/ai-model-serving/runtimes/caikit-standalone.yaml b/assets/optional/ai-model-serving/runtimes/caikit-standalone.yaml index 4219567ad4..f5fae9ce52 100644 --- a/assets/optional/ai-model-serving/runtimes/caikit-standalone.yaml +++ b/assets/optional/ai-model-serving/runtimes/caikit-standalone.yaml @@ -9,6 +9,7 @@ metadata: opendatahub.io/dashboard: 'true' spec: annotations: + opendatahub.io/kserve-runtime: 'caikit' prometheus.io/port: '8086' prometheus.io/path: /metrics multiModel: false diff --git a/assets/optional/ai-model-serving/runtimes/caikit-tgis.yaml b/assets/optional/ai-model-serving/runtimes/caikit-tgis.yaml index b6d3a01301..5d5a234838 100644 --- a/assets/optional/ai-model-serving/runtimes/caikit-tgis.yaml +++ b/assets/optional/ai-model-serving/runtimes/caikit-tgis.yaml @@ -9,6 +9,7 @@ metadata: opendatahub.io/dashboard: 'true' spec: annotations: + opendatahub.io/kserve-runtime: 'tgis' prometheus.io/port: '3000' prometheus.io/path: /metrics multiModel: false diff --git a/assets/optional/ai-model-serving/runtimes/ovms-kserve.yaml b/assets/optional/ai-model-serving/runtimes/ovms-kserve.yaml index c2601b4449..853555bf19 100644 --- a/assets/optional/ai-model-serving/runtimes/ovms-kserve.yaml +++ b/assets/optional/ai-model-serving/runtimes/ovms-kserve.yaml @@ -11,6 +11,7 @@ metadata: spec: multiModel: false annotations: + opendatahub.io/kserve-runtime: 'ovms' prometheus.io/port: '8888' prometheus.io/path: /metrics supportedModelFormats: diff --git a/assets/optional/ai-model-serving/runtimes/vllm-cuda.yaml b/assets/optional/ai-model-serving/runtimes/vllm-cuda.yaml index 98bb9037a2..72a2fc19d8 100644 --- a/assets/optional/ai-model-serving/runtimes/vllm-cuda.yaml +++ b/assets/optional/ai-model-serving/runtimes/vllm-cuda.yaml @@ -10,8 +10,9 @@ metadata: opendatahub.io/dashboard: "true" spec: annotations: - prometheus.io/port: "8080" - prometheus.io/path: "/metrics" + opendatahub.io/kserve-runtime: 'vllm' + prometheus.io/port: '8080' + prometheus.io/path: '/metrics' multiModel: false supportedModelFormats: - autoSelect: true diff --git a/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml b/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml index d9ae5def1f..ac69d08634 100644 --- a/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml +++ b/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml @@ -10,6 +10,7 @@ metadata: opendatahub.io/dashboard: 'true' spec: annotations: + opendatahub.io/kserve-runtime: 'vllm' prometheus.io/port: '8080' prometheus.io/path: '/metrics' multiModel: false diff --git a/assets/optional/ai-model-serving/runtimes/vllm-rocm.yaml b/assets/optional/ai-model-serving/runtimes/vllm-rocm.yaml index 8ac4e1d435..784cf1306c 100644 --- a/assets/optional/ai-model-serving/runtimes/vllm-rocm.yaml +++ b/assets/optional/ai-model-serving/runtimes/vllm-rocm.yaml @@ -10,6 +10,7 @@ metadata: opendatahub.io/dashboard: 'true' spec: annotations: + opendatahub.io/kserve-runtime: 'vllm' prometheus.io/port: '8080' prometheus.io/path: '/metrics' multiModel: false diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 37900948cb..653fbefd42 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:3c2782471ebec4abc6afd022de2785c3acf79102111a4d5b5fb3e4f700091a4c + digest: sha256:84fbe37869114e13a549afe0d0219f5689dd0b052b93ca998690d3a6d31fc24f - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:92bcb72a221712e9d063ca5d8ac131b168593436a0f74a74a0a314e7eadcc944 + digest: sha256:df5e2cc8dc5ab0f9a95185af0fe0bfbe22b95b4a646122f92f1ae71d9bc0b9fd - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d4ba33fcc9731eccfbdedcf77a4a53ccff1883d93ce3a3ab6c0014eb26a30e09 + digest: sha256:598b49ca133a318034241c90420a51d79a9cdf143ace4929d567bb557bcc2c9e 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:92bcb72a221712e9d063ca5d8ac131b168593436a0f74a74a0a314e7eadcc944 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df5e2cc8dc5ab0f9a95185af0fe0bfbe22b95b4a646122f92f1ae71d9bc0b9fd - 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:3c2782471ebec4abc6afd022de2785c3acf79102111a4d5b5fb3e4f700091a4c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84fbe37869114e13a549afe0d0219f5689dd0b052b93ca998690d3a6d31fc24f 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 253f592778..89c2b4128c 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:c4ae8e6acc0e9449ebe3e3592038abc9077bf61bec5774c306ed090eb90e8378 + digest: sha256:4c5204d4446b1dab8b5a526cae54d0c6e895909dc6b25264bdba7d2f7381604d - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7bf2e132136e444b3ace65cd83763cd1824e89b37b73c39d4e1b3c62bcd76d4e + digest: sha256:633f2b5e03cf6ef9221c2776c1154c932e9d928f4d44a94c799f4db30916cafb - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bbeddc00892d4caa3fcfd5926f1ca953594473f892bf65e1e468bd3aecd15b56 + digest: sha256:7d6c6f7f69cd968326ab2f311f7a1cbd9e6dd82735ec6cac73ebcca047e1a807 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:7bf2e132136e444b3ace65cd83763cd1824e89b37b73c39d4e1b3c62bcd76d4e + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:633f2b5e03cf6ef9221c2776c1154c932e9d928f4d44a94c799f4db30916cafb - 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:c4ae8e6acc0e9449ebe3e3592038abc9077bf61bec5774c306ed090eb90e8378 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c5204d4446b1dab8b5a526cae54d0c6e895909dc6b25264bdba7d2f7381604d 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 d1b0618bac..3729e26ee1 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.21.0-0.nightly-arm64-2025-12-12-014247" + "base": "4.22.0-0.nightly-arm64-2026-01-04-032746" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c2782471ebec4abc6afd022de2785c3acf79102111a4d5b5fb3e4f700091a4c", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92bcb72a221712e9d063ca5d8ac131b168593436a0f74a74a0a314e7eadcc944", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4ba33fcc9731eccfbdedcf77a4a53ccff1883d93ce3a3ab6c0014eb26a30e09" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84fbe37869114e13a549afe0d0219f5689dd0b052b93ca998690d3a6d31fc24f", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df5e2cc8dc5ab0f9a95185af0fe0bfbe22b95b4a646122f92f1ae71d9bc0b9fd", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:598b49ca133a318034241c90420a51d79a9cdf143ace4929d567bb557bcc2c9e" } } 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 5ca3aef4b9..2d09cb5e3a 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.21.0-0.nightly-2025-12-10-193741" + "base": "4.22.0-0.nightly-2026-01-01-225210" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4ae8e6acc0e9449ebe3e3592038abc9077bf61bec5774c306ed090eb90e8378", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bf2e132136e444b3ace65cd83763cd1824e89b37b73c39d4e1b3c62bcd76d4e", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbeddc00892d4caa3fcfd5926f1ca953594473f892bf65e1e468bd3aecd15b56" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c5204d4446b1dab8b5a526cae54d0c6e895909dc6b25264bdba7d2f7381604d", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:633f2b5e03cf6ef9221c2776c1154c932e9d928f4d44a94c799f4db30916cafb", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d6c6f7f69cd968326ab2f311f7a1cbd9e6dd82735ec6cac73ebcca047e1a807" } } diff --git a/assets/optional/sriov/deploy/operator.yaml b/assets/optional/sriov/deploy/operator.yaml index 543d376991..83b0775235 100644 --- a/assets/optional/sriov/deploy/operator.yaml +++ b/assets/optional/sriov/deploy/operator.yaml @@ -22,21 +22,21 @@ spec: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: SRIOV_CNI_IMAGE - value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:76ed6db7ad7d01e1ec70888f3c3ca787bab460ef1139d4930f66e8aab4fe2dd7 + value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:6a3b0070b671a818f094f78073279669c9646ebdc668f7099e44d007380b6060 - name: SRIOV_DEVICE_PLUGIN_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:ea6942948b23a96054a8c27c4a8b6cffca49b6acc6ca556ce3e0708eb787789d + value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6508614560de3d333fe93d7c72e6b6a1fffb4b5fd75632bf74fc686eb9deaf80 - name: NETWORK_RESOURCES_INJECTOR_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f07f432f89667200549eac89c6ef53c734420eb76a29c4008dd85a0a3526ad03 + value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f14abff38a42cb72299e58b957c6f0f09af5182208800a4a6ed55e57e4ab5f28 - name: OPERATOR_NAME value: sriov-network-operator - name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:41d6d4232d6ed37f370795908f7ea0b56379ca6538afbb35ef7cfda4f000fafd + value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:e912e692c32a70f22c34360ca8e8960bdf40bc141f54c5782da3380b972b62ff - name: SRIOV_NETWORK_WEBHOOK_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cd12a9afe94fcb823cfff1a274b633c9d687b11537ad37c1752244981e9bda43 + value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6b23062ab592c3776ff7207ce7caed878474566033e45e377a893c4bac01de82 - name: SRIOV_INFINIBAND_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ad2994a2ef988378926196175d26ffc3bc9ed0be6a8d4d9eb79bae0422641af4 + value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:b423a3dca275e650fd498e6ca928c9d3c6bd1744c03986d30fb8775f04609b39 - name: RDMA_CNI_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:993925e3e3ca5e3d603ad9b868490e5ede61190ecb20dea873bd597627c65c95 + value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:276e01d4ce0e9407f5f67e015af36ec552f61303fbb7b2d45de5beacdc417937 - name: RESOURCE_PREFIX value: openshift.io - name: ADMISSION_CONTROLLERS_ENABLED @@ -46,9 +46,9 @@ spec: - name: ADMISSION_CONTROLLERS_CERTIFICATES_INJECTOR_SECRET_NAME value: network-resources-injector-secret - name: METRICS_EXPORTER_IMAGE - value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:04358d43922f4d29af64f99baa2a73b0b32cf2895140232b61e538599ec08e46 + value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:41b94f5b270e5d57b2130de47b0fa25796bfcf64c4dc771058ca0cd433404c05 - name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE - value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:5d7478a62742900e39d7b007dde5375cd06c6076ced6dab69d805f5fcce3f342 + value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ca1344cb64140188b7cae7bbc51fb751566c0b0c97d5e39b5850e628032c4a5e - name: METRICS_EXPORTER_SECRET_NAME value: metrics-exporter-cert - name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_ENABLED @@ -79,7 +79,7 @@ spec: value: /run/cni/bin - name: CLUSTER_TYPE value: kubernetes - image: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:edf864070393e01c4423ead4f86a066cb2e083de870ad84e1367c6c0fee5c84d + image: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:c4b91f426ee2ca995472dc03e04276cab57e1edf01e7af7a57b360c1b0ec5bd0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/assets/optional/sriov/release-sriov-aarch64.json b/assets/optional/sriov/release-sriov-aarch64.json index 2704e63ba9..2cd4339150 100644 --- a/assets/optional/sriov/release-sriov-aarch64.json +++ b/assets/optional/sriov/release-sriov-aarch64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.20.0-202511250912" + "base": "4.20.0-202512081147" }, "images": { - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:76ed6db7ad7d01e1ec70888f3c3ca787bab460ef1139d4930f66e8aab4fe2dd7", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:ea6942948b23a96054a8c27c4a8b6cffca49b6acc6ca556ce3e0708eb787789d", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f07f432f89667200549eac89c6ef53c734420eb76a29c4008dd85a0a3526ad03", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:41d6d4232d6ed37f370795908f7ea0b56379ca6538afbb35ef7cfda4f000fafd", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cd12a9afe94fcb823cfff1a274b633c9d687b11537ad37c1752244981e9bda43", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ad2994a2ef988378926196175d26ffc3bc9ed0be6a8d4d9eb79bae0422641af4", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:993925e3e3ca5e3d603ad9b868490e5ede61190ecb20dea873bd597627c65c95", - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:04358d43922f4d29af64f99baa2a73b0b32cf2895140232b61e538599ec08e46", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:5d7478a62742900e39d7b007dde5375cd06c6076ced6dab69d805f5fcce3f342", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:edf864070393e01c4423ead4f86a066cb2e083de870ad84e1367c6c0fee5c84d" + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:6a3b0070b671a818f094f78073279669c9646ebdc668f7099e44d007380b6060", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6508614560de3d333fe93d7c72e6b6a1fffb4b5fd75632bf74fc686eb9deaf80", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f14abff38a42cb72299e58b957c6f0f09af5182208800a4a6ed55e57e4ab5f28", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:e912e692c32a70f22c34360ca8e8960bdf40bc141f54c5782da3380b972b62ff", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6b23062ab592c3776ff7207ce7caed878474566033e45e377a893c4bac01de82", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:b423a3dca275e650fd498e6ca928c9d3c6bd1744c03986d30fb8775f04609b39", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:276e01d4ce0e9407f5f67e015af36ec552f61303fbb7b2d45de5beacdc417937", + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:41b94f5b270e5d57b2130de47b0fa25796bfcf64c4dc771058ca0cd433404c05", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ca1344cb64140188b7cae7bbc51fb751566c0b0c97d5e39b5850e628032c4a5e", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:c4b91f426ee2ca995472dc03e04276cab57e1edf01e7af7a57b360c1b0ec5bd0" } } diff --git a/assets/optional/sriov/release-sriov-x86_64.json b/assets/optional/sriov/release-sriov-x86_64.json index 2704e63ba9..2cd4339150 100644 --- a/assets/optional/sriov/release-sriov-x86_64.json +++ b/assets/optional/sriov/release-sriov-x86_64.json @@ -1,17 +1,17 @@ { "release": { - "base": "4.20.0-202511250912" + "base": "4.20.0-202512081147" }, "images": { - "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:76ed6db7ad7d01e1ec70888f3c3ca787bab460ef1139d4930f66e8aab4fe2dd7", - "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:ea6942948b23a96054a8c27c4a8b6cffca49b6acc6ca556ce3e0708eb787789d", - "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f07f432f89667200549eac89c6ef53c734420eb76a29c4008dd85a0a3526ad03", - "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:41d6d4232d6ed37f370795908f7ea0b56379ca6538afbb35ef7cfda4f000fafd", - "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cd12a9afe94fcb823cfff1a274b633c9d687b11537ad37c1752244981e9bda43", - "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ad2994a2ef988378926196175d26ffc3bc9ed0be6a8d4d9eb79bae0422641af4", - "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:993925e3e3ca5e3d603ad9b868490e5ede61190ecb20dea873bd597627c65c95", - "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:04358d43922f4d29af64f99baa2a73b0b32cf2895140232b61e538599ec08e46", - "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:5d7478a62742900e39d7b007dde5375cd06c6076ced6dab69d805f5fcce3f342", - "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:edf864070393e01c4423ead4f86a066cb2e083de870ad84e1367c6c0fee5c84d" + "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:6a3b0070b671a818f094f78073279669c9646ebdc668f7099e44d007380b6060", + "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6508614560de3d333fe93d7c72e6b6a1fffb4b5fd75632bf74fc686eb9deaf80", + "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f14abff38a42cb72299e58b957c6f0f09af5182208800a4a6ed55e57e4ab5f28", + "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:e912e692c32a70f22c34360ca8e8960bdf40bc141f54c5782da3380b972b62ff", + "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6b23062ab592c3776ff7207ce7caed878474566033e45e377a893c4bac01de82", + "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:b423a3dca275e650fd498e6ca928c9d3c6bd1744c03986d30fb8775f04609b39", + "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:276e01d4ce0e9407f5f67e015af36ec552f61303fbb7b2d45de5beacdc417937", + "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:41b94f5b270e5d57b2130de47b0fa25796bfcf64c4dc771058ca0cd433404c05", + "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ca1344cb64140188b7cae7bbc51fb751566c0b0c97d5e39b5850e628032c4a5e", + "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:c4b91f426ee2ca995472dc03e04276cab57e1edf01e7af7a57b360c1b0ec5bd0" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 8162f8e522..d66b345268 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2025-12-12-014247" + "base": "4.22.0-0.nightly-arm64-2026-01-04-032746" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9c8ea4c8325d40eb18af7d7f6afaa9193e267a8e31a353474115659d733daf0", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65e22e1f8767c0a9b44bdcfac686137832d369e71e28be1e43e72370a5789af9", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47662a8aede0c313b721e753fb38a3e78ecf0e6d05546799beda7319a2c27287", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4ba33fcc9731eccfbdedcf77a4a53ccff1883d93ce3a3ab6c0014eb26a30e09", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa5bc110361122e642c83e0fa15783af05579c50793c8bfe8086f786101cff73", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3ca03c9bde6e9824886bac4f94d54a402743b0f143d9940f8d5d0db2b7399e1", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d9c0cc6ae472b095c7ee5ddef96d762fbb91e61cc9cd387184dd6e8729e4b4c", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d7da5ed33bfa53e85a102373b26c75b0cc43f4ef18cfc981508475b13f19722", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a05a1de2d519b52c5aa2899c28781761e59a3592df9ede321f81b339269ec723", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e2b05d5350f031f26184dad24ba434db988fd8500ad7868fa633550f96305ea", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:598b49ca133a318034241c90420a51d79a9cdf143ace4929d567bb557bcc2c9e", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4f2af884c609fa87696d75bf6a47081401a747c8311dc5c3c5e9eaed2e5e00b", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68d3672eb9d138861e0039d3aff00c20f48ff4588c8114969238e28442693165", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cd0be80b30f778396bfd24751de43f09a6aace40dc594adcf4fd46f4ad348db", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09d865455a5ebe532b787823e3aac953fab40b850fffad25482b2f361c3b3a22" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c158c4f6652443271afc2256da30d7d662163b1e4ef8f6822c242efa696e7e6f" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 18b0191608..cd3b85dacd 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-2025-12-10-193741" + "base": "4.22.0-0.nightly-2026-01-01-225210" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a66878842c091c165a3bdfb5040966417e6274028e736776405417e89b643714", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18504c088c4b54069cf75c2d7d2dc9dd3d0607c4ac9b6a3f6a302bd80f0890bc", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8842274553ef52aa327f0c0bc4c8fb8552678d1d0dc0bb545009ecbab5626e29", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbeddc00892d4caa3fcfd5926f1ca953594473f892bf65e1e468bd3aecd15b56", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7389c80c3c112a5ba6db5fc5e815754cdd28a1117632ace2b53ac4bb2c71431", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0622e764c91f3206b12a10df5025a804b032f81a280075f72480d5d4c4eac44d", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58ccde0b2b7b8e85dd4703ad2b330481f231ac3954433dba36e29b66a0ae7ea6", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae99fe99e73f27c33228e37ce22656dcbe2d99fc4d39b25411256e1e732ca3bc", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e70402f858a2f9716c1effce9d2fabf04a84d8239284ffc9bc6d10766b3a03fb", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31f875c35c0ed7cbbde19c37fd0e59bf89327b5e3223212b1498630e4194c197", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d6c6f7f69cd968326ab2f311f7a1cbd9e6dd82735ec6cac73ebcca047e1a807", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5fa1bf078ce1fdfad59693ad270aae6ba887792c0b92b3c2bb0f4233598ded2", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:758b69fe1ef97cc53c375da634c328b55212ac4aa7b6e34e95491f7f150a26d9", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9980dd168cec554df8166ea1027899e65eb1407a326cc89c6937351484ff5b57", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:274c7411e9a38251cb702041af0dbb09aba7c983f23386bf77090432c6aa6620" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f5b1f3d0d3e75bbba2b9d533158558b3f88bf046dfafb35e37e14653c12b1e4" } } diff --git a/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go b/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go index 1c6b10fda4..44f5b749ad 100644 --- a/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go +++ b/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go @@ -169,9 +169,6 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs { // https://issues.redhat.com/browse/OCPBUGS-61378 "[sig-network] Conntrack should be able to cleanup conntrack entries when UDP service target port changes for a NodePort service", - - // https://issues.redhat.com/browse/OCPBUGS-63045 - "[sig-node] [Serial] Pod InPlace Resize Container (deferred-resizes) [FeatureGate:InPlacePodVerticalScaling]", }, // tests that may work, but we don't support them "Unsupported": { diff --git a/deps/github.com/openshift/kubernetes/test/e2e/common/node/pod_resize.go b/deps/github.com/openshift/kubernetes/test/e2e/common/node/pod_resize.go index 8fa7af2e53..fbd7dfbb33 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/common/node/pod_resize.go +++ b/deps/github.com/openshift/kubernetes/test/e2e/common/node/pod_resize.go @@ -49,12 +49,12 @@ const ( increasedCPU = "25m" increasedCPULimit = "35m" - originalMem = "20Mi" - originalMemLimit = "30Mi" - reducedMem = "15Mi" - reducedMemLimit = "25Mi" - increasedMem = "25Mi" - increasedMemLimit = "35Mi" + originalMem = "35Mi" + originalMemLimit = "45Mi" + reducedMem = "30Mi" + reducedMemLimit = "40Mi" + increasedMem = "40Mi" + increasedMemLimit = "50Mi" ) func offsetCPU(index int, value string) string { diff --git a/deps/github.com/openshift/kubernetes/test/e2e/framework/pod/wait.go b/deps/github.com/openshift/kubernetes/test/e2e/framework/pod/wait.go index d7067be28c..0a8f315329 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/framework/pod/wait.go +++ b/deps/github.com/openshift/kubernetes/test/e2e/framework/pod/wait.go @@ -44,10 +44,10 @@ import ( const ( // defaultPodDeletionTimeout is the default timeout for deleting pod. - defaultPodDeletionTimeout = 3 * time.Minute + defaultPodDeletionTimeout = 10 * time.Minute // podListTimeout is how long to wait for the pod to be listable. - podListTimeout = time.Minute + podListTimeout = 5 * time.Minute podRespondingTimeout = 15 * time.Minute @@ -55,7 +55,7 @@ const ( podScheduledBeforeTimeout = podListTimeout + (20 * time.Second) // podStartTimeout is how long to wait for the pod to be started. - podStartTimeout = 5 * time.Minute + podStartTimeout = 10 * time.Minute // singleCallTimeout is how long to try single API calls (like 'get' or 'list'). Used to prevent // transient failures from failing tests. diff --git a/deps/github.com/openshift/kubernetes/test/e2e/kubectl/kubectl.go b/deps/github.com/openshift/kubernetes/test/e2e/kubectl/kubectl.go index 2e27e3f7a9..a73583d493 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/kubectl/kubectl.go +++ b/deps/github.com/openshift/kubernetes/test/e2e/kubectl/kubectl.go @@ -2138,7 +2138,9 @@ metadata: }) ginkgo.It("GET on status subresource of built-in type (node) returns identical info as GET on the built-in type", func(ctx context.Context) { ginkgo.By("first listing nodes in the cluster, and using first node of the list") - nodes, err := c.CoreV1().Nodes().List(ctx, metav1.ListOptions{}) + nodes, err := c.CoreV1().Nodes().List(ctx, metav1.ListOptions{ + FieldSelector: "spec.unschedulable=false", + }) framework.ExpectNoError(err) gomega.Expect(nodes.Items).ToNot(gomega.BeEmpty()) node := nodes.Items[0] diff --git a/deps/github.com/openshift/kubernetes/test/e2e/storage/testsuites/readwriteoncepod.go b/deps/github.com/openshift/kubernetes/test/e2e/storage/testsuites/readwriteoncepod.go index 1926ca3d74..a149084b35 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/storage/testsuites/readwriteoncepod.go +++ b/deps/github.com/openshift/kubernetes/test/e2e/storage/testsuites/readwriteoncepod.go @@ -130,7 +130,7 @@ func (t *readWriteOncePodTestSuite) DefineTests(driver storageframework.TestDriv ginkgo.DeferCleanup(cleanup) }) - ginkgo.It("should preempt lower priority pods using ReadWriteOncePod volumes", func(ctx context.Context) { + f.It("should preempt lower priority pods using ReadWriteOncePod volumes", f.WithSerial(), func(ctx context.Context) { // Create the ReadWriteOncePod PVC. accessModes := []v1.PersistentVolumeAccessMode{v1.ReadWriteOncePod} l.volume = storageframework.CreateVolumeResourceWithAccessModes(ctx, driver, l.config, pattern, t.GetTestSuiteInfo().SupportedSizeRange, accessModes, nil) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index e8967915a6..af7811bb74 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -2,6 +2,6 @@ # 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:0622e764c91f3206b12a10df5025a804b032f81a280075f72480d5d4c4eac44d" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:758b69fe1ef97cc53c375da634c328b55212ac4aa7b6e34e95491f7f150a26d9" 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 d8d3cfdcd6..3594a5ad0a 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -2,6 +2,6 @@ # 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:c3ca03c9bde6e9824886bac4f94d54a402743b0f143d9940f8d5d0db2b7399e1" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68d3672eb9d138861e0039d3aff00c20f48ff4588c8114969238e28442693165" 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 6009ea1b20..9b8e9ed225 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,24 +1,180 @@ -- cluster-kube-apiserver-operator embedded-component eecc8a9b87afa5ba882564cc4a352c93a555d7ab to 2c58d2f2bad129f0017ca194ae8a38711917c21c - - 5652b0b 2025-12-04T21:33:45-08:00 Update k8s version ranges for MutatingAdmissionPolicy +- api embedded-component c2a41ea924bd8227622363c3d12f456cd2186924 to 3f584b29ee4a4faeb1a733e97c5ba16a1e5ee4f8 + - 71ef3c0e 2025-12-19T15:45:07+00:00 Disable the statusoptional linter + - 59642090 2025-12-17T10:33:21+01:00 Add NetworkConnect DevPreview feature gate + - b67d202b 2025-12-17T10:33:02+01:00 Allow for ovn-kubernetes repo enhancement URLs + - 67719123 2025-12-16T16:10:55+01:00 Add apiextensions group and CompatibilityRequirement + - d1bbe4d5 2025-12-12T13:39:23-05:00 Added validation to check if OKD has all default featuregates and rebased repo + - 301d5721 2025-12-12T13:16:42-05:00 Fixing integration test failure + - ae79145a 2025-12-12T13:16:41-05:00 Introduce new OKD featureset and enable all default featuregates + - 887fcda8 2025-12-09T11:28:01+01:00 NO-JIRA: remove beta enabled TranslateStreamCloseWebsocketRequests feature from gates + - 57d5184a 2025-11-24T11:02:07-06:00 Migrate away from deprecated ioutil -- cluster-network-operator embedded-component 8bd3f1c3ea6055a49c14ece00a5b8779a100fc5d to 8d09651e31c64340865f7ec7f349786528805ebd - - b4c41d7 2025-12-04T23:56:54+01:00 Fix frr-k8s-statuscleaner crash: move $(LOG_LEVEL) to end of args +- cluster-csi-snapshot-controller-operator embedded-component 0dd541084bee8885dbd14dcd6eb2f826ba779883 to 455c9eb412bb41634e127b9491c2cf6d3580a0ec + - 58e58df 2025-12-18T17:55:40+00:00 Updating ose-cluster-csi-snapshot-controller-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-cluster-csi-snapshot-controller-operator.yml -- kubernetes embedded-component 05182efbe79b0f9893cdffc9f76589cfd7419b39 to 9f57f51e3485ccc1cfd01ec94e9a0f5bef38eacb - - 873cd1d1b 2025-12-08T10:42:38+01:00 UPSTREAM: : make update - - 8d86655e3 2025-12-05T17:50:39+01:00 UPSTREAM: : pin cadvisor to downstream fork +- cluster-ingress-operator embedded-component b62dd27c901d495e6e78b11968872c002cc2416f to 81c961d319f2cdc5cee9eae2ef57f2229ffc2200 + - d8e1530 2025-12-16T14:27:53-05:00 update command to get Konflux index image + - 056f80f 2025-10-23T09:32:25-04:00 don't use constant in unit test + - 85b6fc9 2025-10-02T09:13:08-04:00 set trustBundleName in Istio global values -- machine-config-operator embedded-component 00b8722ba3d4926f82541d781b3f6c1de7bd6b21 to e2f6042b4bd21ad64115fa5be529edc1cce8c451 - - d41f4bb5 2025-12-09T11:44:00+02:00 add missing ports in contaiterport on the daemoset - - 130d0ccd 2025-12-08T15:16:04-05:00 e2e test: update to wait until test node returns to ready - - ed3a3c85 2025-12-08T15:11:46-05:00 msbic: skip azure machinesets with securityType - - 92dda854 2025-12-08T09:53:35+02:00 add a relevant svc to the crio port +- cluster-kube-apiserver-operator embedded-component 2c58d2f2bad129f0017ca194ae8a38711917c21c to 3fb92ce8d990d1608c4b2bbd79f412b4a3eac629 + - 01fae25 2025-12-17T10:50:54+05:30 Update go.mod + - c61b8b3 2025-12-12T17:46:37+05:30 Add cert rotation tests with Ginkgo integration + - 98fc926 2025-12-12T12:31:30+01:00 OCPBUGS-61674: increases termination timeouts for GCP + - 49c18f5 2025-12-03T13:56:39+05:30 Move ginkgo/v2 to main require section in go.mod + - fbdac14 2025-12-03T13:56:24+05:30 Migrate TestTokenRequestAndReview to Ginkgo framework -- kubernetes image-amd64 05182efbe79b0f9893cdffc9f76589cfd7419b39 to 9f57f51e3485ccc1cfd01ec94e9a0f5bef38eacb - - 873cd1d1b 2025-12-08T10:42:38+01:00 UPSTREAM: : make update - - 8d86655e3 2025-12-05T17:50:39+01:00 UPSTREAM: : pin cadvisor to downstream fork +- cluster-network-operator embedded-component 8d09651e31c64340865f7ec7f349786528805ebd to 9d8ab483ef704b0c5c74ad564156085558e2e112 + - d4f5de4 2025-12-02T10:41:21+02:00 Add kubevirt platform to dual-stack supported platforms + - df98ce8 2025-02-05T18:23:22+05:30 Prevent resetting masquerade subnet + - 326ead3 2025-02-05T17:59:54+05:30 Update masquerade subnet to ovnkube-control-plane deployment -- kubernetes image-arm64 9f57f51e3485ccc1cfd01ec94e9a0f5bef38eacb to 9bbcda1bf017104f96c0f1bd27175d122f416f5a +- csi-external-snapshotter embedded-component 9098db0e434e0d986eeadd2ebe69119540a550d1 to 6383ab93be114af8d1067523602bd2a44c927f1a + - 9141223 2025-12-19T20:40:10+00:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-csi-snapshot-controller.yml + - a38d3cc 2025-12-19T11:01:23+01:00 UPSTREAM: : Bump log level of the snapshot controller + - 44255b2 2025-12-18T00:41:21+00:00 UPSTREAM: : Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-csi-external-snapshotter.yml + +- kubernetes embedded-component 9f57f51e3485ccc1cfd01ec94e9a0f5bef38eacb to 76cb1db555ed7a57f12025018d54622ef2e9458c + - c8f673758 2025-12-11T14:09:08-05:00 UPSTREAM: : enable InPlace resize test + - 9d621f97b 2025-12-10T10:10:48-03:00 UPSTREAM: 135476: Filter out the nodes created by other tests + - e2b978d53 2025-12-10T09:45:34+01:00 UPSTREAM: 135623: Fix the preemption test + - bd75dce1e 2025-12-09T14:04:40+01:00 UPSTREAM: 135680: test/e2e: increase memory limits in pod resize tests + - 59a2d7e3f 2025-10-27T09:35:42-04:00 UPSTREAM: : Extend k8s suite timeouts for parallel testing load Analysis of flakes from the k8s suite has shown consistent examples of otherwise well behaved testing failing due timeouts because of temporary load on controllers during parallel testing. Increasing these timeouts will reduce flakes. + +- machine-config-operator embedded-component e2f6042b4bd21ad64115fa5be529edc1cce8c451 to 9333c5a69d9e8159b98908561d7fb2269b7a9197 + - bfab3ed9 2025-12-22T16:02:30+01:00 NO-ISSUE: Bump OpenShift builder images to 4.22 + - 89d1c1c9 2025-12-18T12:58:16-05:00 msbic: skip update if arch annotation not found + - 668ed84e 2025-12-18T17:29:52+01:00 Integrate OSImageStream into MCP and sync logic + - 9d52d684 2025-12-15T13:31:40+01:00 MCO-1961: Rework MC's OSImageURL merge logic + - cbf776a7 2025-12-12T13:40:29-06:00 fixed state to go to degraded + - d6a4e185 2025-12-11T13:52:32-05:00 boot_image: add event based queueing + - b09a9e7c 2025-12-11T13:52:32-05:00 controller: rename msbic to boot image controller + - cd5c07bd 2025-12-11T10:40:55-05:00 Revert "OCPNODE-3719: Default Enablement of Auto Sizing Reserved in OpenShift 4.21" + - c2b31747 2025-12-11T07:23:37-05:00 added OWNERS file + - 9f747564 2025-12-11T03:53:42-05:00 added tls cert to workers trust store + - 37cdfeb6 2025-12-10T15:15:16-06:00 fixes empty pull secret degradation + - 0632e3cc 2025-12-10T10:23:16-05:00 add tls certificate to InternalReleaseImage registry + - 9462f6ed 2025-12-09T16:32:17-05:00 miscellaneous verify fixes + - c7aa7a43 2025-12-09T11:05:18+00:00 MCO-2006: Migrate pinned images sets private test cases + - 7681165a 2025-12-08T09:33:11-05:00 Remove log exposing kubeconfig + - c58adcca 2025-12-03T16:59:04-05:00 operator: add retry for MachineConfiguration calls + - 2447fa43 2025-10-31T07:44:46-04:00 Only update when there is an actual controller change + +- operator-framework-olm embedded-component 7d2dd62c2a73b66aa99e82c90f64ab53dd523ddf to c66c7a81be6f259c46fb8d4bc1b691fbe97722df + - d6b22526 2025-12-18T23:12:47-05:00 Fix the macos cross build within the OCP builder image + - 423abcaf 2025-12-18T23:12:43-05:00 Update Dockerfiles/CI to use golang 1.25/ocp 4.22 + - 015755b7 2025-12-18T10:00:13+00:00 Updating operator-registry-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/operator-registry.yml + - 7e975d9d 2025-12-18T03:34:13+00:00 Updating operator-lifecycle-manager-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/operator-lifecycle-manager.yml + - 83058a03 2025-12-18T00:55:53+00:00 Updating ose-operator-framework-tools-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-operator-framework-tools.yml + +- service-ca-operator embedded-component e9622ba18c86bf24aceab0c19fdcb87339c14f44 to 17676192189f5612ba4fd0ee7a23a562390b72ec + - b9ff307 2025-12-19T08:51:27+00:00 Updating ose-service-ca-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-service-ca-operator.yml + - 85619ff 2025-12-12T18:11:17+08:00 vendor: update dependencies for OTE/Ginkgo support + - ac809e4 2025-12-12T16:59:14+08:00 cmd/README: add OTE infrastructure and remove legacy test extension + +- oc image-amd64 345800dc3c4164fbca313c1cbfb383f262547903 to 6d61f7657300dcc77f91df9c0b2f23f88cdf7123 + - e3e3bd27 2025-12-22T16:29:10+03:00 Bump library-go to update selinux and x/crypto + - bb6a44e1 2025-12-20T12:46:25+00:00 Updating ose-cli-artifacts-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-cli-artifacts.yml + - 127463a5 2025-12-20T12:17:41+00:00 Updating openshift-enterprise-deployer-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/openshift-enterprise-deployer.yml + - d0e94b1f 2025-12-19T05:58:25+00:00 Updating ose-tools-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-tools.yml + - 17105551 2025-12-18T15:16:36+00:00 Updating openshift-enterprise-cli-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/openshift-enterprise-cli.yml + - 5f5ed85a 2025-12-16T14:39:57+03:00 Bump docker/docker to 28.5.2 to drop dependency of containerd/containerd + +- csi-external-snapshotter image-amd64 9098db0e434e0d986eeadd2ebe69119540a550d1 to 6383ab93be114af8d1067523602bd2a44c927f1a + - 9141223 2025-12-19T20:40:10+00:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-csi-snapshot-controller.yml + - a38d3cc 2025-12-19T11:01:23+01:00 UPSTREAM: : Bump log level of the snapshot controller + - 44255b2 2025-12-18T00:41:21+00:00 UPSTREAM: : Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-csi-external-snapshotter.yml + +- ovn-kubernetes image-amd64 25a714b82c643bcfdf5543cb467afa32dac06787 to 1a9c60ba700d88afd6d4805091905c3cf094e75d + - 8b509ae2 2025-12-19T16:14:42+08:00 Bump ovn to 25.09.1-25.el9fdp and 25.09.1-25.el9s for OKD + - 6a4a58af 2025-12-04T22:58:41+08:00 No-overlay mode enhancement + - b6ccbf7a 2025-12-04T13:06:23+01:00 Fix coderabbit path_filters + - 33903521 2025-12-04T10:33:04+01:00 Fix coderabbit config + - b52e40b0 2025-12-03T13:01:03+01:00 remove forced V(5) logging during startup + - 92a778c2 2025-12-02T11:54:08+01:00 [udn isolation] Update RA ACLs to handle multi-subnet networks. + - 5dbab4fa 2025-12-02T11:54:08+01:00 Multi-subnet default network: require the same hostSubnet. + - dcb90b85 2025-12-02T11:54:08+01:00 EgressIP: add route policies for east-west traffic between networks + - 2e1d47ba 2025-12-02T11:54:04+01:00 [test] always use multi-subnet setup for CI. + - 30b06cbe 2025-12-02T11:54:01+01:00 [kind] Add multi-cidr default subnet option. + - 34784e71 2025-12-01T09:55:30-05:00 Fixes gateway interface VLAN tag settings + - 76eb7c5c 2025-11-26T11:14:48+02:00 test/e2e:: Fix duplicate IP validation test for IP family enforcement + - 81bbf015 2025-11-26T09:39:53+02:00 test/e2e: add IP family validation tests for layer2 primary networks + - 8421af49 2025-11-26T09:39:53+02:00 test/e2e: Move createVMWithStaticIP helper function + - 08c5b40a 2025-11-26T09:39:53+02:00 test/e2e/kubevirt: Refactor duplicate VM pod err event waiter to shared helper + - 5d6b7784 2025-11-26T09:39:49+02:00 allocator/pod: add IP family validation for layer2 primary networks + - 819aad3c 2025-11-25T13:00:56-05:00 fix: Remove duplicate - and sometimes incorrect - defaults from --help + - 6cba203a 2025-11-25T13:00:17-05:00 fix: Register a bunch of cli flags for --help message + - fd54939c 2025-11-25T12:59:53-05:00 chore: Remove redundant wording in some --help option descriptions + - f71844ac 2025-11-25T12:56:03-05:00 ci: Split unit test phase from build + - bdfb2488 2025-11-25T13:36:28+01:00 Refactor ETP=local flow generation to reduce code duplication + - 01c33f42 2025-11-25T13:36:28+01:00 Service OpenFlows: Return traffic should not be committed to conntrack + - e0156740 2025-11-25T13:36:28+01:00 Fix issues with dualstack detection for nodePort with hostNetwork tests + - f0a3f5f1 2025-11-25T13:36:28+01:00 Fix cookie generation for ETP=local service flows with target ports + - c33ddf99 2025-11-25T13:35:59+01:00 Adjust E2E tests for named port handling + - eebbb4a1 2025-11-25T10:55:17+01:00 Add unit test for named port handling in ETP=local services + - ce18cfd0 2025-11-25T10:55:17+01:00 Fix named port handling in ETP=local services with host-networked pods + +- kubernetes image-amd64 9f57f51e3485ccc1cfd01ec94e9a0f5bef38eacb to 76cb1db555ed7a57f12025018d54622ef2e9458c + - c8f673758 2025-12-11T14:09:08-05:00 UPSTREAM: : enable InPlace resize test - 9d621f97b 2025-12-10T10:10:48-03:00 UPSTREAM: 135476: Filter out the nodes created by other tests - e2b978d53 2025-12-10T09:45:34+01:00 UPSTREAM: 135623: Fix the preemption test + - bd75dce1e 2025-12-09T14:04:40+01:00 UPSTREAM: 135680: test/e2e: increase memory limits in pod resize tests + - 59a2d7e3f 2025-10-27T09:35:42-04:00 UPSTREAM: : Extend k8s suite timeouts for parallel testing load Analysis of flakes from the k8s suite has shown consistent examples of otherwise well behaved testing failing due timeouts because of temporary load on controllers during parallel testing. Increasing these timeouts will reduce flakes. + +- service-ca-operator image-amd64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 to 17676192189f5612ba4fd0ee7a23a562390b72ec + - b9ff307 2025-12-19T08:51:27+00:00 Updating ose-service-ca-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-service-ca-operator.yml + - 85619ff 2025-12-12T18:11:17+08:00 vendor: update dependencies for OTE/Ginkgo support + - ac809e4 2025-12-12T16:59:14+08:00 cmd/README: add OTE infrastructure and remove legacy test extension + +- oc image-arm64 345800dc3c4164fbca313c1cbfb383f262547903 to 6d61f7657300dcc77f91df9c0b2f23f88cdf7123 + - e3e3bd27 2025-12-22T16:29:10+03:00 Bump library-go to update selinux and x/crypto + - bb6a44e1 2025-12-20T12:46:25+00:00 Updating ose-cli-artifacts-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-cli-artifacts.yml + - 127463a5 2025-12-20T12:17:41+00:00 Updating openshift-enterprise-deployer-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/openshift-enterprise-deployer.yml + - d0e94b1f 2025-12-19T05:58:25+00:00 Updating ose-tools-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-tools.yml + - 17105551 2025-12-18T15:16:36+00:00 Updating openshift-enterprise-cli-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/openshift-enterprise-cli.yml + - 5f5ed85a 2025-12-16T14:39:57+03:00 Bump docker/docker to 28.5.2 to drop dependency of containerd/containerd + +- csi-external-snapshotter image-arm64 9098db0e434e0d986eeadd2ebe69119540a550d1 to 6383ab93be114af8d1067523602bd2a44c927f1a + - 9141223 2025-12-19T20:40:10+00:00 UPSTREAM: : Updating ose-csi-snapshot-controller-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-csi-snapshot-controller.yml + - a38d3cc 2025-12-19T11:01:23+01:00 UPSTREAM: : Bump log level of the snapshot controller + - 44255b2 2025-12-18T00:41:21+00:00 UPSTREAM: : Updating ose-csi-external-snapshotter-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-csi-external-snapshotter.yml + +- ovn-kubernetes image-arm64 25a714b82c643bcfdf5543cb467afa32dac06787 to 1a9c60ba700d88afd6d4805091905c3cf094e75d + - 8b509ae2 2025-12-19T16:14:42+08:00 Bump ovn to 25.09.1-25.el9fdp and 25.09.1-25.el9s for OKD + - 6a4a58af 2025-12-04T22:58:41+08:00 No-overlay mode enhancement + - b6ccbf7a 2025-12-04T13:06:23+01:00 Fix coderabbit path_filters + - 33903521 2025-12-04T10:33:04+01:00 Fix coderabbit config + - b52e40b0 2025-12-03T13:01:03+01:00 remove forced V(5) logging during startup + - 92a778c2 2025-12-02T11:54:08+01:00 [udn isolation] Update RA ACLs to handle multi-subnet networks. + - 5dbab4fa 2025-12-02T11:54:08+01:00 Multi-subnet default network: require the same hostSubnet. + - dcb90b85 2025-12-02T11:54:08+01:00 EgressIP: add route policies for east-west traffic between networks + - 2e1d47ba 2025-12-02T11:54:04+01:00 [test] always use multi-subnet setup for CI. + - 30b06cbe 2025-12-02T11:54:01+01:00 [kind] Add multi-cidr default subnet option. + - 34784e71 2025-12-01T09:55:30-05:00 Fixes gateway interface VLAN tag settings + - 76eb7c5c 2025-11-26T11:14:48+02:00 test/e2e:: Fix duplicate IP validation test for IP family enforcement + - 81bbf015 2025-11-26T09:39:53+02:00 test/e2e: add IP family validation tests for layer2 primary networks + - 8421af49 2025-11-26T09:39:53+02:00 test/e2e: Move createVMWithStaticIP helper function + - 08c5b40a 2025-11-26T09:39:53+02:00 test/e2e/kubevirt: Refactor duplicate VM pod err event waiter to shared helper + - 5d6b7784 2025-11-26T09:39:49+02:00 allocator/pod: add IP family validation for layer2 primary networks + - 819aad3c 2025-11-25T13:00:56-05:00 fix: Remove duplicate - and sometimes incorrect - defaults from --help + - 6cba203a 2025-11-25T13:00:17-05:00 fix: Register a bunch of cli flags for --help message + - fd54939c 2025-11-25T12:59:53-05:00 chore: Remove redundant wording in some --help option descriptions + - f71844ac 2025-11-25T12:56:03-05:00 ci: Split unit test phase from build + - bdfb2488 2025-11-25T13:36:28+01:00 Refactor ETP=local flow generation to reduce code duplication + - 01c33f42 2025-11-25T13:36:28+01:00 Service OpenFlows: Return traffic should not be committed to conntrack + - e0156740 2025-11-25T13:36:28+01:00 Fix issues with dualstack detection for nodePort with hostNetwork tests + - f0a3f5f1 2025-11-25T13:36:28+01:00 Fix cookie generation for ETP=local service flows with target ports + - c33ddf99 2025-11-25T13:35:59+01:00 Adjust E2E tests for named port handling + - eebbb4a1 2025-11-25T10:55:17+01:00 Add unit test for named port handling in ETP=local services + - ce18cfd0 2025-11-25T10:55:17+01:00 Fix named port handling in ETP=local services with host-networked pods + +- kubernetes image-arm64 9bbcda1bf017104f96c0f1bd27175d122f416f5a to 76cb1db555ed7a57f12025018d54622ef2e9458c + - c8f673758 2025-12-11T14:09:08-05:00 UPSTREAM: : enable InPlace resize test + - bd75dce1e 2025-12-09T14:04:40+01:00 UPSTREAM: 135680: test/e2e: increase memory limits in pod resize tests + - 59a2d7e3f 2025-10-27T09:35:42-04:00 UPSTREAM: : Extend k8s suite timeouts for parallel testing load Analysis of flakes from the k8s suite has shown consistent examples of otherwise well behaved testing failing due timeouts because of temporary load on controllers during parallel testing. Increasing these timeouts will reduce flakes. + +- service-ca-operator image-arm64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 to 17676192189f5612ba4fd0ee7a23a562390b72ec + - b9ff307 2025-12-19T08:51:27+00:00 Updating ose-service-ca-operator-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-service-ca-operator.yml + - 85619ff 2025-12-12T18:11:17+08:00 vendor: update dependencies for OTE/Ginkgo support + - ac809e4 2025-12-12T16:59:14+08:00 cmd/README: add OTE infrastructure and remove legacy test extension diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index a98a330ec4..b16c1ada04 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,35 +1,35 @@ -https://github.com/openshift/api embedded-component c2a41ea924bd8227622363c3d12f456cd2186924 -https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 0dd541084bee8885dbd14dcd6eb2f826ba779883 +https://github.com/openshift/api embedded-component 3f584b29ee4a4faeb1a733e97c5ba16a1e5ee4f8 +https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 455c9eb412bb41634e127b9491c2cf6d3580a0ec https://github.com/openshift/cluster-dns-operator embedded-component 41a53fed36e6e99c7c9ceb3a699c3547ee5d9bb9 -https://github.com/openshift/cluster-ingress-operator embedded-component b62dd27c901d495e6e78b11968872c002cc2416f -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2c58d2f2bad129f0017ca194ae8a38711917c21c +https://github.com/openshift/cluster-ingress-operator embedded-component 81c961d319f2cdc5cee9eae2ef57f2229ffc2200 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 3fb92ce8d990d1608c4b2bbd79f412b4a3eac629 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 395de96705749de9c6a5f25747b9d5c3d5f65a8f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 4f59ea50a588e9afa714e30e7502eca8b570751b -https://github.com/openshift/cluster-network-operator embedded-component 8d09651e31c64340865f7ec7f349786528805ebd +https://github.com/openshift/cluster-network-operator embedded-component 9d8ab483ef704b0c5c74ad564156085558e2e112 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2617a201bb3607192a9f82faa18384676f611e3c https://github.com/openshift/cluster-policy-controller embedded-component 8b775487512fb543bff470ff1042bd3ac31b29be -https://github.com/openshift/csi-external-snapshotter embedded-component 9098db0e434e0d986eeadd2ebe69119540a550d1 +https://github.com/openshift/csi-external-snapshotter embedded-component 6383ab93be114af8d1067523602bd2a44c927f1a https://github.com/openshift/etcd embedded-component 806f690e1f140e0aea2eb05ef5f288b756b62895 -https://github.com/openshift/kubernetes embedded-component 9f57f51e3485ccc1cfd01ec94e9a0f5bef38eacb +https://github.com/openshift/kubernetes embedded-component 76cb1db555ed7a57f12025018d54622ef2e9458c https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component ce5ff17e9a81ce754567e6dd5053d13409c251e9 -https://github.com/openshift/machine-config-operator embedded-component e2f6042b4bd21ad64115fa5be529edc1cce8c451 +https://github.com/openshift/machine-config-operator embedded-component 9333c5a69d9e8159b98908561d7fb2269b7a9197 https://github.com/openshift/openshift-controller-manager embedded-component 438d52e79d691e016d66eabfe9a53c84229db40c -https://github.com/openshift/operator-framework-olm embedded-component 7d2dd62c2a73b66aa99e82c90f64ab53dd523ddf +https://github.com/openshift/operator-framework-olm embedded-component c66c7a81be6f259c46fb8d4bc1b691fbe97722df https://github.com/openshift/route-controller-manager embedded-component 8a69194a461dc33d2ed67a220bca91d384d34df4 -https://github.com/openshift/service-ca-operator embedded-component e9622ba18c86bf24aceab0c19fdcb87339c14f44 -https://github.com/openshift/oc image-amd64 345800dc3c4164fbca313c1cbfb383f262547903 +https://github.com/openshift/service-ca-operator embedded-component 17676192189f5612ba4fd0ee7a23a562390b72ec +https://github.com/openshift/oc image-amd64 6d61f7657300dcc77f91df9c0b2f23f88cdf7123 https://github.com/openshift/coredns image-amd64 7486e9e4330c1e41d9a91e4673b7f2782efc112c -https://github.com/openshift/csi-external-snapshotter image-amd64 9098db0e434e0d986eeadd2ebe69119540a550d1 +https://github.com/openshift/csi-external-snapshotter image-amd64 6383ab93be114af8d1067523602bd2a44c927f1a https://github.com/openshift/router image-amd64 b231c65b5c06c1f74590ca8e77caecc6213beb6a https://github.com/openshift/kube-rbac-proxy image-amd64 cd636680e06a55395c26570dff0cb37277014388 -https://github.com/openshift/ovn-kubernetes image-amd64 25a714b82c643bcfdf5543cb467afa32dac06787 -https://github.com/openshift/kubernetes image-amd64 9f57f51e3485ccc1cfd01ec94e9a0f5bef38eacb -https://github.com/openshift/service-ca-operator image-amd64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 -https://github.com/openshift/oc image-arm64 345800dc3c4164fbca313c1cbfb383f262547903 +https://github.com/openshift/ovn-kubernetes image-amd64 1a9c60ba700d88afd6d4805091905c3cf094e75d +https://github.com/openshift/kubernetes image-amd64 76cb1db555ed7a57f12025018d54622ef2e9458c +https://github.com/openshift/service-ca-operator image-amd64 17676192189f5612ba4fd0ee7a23a562390b72ec +https://github.com/openshift/oc image-arm64 6d61f7657300dcc77f91df9c0b2f23f88cdf7123 https://github.com/openshift/coredns image-arm64 7486e9e4330c1e41d9a91e4673b7f2782efc112c -https://github.com/openshift/csi-external-snapshotter image-arm64 9098db0e434e0d986eeadd2ebe69119540a550d1 +https://github.com/openshift/csi-external-snapshotter image-arm64 6383ab93be114af8d1067523602bd2a44c927f1a https://github.com/openshift/router image-arm64 b231c65b5c06c1f74590ca8e77caecc6213beb6a https://github.com/openshift/kube-rbac-proxy image-arm64 cd636680e06a55395c26570dff0cb37277014388 -https://github.com/openshift/ovn-kubernetes image-arm64 25a714b82c643bcfdf5543cb467afa32dac06787 -https://github.com/openshift/kubernetes image-arm64 9bbcda1bf017104f96c0f1bd27175d122f416f5a -https://github.com/openshift/service-ca-operator image-arm64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 +https://github.com/openshift/ovn-kubernetes image-arm64 1a9c60ba700d88afd6d4805091905c3cf094e75d +https://github.com/openshift/kubernetes image-arm64 76cb1db555ed7a57f12025018d54622ef2e9458c +https://github.com/openshift/service-ca-operator image-arm64 17676192189f5612ba4fd0ee7a23a562390b72ec diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 773af90810..6eeb831e2f 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.21.0-0.nightly-2025-12-10-193741" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-12-12-014247" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-01-01-225210" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-01-04-032746"