Skip to content

Commit d2cdaaa

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-01-19-211100_amd64-2025-01-19_arm64-2025-01-20 (#4434)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent cf7ae1b commit d2cdaaa

12 files changed

+27
-114
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-17-000530
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-20-000530

‎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-16-064700
1+
OCP_VERSION := 4.19.0-0.nightly-2025-01-19-211100

‎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-17-000530"
3+
"base": "4.19.0-0.nightly-arm64-2025-01-20-000530"
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-16-064700"
3+
"base": "4.19.0-0.nightly-2025-01-19-211100"
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.x86_64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ images:
88
digest: sha256:080b78a2bc2e04cd7477ea2ad1f6fb9f4a4eb60d0e4ccbb2db02a17a9ce06d89
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:40a595fb8d2b6fe666aad183f10059b687e5d1db91f2862e2143d86ebf3987da
11+
digest: sha256:21b1ec1ffeb289a947603674cda13a84c35545b04e4940dfef055147908220ab
1212

1313
patches:
1414
- patch: |-

‎assets/optional/operator-lifecycle-manager/release-olm-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-17-000530"
3+
"base": "4.19.0-0.nightly-arm64-2025-01-20-000530"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb8a8b3aea5dbe8483b205f60bf3730c0c525fd2264d1045513c7a15a17508b4",

‎assets/optional/operator-lifecycle-manager/release-olm-x86_64.json

Lines changed: 2 additions & 2 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-16-064700"
3+
"base": "4.19.0-0.nightly-2025-01-19-211100"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8888fbe2a8d717d3280d6a063cbad519a16dd923434175f9e1e6231880d12742",
77
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:080b78a2bc2e04cd7477ea2ad1f6fb9f4a4eb60d0e4ccbb2db02a17a9ce06d89",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a595fb8d2b6fe666aad183f10059b687e5d1db91f2862e2143d86ebf3987da"
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21b1ec1ffeb289a947603674cda13a84c35545b04e4940dfef055147908220ab"
99
}
1010
}

‎assets/release/release-aarch64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-01-17-000530"
3+
"base": "4.19.0-0.nightly-arm64-2025-01-20-000530"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79daa4255ae7d52116b206e25d1fd285967da7fce179337ba58026437005339b",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1944c0f5c02cbba2f9e4ac3e264014b5914d120161da9ae818349fa692c983f",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19d7cdc13db3a53401c8898d92891d35c7465cbffa9ff3d039ab55b0463c2ee8",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ddbd84a3de246823ec7624c7e4b1a66e95ce490fe4890656e3b0c7af9375ba6",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:290478ee07daaf4795f9925609bcd24e4ddcec635a28d5f9f70da8592c4458c6",
1010
"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:02b2a194349243c12a551c5281c2c782ae2b4a5be783cd0ca794dd6072968adf",

‎assets/release/release-x86_64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-01-16-064700"
3+
"base": "4.19.0-0.nightly-2025-01-19-211100"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c0615f0b2dde5d2673cc844ee5e4d05709446073314199a296ed07b2a77942a",
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:1aa95dad438a475f13c3791cea2dcfdc91c20bc56ef4bed9805d4b38c3485003",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a595fb8d2b6fe666aad183f10059b687e5d1db91f2862e2143d86ebf3987da",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1170f4a998ac56fe5271470ef370a27755454d854af005e1fe8b4a148eed65f4",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21b1ec1ffeb289a947603674cda13a84c35545b04e4940dfef055147908220ab",
1010
"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:c93e64aba731aff14564a9c01a7f4b8ed0ddd79966dcbc56b887248935958d42",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2faf3ab096e8782738498c50006c40e70b46b4534b1a924d6a589cc733b2e6b",

‎scripts/auto-rebase/changelog.txt

Lines changed: 9 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,13 @@
1-
- api embedded-component c1a063b1614ac3ccb0fc5ab49ba6158dfe8e3d3e to 52377f09e5c9293d4694c29375b35fb202bae222
2-
- 8fd16e29 2025-01-15T14:58:17+00:00 Update lint-fix make target
3-
- 0e9d9411 2025-01-13T14:28:23+00:00 Update golangci-lint to v1.63.4
1+
- cluster-csi-snapshot-controller-operator embedded-component 9dceffb866318acb2bb77182095a18b6f397416f to a68ffe82329d198f79508daeb6c63c6bc2a4e19a
2+
- 0878bc0 2025-01-08T17:39:03+01:00 Support HCP labels
43

5-
- cluster-network-operator embedded-component 2a17ab877fa8e7bef1703be85caed52ada384977 to 722d631aab15ac726c45ad8d2d148843f3ec165b
6-
- ea1d489 2025-01-09T18:48:50+01:00 Restart IPsec service only when needed
7-
- ece9fbb 2025-01-09T18:48:28+01:00 Revert "Configure narrowing=yes for IPsec connections"
8-
- 864bdc5 2025-01-09T11:30:45+01:00 Cleanup ipsec state only when ipsec is not full mode
4+
- cluster-network-operator embedded-component 722d631aab15ac726c45ad8d2d148843f3ec165b to a967bf84a777795ff47f199c5200341809d250b1
5+
- 91b8a78 2025-01-13T20:32:09+01:00 Fix user-defined-networks-namespace-label binding
6+
- 69a1624 2024-12-11T16:53:20+00:00 Add host isolation mounts to ovnkube-node
97

10-
- kubernetes embedded-component 309f240e18f1da87bbe86c18746774d6d302f8ef to 4b2db1ec33faa3ffc305e5ffa7376908cc955370
11-
- f2e69f331 2025-01-09T14:03:58-05:00 UPSTREAM: <carry>: k8s-tests-ext should fully initialize test context
12-
- eef6379f7 2025-01-09T14:03:48-05:00 UPSTREAM: <drop>: ./hack/update-vendor.sh
8+
- router image-amd64 7a688b0eab5a27fe13988a21022c774cdeb964b2 to 20f7f41430f7c660438c32532ccd7b453b014b68
9+
- ee12f18 2025-01-09T11:22:57-05:00 OCPBUGS-47761: Update default_pub_keys.pem to use SHA256
1310

14-
- operator-framework-olm embedded-component 5423c783cc28cff7a9dc9000478f8b7b8b299762 to 34e05d48c055b317af82867fed6a5ab4448ee5cd
15-
- 4bda73cb 2025-01-15T09:19:28+01:00 Upgrade controller-gen v0.16.1 to v0.17.0 (#392)
16-
- 107e04d0 2025-01-15T09:19:01+01:00 Upgrade indirect dependencies (#391)
17-
- dbc6fe8f 2025-01-15T09:18:56+01:00 bump controller-runtime (#388)
18-
- 159dc837 2025-01-15T09:18:53+01:00 Fix go1.33 bump adding toolchain
19-
- 760bf4a1 2025-01-15T09:18:49+01:00 Revert "Bump to go1.23"
20-
- b03b0015 2025-01-15T09:18:45+01:00 Bump to go1.23
21-
- a698ede3 2025-01-15T09:18:37+01:00 bump golang.org/x/net to 0.34.0 (#387)
22-
- 65fae060 2025-01-15T09:18:32+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.3 to 0.32.0 (#381)
23-
- 80736c58 2025-01-15T09:18:27+01:00 Bump k8s.io/client-go from 0.31.3 to 0.32.0 (#384)
24-
- 64b9f1a7 2025-01-15T09:18:24+01:00 :seedling: Bump go to v1.23.0 (#358)
25-
- 10b0128f 2025-01-15T09:18:20+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.1 to 0.19.3 (#379)
26-
- cbe0bfce 2025-01-15T09:18:16+01:00 Bump github.com/google/cel-go from 0.22.0 to 0.22.1 (#374)
27-
- 1586216c 2025-01-15T09:18:12+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.2 to 0.31.3 (#376)
28-
- 9716b93c 2025-01-15T09:18:08+01:00 Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#375)
29-
- 81b9a25e 2025-01-15T09:18:04+01:00 Bump codecov/codecov-action from 4 to 5 (#372)
30-
- b99705d7 2025-01-15T09:18:00+01:00 Bump github.com/google/cel-go from 0.20.1 to 0.22.0 (#371)
31-
- e3a734c4 2025-01-15T09:17:56+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.1 to 0.31.2 (#369)
32-
- e20d2cb2 2025-01-15T09:17:52+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.0 to 0.19.1 (#367)
33-
- 0d891bb8 2025-01-15T09:17:48+01:00 Bump k8s.io/api from 0.31.1 to 0.31.2 (#366)
34-
- 245e1575 2025-01-15T09:17:44+01:00 fix: add missing comment tags for Conditions (#365)
35-
- e260fbd4 2025-01-15T09:17:40+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.0 to 0.31.1 (#360)
36-
- 226d7fb7 2025-01-15T09:17:36+01:00 Bump k8s.io/client-go from 0.31.0 to 0.31.1 (#362)
37-
- c8a27748 2025-01-15T09:17:31+01:00 Upgrade github.com/operator-framework/api from v0.27.0 to v0.29 (#1540)
38-
- 71f768a9 2025-01-15T09:17:26+01:00 Upgrade github.com/containers/common v0.60.4 => v0.61.0 (#1534)
39-
- 3cfda62b 2025-01-15T09:17:22+01:00 Bump github.com/onsi/ginkgo/v2 from 2.22.0 to 2.22.2 (#1536)
40-
- 85995168 2025-01-15T09:17:17+01:00 Bump github.com/docker/cli (#1539)
41-
- 5f72279b 2025-01-15T09:17:12+01:00 Bump google.golang.org/protobuf from 1.35.2 to 1.36.2 (#1537)
42-
- 0f977dc8 2025-01-15T09:17:07+01:00 Bump github.com/maxbrunsfeld/counterfeiter/v6 from 6.9.0 to 6.11.2 (#1535)
43-
- c4eb1241 2025-01-15T09:17:03+01:00 Upgrade kind from v0.25.0 to v0.26.0 (#1532)
44-
- 73d08d51 2025-01-15T09:16:58+01:00 k8s deps from v0.31.3 to v0.32.0 (#1529)
45-
- 9b920669 2025-01-15T09:16:53+01:00 Revert go bump and redo (#1531)
46-
- b21e4c52 2025-01-15T09:16:48+01:00 :seedling: Bump Go v1.23.0 (#1431)
47-
- ab924541 2025-01-15T09:16:43+01:00 Upgrade controller-runtimr from v0.19.3 to v0.19.4 (#1530)
48-
- 886153d5 2025-01-15T09:16:38+01:00 Bump github.com/containerd/containerd from 1.7.23 to 1.7.25 (#1528)
49-
- b4a1ab00 2025-01-15T09:16:34+01:00 Upgrade github.com/joelanford/ignore from v0.1.0 to v0.1.1 (#1527)
50-
- 738d5a04 2025-01-15T09:16:29+01:00 Bump github.com/containers/image/v5 from 5.32.2 to 5.33.0 (#1493)
51-
- 5557f98b 2025-01-15T09:16:25+01:00 Bumps go/net to v0.33.0 (#1522)
52-
- c715662b 2025-01-15T09:16:20+01:00 Revert "Bumps go/net to v0.33.0"
53-
- 0fb1a0c9 2025-01-15T09:16:15+01:00 Bumps go/net to v0.33.0
54-
- 20a412cc 2025-01-15T09:16:10+01:00 provide an optional base image flag for generated dockerfiles from bundle build commands (#1519)
55-
- 5cfd75ae 2025-01-15T09:16:05+01:00 Bump github.com/onsi/gomega from 1.36.0 to 1.36.1 (#1515)
56-
- e9998daf 2025-01-15T09:16:00+01:00 remove reference of kube-rbac-proxy from mocks and tests (#1518)
57-
- c79297c0 2025-01-15T09:15:55+01:00 Bump golang.org/x/sys from 0.27.0 to 0.28.0 (#1508)
58-
- d67d26cc 2025-01-15T09:15:50+01:00 Bump golang.org/x/net from 0.31.0 to 0.32.0 (#1511)
59-
- e5682138 2025-01-15T09:15:46+01:00 Bump google.golang.org/grpc from 1.68.0 to 1.68.1 (#1512)
60-
- 8736c8f0 2025-01-15T09:15:41+01:00 Bump golang.org/x/text from 0.20.0 to 0.21.0 (#1509)
61-
- a626c4f4 2025-01-15T09:15:36+01:00 Bump golang.org/x/sync from 0.9.0 to 0.10.0 (#1510)
62-
- 3cb8460b 2025-01-15T09:15:32+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.2 to 0.19.3 (#1507)
63-
- f83846df 2025-01-15T09:15:27+01:00 Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#1506)
64-
- b65a95fe 2025-01-15T09:15:22+01:00 Bump github.com/onsi/gomega from 1.35.1 to 1.36.0 (#1503)
65-
- 06a81cef 2025-01-15T09:15:17+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.2 to 0.31.3 (#1504)
66-
- 1493db57 2025-01-15T09:15:12+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.1 to 0.19.2 (#1501)
67-
- 366f7e46 2025-01-15T09:15:03+01:00 Bump k8s.io/api from 0.31.2 to 0.31.3 (#1500)
68-
- 0f424b86 2025-01-15T09:14:58+01:00 Bump github.com/onsi/ginkgo/v2 from 2.21.0 to 2.22.0 (#1499)
69-
- c7a2ab3c 2025-01-15T09:14:53+01:00 Bump golang.org/x/net from 0.30.0 to 0.31.0 (#1496)
70-
- 639e8158 2025-01-15T09:14:48+01:00 Bump codecov/codecov-action from 4 to 5 (#1497)
71-
- e5bc14af 2025-01-15T09:14:44+01:00 Bump golang.org/x/mod from 0.21.0 to 0.22.0 (#1495)
72-
- 27b6f1e0 2025-01-15T09:14:36+01:00 Bump google.golang.org/protobuf from 1.35.1 to 1.35.2 (#1494)
73-
- 7c0c59b2 2025-01-15T09:14:30+01:00 Bump golang.org/x/sync from 0.8.0 to 0.9.0 (#1486) (#1485)
74-
- 820d8602 2025-01-15T09:14:25+01:00 Bump sigs.k8s.io/kind from 0.24.0 to 0.25.0 (#1492)
75-
- 014f9ed2 2025-01-15T09:14:21+01:00 Bump golang.org/x/net from 0.30.0 to 0.31.0 (#1488)
76-
- 3103ded6 2025-01-15T09:14:17+01:00 Bump golang.org/x/mod from 0.21.0 to 0.22.0 (#1490)
77-
- 15d86519 2025-01-15T09:14:12+01:00 Bump golang.org/x/sync from 0.8.0 to 0.9.0 (#1486)
78-
- cf134e44 2025-01-15T09:14:08+01:00 Bump github.com/distribution/distribution/v3 (#1487)
79-
- 29c120a6 2025-01-15T09:14:03+01:00 Bump golang.org/x/sys from 0.26.0 to 0.27.0 (#1484)
80-
- 44ac184a 2025-01-15T09:13:58+01:00 Bump github.com/onsi/gomega from 1.35.0 to 1.35.1 (#1483)
81-
- 53622033 2025-01-15T09:13:54+01:00 Bump github.com/onsi/ginkgo/v2 from 2.20.2 to 2.21.0 (#1480)
82-
- cfce7dd5 2025-01-15T09:13:49+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.0 to 0.19.1 (#1478)
83-
- 4bc905a4 2025-01-15T09:13:44+01:00 Bump github.com/onsi/gomega from 1.34.2 to 1.35.0 (#1481)
84-
- 98b81176 2025-01-15T09:13:39+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.1 to 0.31.2 (#1474)
85-
- 78d50260 2025-01-15T09:13:34+01:00 bump o-f libs (#3487)
86-
- 9cb0c76c 2025-01-15T09:13:28+01:00 bump k8s libs to v0.32.0 (#3486)
87-
- 0cedd702 2025-01-15T09:13:20+01:00 add bingo-upgrade target (#3489)
88-
- 6d38dcf3 2025-01-15T09:13:15+01:00 add protocols to all ports in olm.yaml quickstart (#3421)
89-
- 5e949143 2025-01-15T09:13:09+01:00 build(deps): bump github.com/maxbrunsfeld/counterfeiter/v6 (#3481)
90-
- c35d31c8 2025-01-15T09:13:04+01:00 Bump go1.23 (#3484)
91-
- 29a78323 2025-01-15T09:12:58+01:00 bump golang.org/x/net to 0.34.0 (#3485)
92-
93-
- kubernetes image-amd64 309f240e18f1da87bbe86c18746774d6d302f8ef to 4b2db1ec33faa3ffc305e5ffa7376908cc955370
94-
- f2e69f331 2025-01-09T14:03:58-05:00 UPSTREAM: <carry>: k8s-tests-ext should fully initialize test context
95-
- eef6379f7 2025-01-09T14:03:48-05:00 UPSTREAM: <drop>: ./hack/update-vendor.sh
96-
97-
- kubernetes image-arm64 309f240e18f1da87bbe86c18746774d6d302f8ef to 4b2db1ec33faa3ffc305e5ffa7376908cc955370
98-
- f2e69f331 2025-01-09T14:03:58-05:00 UPSTREAM: <carry>: k8s-tests-ext should fully initialize test context
99-
- eef6379f7 2025-01-09T14:03:48-05:00 UPSTREAM: <drop>: ./hack/update-vendor.sh
11+
- router image-arm64 7a688b0eab5a27fe13988a21022c774cdeb964b2 to 20f7f41430f7c660438c32532ccd7b453b014b68
12+
- ee12f18 2025-01-09T11:22:57-05:00 OCPBUGS-47761: Update default_pub_keys.pem to use SHA256
10013

0 commit comments

Comments
 (0)