diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 24ad70d9f8..50bc2458d5 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2025-01-15-090135 +OCP_VERSION := 4.17.0-0.nightly-arm64-2025-01-22-205919 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 55ba44a3fe..6ca2ca4433 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2025-01-15-090143 +OCP_VERSION := 4.17.0-0.nightly-2025-01-22-125919 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index c154af5588..2cd19fb1bb 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-01-15-090135" + "base": "4.17.0-0.nightly-arm64-2025-01-22-205919" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9928ae684f0c0386863e36cef288c11798259e35ff1512458441bd2c847d0b59", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index de6c69b703..77a45aee1c 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-2025-01-15-090143" + "base": "4.17.0-0.nightly-2025-01-22-125919" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01c5940636c31985b7ce70971230ba78042df3d456c740b2f89cd6e8736f7bad", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index b5b329880a..ed5e13208a 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a0d36a6fe16fd82eec755727cff2686de20f85572329623a836264eb0f2d57c8 + digest: sha256:329b08d5a5fd1b36fbdce61ed3dbe123f0a045c7d33723fae9e1e6e16c4743b8 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b91225a74f8b0cf719bd801abe307da1619c7d1b3eb7e61ea6a864a36d3d8f29 + digest: sha256:5a71e18fac203fab38f6d98ddf69ebd25e55a956521e902749af067e965d5bef - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:bef0cb5c83903c3f9b15da0e88f722546ff358e3240e01190f5e0da787eace87 @@ -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:b91225a74f8b0cf719bd801abe307da1619c7d1b3eb7e61ea6a864a36d3d8f29 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a71e18fac203fab38f6d98ddf69ebd25e55a956521e902749af067e965d5bef - 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:a0d36a6fe16fd82eec755727cff2686de20f85572329623a836264eb0f2d57c8 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:329b08d5a5fd1b36fbdce61ed3dbe123f0a045c7d33723fae9e1e6e16c4743b8 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 97cc78baa8..80e6b92333 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:82ff155c5e7118a86952f86cba21da8e249f74f0a8f1ac0f2161e2bc1e3b3dbf + digest: sha256:c40339d1d7d4196c4f07d6642c35d1d986feb5076ce46626afea776d4accb3c2 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8b402cf92e1a9ec8f564411568c3f8234b43c9775ff2561dca06b515d2034bfa + digest: sha256:36f61c65e6e01f723a8f9f293b8f6d96a549ddadbc51677f0955ae9d78e1ef28 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:c79dcf2363aaace01f0bd31b4bd6eaacab44ca605e334480f15bfe9b71460990 @@ -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:8b402cf92e1a9ec8f564411568c3f8234b43c9775ff2561dca06b515d2034bfa + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36f61c65e6e01f723a8f9f293b8f6d96a549ddadbc51677f0955ae9d78e1ef28 - 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:82ff155c5e7118a86952f86cba21da8e249f74f0a8f1ac0f2161e2bc1e3b3dbf + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c40339d1d7d4196c4f07d6642c35d1d986feb5076ce46626afea776d4accb3c2 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 118dfca8ec..251b04be0c 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.17.0-0.nightly-arm64-2025-01-15-090135" + "base": "4.17.0-0.nightly-arm64-2025-01-22-205919" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0d36a6fe16fd82eec755727cff2686de20f85572329623a836264eb0f2d57c8", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b91225a74f8b0cf719bd801abe307da1619c7d1b3eb7e61ea6a864a36d3d8f29", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:329b08d5a5fd1b36fbdce61ed3dbe123f0a045c7d33723fae9e1e6e16c4743b8", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a71e18fac203fab38f6d98ddf69ebd25e55a956521e902749af067e965d5bef", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bef0cb5c83903c3f9b15da0e88f722546ff358e3240e01190f5e0da787eace87" } } 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 eb449d39e0..7d13af14a6 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.17.0-0.nightly-2025-01-15-090143" + "base": "4.17.0-0.nightly-2025-01-22-125919" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82ff155c5e7118a86952f86cba21da8e249f74f0a8f1ac0f2161e2bc1e3b3dbf", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b402cf92e1a9ec8f564411568c3f8234b43c9775ff2561dca06b515d2034bfa", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c40339d1d7d4196c4f07d6642c35d1d986feb5076ce46626afea776d4accb3c2", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36f61c65e6e01f723a8f9f293b8f6d96a549ddadbc51677f0955ae9d78e1ef28", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c79dcf2363aaace01f0bd31b4bd6eaacab44ca605e334480f15bfe9b71460990" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 955c87ac5e..92a97e5e1d 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2025-01-15-090135" + "base": "4.17.0-0.nightly-arm64-2025-01-22-205919" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f9c996b48c50256e30c18c5cf3cbccaca2ac19f92e4cf081b779d42e3135858", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index e094b0c699..ede536ccc9 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-2025-01-15-090143" + "base": "4.17.0-0.nightly-2025-01-22-125919" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6490ad55859cbacbe00e6c7071d93bb3eecd832dc62fc411c30acb5850437ad", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..ed878a6a38 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,11 @@ +- cluster-network-operator embedded-component 37be1f8c3b4296048a2bd385ffc6636fc3603f38 to d942457aad39685ac278f36834fab3ff3a2cf74f + - c107b0a 2024-11-25T11:54:04+00:00 ovn-k, cudn: Add missing permissions to ovnkube-node + +- operator-framework-olm embedded-component b31ed59e501aa4853c29126af6857d3639498b7b to d39d739496e20e02d998e783617c9a6abdf4fb02 + - 9faf8967 2025-01-20T14:54:41+01:00 [CARRY] address lint issues in namespace labeler plugin + - 1efcd954 2025-01-20T14:41:00+01:00 [CARRY] fixup ns labeler plugin + - 2e44c570 2025-01-20T14:36:13+01:00 :bug: Switch queue informer to use types.Namespace name; relocate deletion handler (#3483) + - e660452e 2025-01-20T11:17:03+01:00 bump golang.org/x/net to 0.34.0 (#3485) + - 1f9946bc 2025-01-20T11:15:23+01:00 Upgrade github.com/joelanford/ignore from v0.1.0 to v0.1.1 (#1527) + - 6eb76c2b 2025-01-20T11:12:51+01:00 bump golang.org/x/net to 0.34.0 (#387) + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 8294518b0b..4f5b63d621 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 cb5306d https://github.com/openshift/cluster-kube-apiserver-operator embedded-component aa95a2b0ecfe4892d6a936bb2da58412edce0fe0 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0a9ed573e35751455bfb24842fd2de0b05379ed0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 98ca953ba6955401023e219f37e0af49879355d2 -https://github.com/openshift/cluster-network-operator embedded-component 37be1f8c3b4296048a2bd385ffc6636fc3603f38 +https://github.com/openshift/cluster-network-operator embedded-component d942457aad39685ac278f36834fab3ff3a2cf74f https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component b05a249d6919978217aefa7060951af078eac931 https://github.com/openshift/cluster-policy-controller embedded-component 7209e90d4205dc16bf0c83fb556c3d955d942d6b https://github.com/openshift/csi-external-snapshotter embedded-component aa558ca4bc55238e1909119f94eaf33872a76dec @@ -14,7 +14,7 @@ https://github.com/openshift/kubernetes embedded-component f868289cea8577c895fa9 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 https://github.com/openshift/machine-config-operator embedded-component 3594c4b2eb42d8c9e56a146baea52d9c147721b0 https://github.com/openshift/openshift-controller-manager embedded-component 70aa014585cd33fc21f27ba20a722c71faf3c411 -https://github.com/openshift/operator-framework-olm embedded-component b31ed59e501aa4853c29126af6857d3639498b7b +https://github.com/openshift/operator-framework-olm embedded-component d39d739496e20e02d998e783617c9a6abdf4fb02 https://github.com/openshift/route-controller-manager embedded-component a47f6be3676d3eabb864ca339584fe857e1076c5 https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 https://github.com/openshift/oc image-amd64 ae1bd9e4a75b8ab617a569e5c8e1a0d7285a16f6 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 2c7f11e774..d7b1b5435c 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.17.0-0.nightly-2025-01-15-090143" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-01-15-090135" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2025-01-22-125919" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2025-01-22-205919"