Skip to content

Commit 3200a4c

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-01-08-165032_amd64-2025-01-08_arm64-2025-01-08 (#4394)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent bee58f5 commit 3200a4c

13 files changed

+117
-49
lines changed

Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-07-222222
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-08-222222

Makefile.version.x86_64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.19.0-0.nightly-2025-01-07-124551
1+
OCP_VERSION := 4.19.0-0.nightly-2025-01-08-165032

assets/optional/multus/release-multus-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-01-07-222222"
3+
"base": "4.19.0-0.nightly-arm64-2025-01-08-222222"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ecfae89c530c3bc40085299a973fea1d8ec7e237212d7a7296f455ba852b478",

assets/optional/multus/release-multus-x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-01-07-124551"
3+
"base": "4.19.0-0.nightly-2025-01-08-165032"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba87d15e49bf4b0ec404e0ad6c2ee4f2c20cfc2bdd5fb725136a157dc2ad2f1",

assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:f0ea8b1c11382a4abac5f77f2e90e0801576eff2d9b124ccb336a96d082f3d08
5+
digest: sha256:bd4f4ae4d15f5cee366abad71d606f6625177af2bfc4438ac019e7b45b8bdde4
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:a37012feea4c0b69404b2ab171ea1e094f7a1e74535ffb262ef32751e4574a24
8+
digest: sha256:cd6f23bdfb3045c2e912d4ada30f762ef11479d05e8e447a1cfd3617cd5c4426
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
1111
digest: sha256:ab0f86af333b37420a0428c74bfe0834fb9f9f4a01430fd8ac277c42d808cb94
@@ -16,12 +16,12 @@ patches:
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a37012feea4c0b69404b2ab171ea1e094f7a1e74535ffb262ef32751e4574a24
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd6f23bdfb3045c2e912d4ada30f762ef11479d05e8e447a1cfd3617cd5c4426
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0ea8b1c11382a4abac5f77f2e90e0801576eff2d9b124ccb336a96d082f3d08
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd4f4ae4d15f5cee366abad71d606f6625177af2bfc4438ac019e7b45b8bdde4
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:cd702a31c36add2ac295d1719a90325ebca8108df2a85ef37a00dc2d54e8ad04
5+
digest: sha256:67cf3b46afd76a6a9ffa2d7ff2d191548d74283c795ee9bb02c1cbdbc55466dd
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:6db5c15d379db27921538ee21aec82d6672d2cba2dfa4729ccbc01e39db313ed
8+
digest: sha256:e42a41ffe40af3dc007062fdf16f5ed95a60f416050645c1a0706d114c59aa17
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
1111
digest: sha256:40a595fb8d2b6fe666aad183f10059b687e5d1db91f2862e2143d86ebf3987da
@@ -16,12 +16,12 @@ patches:
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6db5c15d379db27921538ee21aec82d6672d2cba2dfa4729ccbc01e39db313ed
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e42a41ffe40af3dc007062fdf16f5ed95a60f416050645c1a0706d114c59aa17
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd702a31c36add2ac295d1719a90325ebca8108df2a85ef37a00dc2d54e8ad04
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67cf3b46afd76a6a9ffa2d7ff2d191548d74283c795ee9bb02c1cbdbc55466dd
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-01-07-222222"
3+
"base": "4.19.0-0.nightly-arm64-2025-01-08-222222"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0ea8b1c11382a4abac5f77f2e90e0801576eff2d9b124ccb336a96d082f3d08",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a37012feea4c0b69404b2ab171ea1e094f7a1e74535ffb262ef32751e4574a24",
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd4f4ae4d15f5cee366abad71d606f6625177af2bfc4438ac019e7b45b8bdde4",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd6f23bdfb3045c2e912d4ada30f762ef11479d05e8e447a1cfd3617cd5c4426",
88
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab0f86af333b37420a0428c74bfe0834fb9f9f4a01430fd8ac277c42d808cb94"
99
}
1010
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-01-07-124551"
3+
"base": "4.19.0-0.nightly-2025-01-08-165032"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd702a31c36add2ac295d1719a90325ebca8108df2a85ef37a00dc2d54e8ad04",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6db5c15d379db27921538ee21aec82d6672d2cba2dfa4729ccbc01e39db313ed",
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67cf3b46afd76a6a9ffa2d7ff2d191548d74283c795ee9bb02c1cbdbc55466dd",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e42a41ffe40af3dc007062fdf16f5ed95a60f416050645c1a0706d114c59aa17",
88
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a595fb8d2b6fe666aad183f10059b687e5d1db91f2862e2143d86ebf3987da"
99
}
1010
}

assets/release/release-aarch64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-01-07-222222"
3+
"base": "4.19.0-0.nightly-arm64-2025-01-08-222222"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96ae264fe28b31173df42b07e36b5952d878967fc0400685d1d64744ed52c1c1",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1944c0f5c02cbba2f9e4ac3e264014b5914d120161da9ae818349fa692c983f",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19d7cdc13db3a53401c8898d92891d35c7465cbffa9ff3d039ab55b0463c2ee8",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab0f86af333b37420a0428c74bfe0834fb9f9f4a01430fd8ac277c42d808cb94",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f3b80fe68b76673156054f4022362b888963abc2bc50efadb0d34060af6200f",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1686f04471a262c825b19e85bc7d2ada024f5bf466dc1c8b56ec99e262788b8",
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9710082101b1b0fa071218f3eb7d56584168cbd89a2a817f260297c8dc4014ec",
12-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:398dad3bc35f1f91ff901a588ee95b93971264b01788e1576846a4811cad75f2",
12+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd2bd449b91edb7c18bc4ef1aa98e63f11b0320244185057b7125c57c050bdc9",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
1414
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f580783b073c4bb8500c3431cec33004126651e7cbf45a82995267d490803a3c"
1515
}

assets/release/release-x86_64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-01-07-124551"
3+
"base": "4.19.0-0.nightly-2025-01-08-165032"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ebd2dc24d7d5ce52d80a8ba49f3a0405277e6897f080f3fd62856d9e3eeded7",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e939cfbe0fd01f734c88822be8e7e6230af04eaf4b3207011baa6594a0541de",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0699d463193e5e2cbaf03805e22f21d525f55c15f5f7246af9763cfde0f21618",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1aa95dad438a475f13c3791cea2dcfdc91c20bc56ef4bed9805d4b38c3485003",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a595fb8d2b6fe666aad183f10059b687e5d1db91f2862e2143d86ebf3987da",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc33f2b8b5115753e34eb3ae6686778c206a7376d874c9875acc305ac40cfc8b",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db7a73992e1f2225c590111fb9e65b8a4bf67889f9f1ea9a7593808ba218c81b",
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0b4bdfd9385e79f3fca3c93bf3d5d5074e048c9c21f3572da343c312c4acf0b",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af64fa76b7f9722f98e0477487abeaa31674951f40b80d41fc62f04139e17950",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",

0 commit comments

Comments
 (0)