Skip to content

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-12-20-040119_amd64-2024-12-20_arm64-2024-12-20 #4352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 4 commits into from
Dec 24, 2024
Merged

NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-12-20-040119_amd64-2024-12-20_arm64-2024-12-20 #4352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da1222c
update last_rebase.sh
Dec 23, 2024
43d3163
update changelog
Dec 23, 2024
57f4ac9
update manifests
Dec 23, 2024
326ea5c
update buildfiles
Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-12-06-150528
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-12-20-074255
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-2024-12-06-101849
OCP_VERSION := 4.15.0-0.nightly-2024-12-20-040119
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:586a5ded32d05a2f6bb6f14a8112803b44e9c58517bb3f0ca086a16ff4113ac1
digest: sha256:2ef8532a6cd5de770c46dde8541dcb12176c4d397cd9bed2579b229b8534bfea
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bbf0f18c2ccc5702fd7536d14dd3b65694c387ff290ab7a62f5464d025c88976
digest: sha256:cfbfeb2ae2f5f7eafc15c3869c392fcabfb6101bd379f46e113e371bfa6fbab1
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fd109c7f937888e0f7343cd98a10f0a6b3a9766c7a942770065526dbdd9adaf5
digest: sha256:ca1d6ca670490b97bedbfd43c133eb5fbd90ef082c0469b8c0feac7a5ec69be7

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbf0f18c2ccc5702fd7536d14dd3b65694c387ff290ab7a62f5464d025c88976
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfbfeb2ae2f5f7eafc15c3869c392fcabfb6101bd379f46e113e371bfa6fbab1
- 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:586a5ded32d05a2f6bb6f14a8112803b44e9c58517bb3f0ca086a16ff4113ac1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ef8532a6cd5de770c46dde8541dcb12176c4d397cd9bed2579b229b8534bfea
target:
kind: Deployment
labelSelector: app=catalog-operator
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cb53fac685355290daa6ae7a4e4775523ee8f590d05eb4c370a6efa84b220572
digest: sha256:3bd163da208b0c30529cc95362ef7bd2ca603f4550ed4c773d9b47910fea31e4
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:14d397fa66e329dea6fc4783377afbbea4643377a31e28f2e6b572c028c675dc
digest: sha256:32275f0f0c48fb8a0d778885858879725ea58174cbb4d1910232935663a68110
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e4f22dacb56681872fe79b9f84eb15c6f074d235eb481a030e7a91abd07cdd3c
digest: sha256:1255dd8a35d66d51215ae3fb67220a202e59fa9fd79023a971c35f2b1d24db52

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14d397fa66e329dea6fc4783377afbbea4643377a31e28f2e6b572c028c675dc
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32275f0f0c48fb8a0d778885858879725ea58174cbb4d1910232935663a68110
- 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:cb53fac685355290daa6ae7a4e4775523ee8f590d05eb4c370a6efa84b220572
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bd163da208b0c30529cc95362ef7bd2ca603f4550ed4c773d9b47910fea31e4
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-12-06-150528"
"base": "4.15.0-0.nightly-arm64-2024-12-20-074255"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:586a5ded32d05a2f6bb6f14a8112803b44e9c58517bb3f0ca086a16ff4113ac1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbf0f18c2ccc5702fd7536d14dd3b65694c387ff290ab7a62f5464d025c88976",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd109c7f937888e0f7343cd98a10f0a6b3a9766c7a942770065526dbdd9adaf5"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ef8532a6cd5de770c46dde8541dcb12176c4d397cd9bed2579b229b8534bfea",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfbfeb2ae2f5f7eafc15c3869c392fcabfb6101bd379f46e113e371bfa6fbab1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca1d6ca670490b97bedbfd43c133eb5fbd90ef082c0469b8c0feac7a5ec69be7"
}
}
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-12-06-101849"
"base": "4.15.0-0.nightly-2024-12-20-040119"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb53fac685355290daa6ae7a4e4775523ee8f590d05eb4c370a6efa84b220572",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14d397fa66e329dea6fc4783377afbbea4643377a31e28f2e6b572c028c675dc",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4f22dacb56681872fe79b9f84eb15c6f074d235eb481a030e7a91abd07cdd3c"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bd163da208b0c30529cc95362ef7bd2ca603f4550ed4c773d9b47910fea31e4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32275f0f0c48fb8a0d778885858879725ea58174cbb4d1910232935663a68110",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1255dd8a35d66d51215ae3fb67220a202e59fa9fd79023a971c35f2b1d24db52"
}
}
10 changes: 5 additions & 5 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-12-06-150528"
"base": "4.15.0-0.nightly-arm64-2024-12-20-074255"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3a82ec159b257b776ef3f208945d0f793098d1c18bc8e513c56f9bc1fa15577",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04fa44f523c16c7e24cf5df94e9911bfb18bdfb0f8df55365f31e43e7fe77d19",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a5a88e20895b7807cc18eaf9527501058a350793a5b24e9f0327f5bf6f65bf7",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68507c7b3aafefac6256f81610db86d6c15604d1cc0af524a938c03ce29fd729",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd109c7f937888e0f7343cd98a10f0a6b3a9766c7a942770065526dbdd9adaf5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed05a63faa0751fbc9f38c34771c2fe054fff5c832706ab2c29a633026260c9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca1d6ca670490b97bedbfd43c133eb5fbd90ef082c0469b8c0feac7a5ec69be7",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9d2c062f2dc1b9df0ba306143413cf786bc5841b96cfd19f3ac80e5105351aa",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66a9b772d8a8012dc0c503b0111fe9bd8d735681aadfdb47eec7505f932499b9",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19b6393a44435416bff339fcb3cd242e55171f2e84d2c8a5b298420b5addf3e1",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1247c864468175794453ddb47a8bd2656833d4f32a8ed104737828536bda20a",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
Expand Down
10 changes: 5 additions & 5 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-12-06-101849"
"base": "4.15.0-0.nightly-2024-12-20-040119"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ff4bb5d7c3ba0cdcd331cdb609afe38904d3fc0dcb842879eb06c58ef197cda",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c88c72b423082cdeca89a218aade61fa79b8cad698d9b7d404965104c31b7bbd",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d35ddbc5be78cab677fcd6cdb3a0e3c0d2668d1abc3538d5c63aafaba090c539",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:057430c8e30f43c04e7d3c335cc208df07da252aedead697057d63e0882ce767",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4f22dacb56681872fe79b9f84eb15c6f074d235eb481a030e7a91abd07cdd3c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f96d57531970095a0b3705a6a6e75f6bcda27fd997d6b9477825207e9573091",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1255dd8a35d66d51215ae3fb67220a202e59fa9fd79023a971c35f2b1d24db52",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:585d2921038b84d675ccb2d8a1d9583495cc8d896b8a7dc0b1e1363259ca97ad",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bee9d91c248c50192ea50cdfb1b44f16c214f51d36704056ff9ee9a318045be3",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68224fb7fa4b244397072904be798aa5c6cfc92f10f5b5aadb5b7086be5bb9b5",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bcd3d9a1d9515b2439fadde6ea0653fc67b32d1b55d4ab17874a90dfa3eeeaa9",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
Expand Down
19 changes: 19 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- cluster-network-operator embedded-component 780c0217eec9a42039303cdc6173d4b188f21f39 to fee8c3129c028c6b72eff93a0f814678d997951e
- 41d4c27 2024-12-16T11:03:54+01:00 Skip including default crypto policies to avoid authby issue
- 0ce67a7 2024-12-12T10:01:33+01:00 Cleanup ipsec entries from sidecar container
- 41dd276 2024-12-12T10:01:24+01:00 Remove ip xfrm state when IPsec is disabled
- 32b8bcb 2024-12-09T10:06:12+00:00 Pass transit_switch_subnet options in ovnkube-node pod
- f6a2383 2024-10-21T07:51:57+00:00 Exporting environment varialbe NODE_CNI for live migration

- machine-config-operator embedded-component 4d5d7297319b4d466f6edbc1bea316ce8560b854 to 842b60b1ff77a2f2bcb263a4b9488651758eb7f9
- aa212031 2024-12-11T12:25:55+00:00 Remove trailing periods from AWS provided hostnames

- operator-framework-olm embedded-component 2a0924f9655371f636d16b60e9ae7e49934c5640 to f690dd8788b7334ff6d593a2d2f9db077db73d08
- e25f8235 2024-12-16T20:52:32+00:00 CRD upgrade existing CR validation fix (#3442)

- ovn-kubernetes image-amd64 5de3de7c87247fdc66f7663dd8447a09dbd65526 to 9c4d3010d46a438f5fe3e2da14832ac0b38de7c2
- 32f906c 2024-11-27T10:20:54+08:00 pin libreswan to 4.6-3.el9_0.3

- ovn-kubernetes image-arm64 5de3de7c87247fdc66f7663dd8447a09dbd65526 to 9c4d3010d46a438f5fe3e2da14832ac0b38de7c2
- 32f906c 2024-11-27T10:20:54+08:00 pin libreswan to 4.6-3.el9_0.3

10 changes: 5 additions & 5 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 9e0d092
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component aabc7863cdbd76f8909a10fbc1be53b032e4ec31
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796
https://github.com/openshift/cluster-network-operator embedded-component 780c0217eec9a42039303cdc6173d4b188f21f39
https://github.com/openshift/cluster-network-operator embedded-component fee8c3129c028c6b72eff93a0f814678d997951e
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 68e8bcd5c5df5072d5eefb8abd9c9ecab289adf4
https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f
https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342
https://github.com/openshift/etcd embedded-component a7005ef1eae85eec6c59411860538169cea182fd
https://github.com/openshift/kubernetes embedded-component ff493be70058d7324491442be6d57c92cfccb92d
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb
https://github.com/openshift/machine-config-operator embedded-component 4d5d7297319b4d466f6edbc1bea316ce8560b854
https://github.com/openshift/machine-config-operator embedded-component 842b60b1ff77a2f2bcb263a4b9488651758eb7f9
https://github.com/openshift/openshift-controller-manager embedded-component f2afd434358966ccc09f55d4915d2689ed2cb1b6
https://github.com/openshift/operator-framework-olm embedded-component 2a0924f9655371f636d16b60e9ae7e49934c5640
https://github.com/openshift/operator-framework-olm embedded-component f690dd8788b7334ff6d593a2d2f9db077db73d08
https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4
https://github.com/openshift/service-ca-operator embedded-component 19f312e96bb4e5b7da9f61ea4cab202b227a60c6
https://github.com/openshift/oc image-amd64 82316376e25f6453b58258df6bf1e11ec4abb670
Expand All @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd1
https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342
https://github.com/openshift/router image-amd64 dc38fbd84dfbed3a897f2d36b469d0ccfd1ecda3
https://github.com/openshift/kube-rbac-proxy image-amd64 9308e7f2a6d984fa7b8ddc125524d7b7356f92ce
https://github.com/openshift/ovn-kubernetes image-amd64 5de3de7c87247fdc66f7663dd8447a09dbd65526
https://github.com/openshift/ovn-kubernetes image-amd64 9c4d3010d46a438f5fe3e2da14832ac0b38de7c2
https://github.com/openshift/kubernetes image-amd64 ff493be70058d7324491442be6d57c92cfccb92d
https://github.com/openshift/service-ca-operator image-amd64 19f312e96bb4e5b7da9f61ea4cab202b227a60c6
https://github.com/openshift/oc image-arm64 82316376e25f6453b58258df6bf1e11ec4abb670
Expand All @@ -33,6 +33,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd1
https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342
https://github.com/openshift/router image-arm64 dc38fbd84dfbed3a897f2d36b469d0ccfd1ecda3
https://github.com/openshift/kube-rbac-proxy image-arm64 9308e7f2a6d984fa7b8ddc125524d7b7356f92ce
https://github.com/openshift/ovn-kubernetes image-arm64 5de3de7c87247fdc66f7663dd8447a09dbd65526
https://github.com/openshift/ovn-kubernetes image-arm64 9c4d3010d46a438f5fe3e2da14832ac0b38de7c2
https://github.com/openshift/kubernetes image-arm64 ff493be70058d7324491442be6d57c92cfccb92d
https://github.com/openshift/service-ca-operator image-arm64 19f312e96bb4e5b7da9f61ea4cab202b227a60c6
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-12-06-101849" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-12-06-150528"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-12-20-040119" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-12-20-074255"