diff --git a/go.mod b/go.mod index 9f90244303..853540f276 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/microshift -go 1.20 +go 1.21 require ( github.com/apparentlymart/go-cidr v1.1.0 @@ -10,7 +10,7 @@ require ( github.com/openshift/api v0.0.0-20231218131639-7a5aa77cc72d github.com/openshift/build-machinery-go v0.0.0-20230824093055-6a18da01283c github.com/openshift/client-go v0.0.0-20231218155125-ff7d9f9bf415 - github.com/openshift/cluster-policy-controller v0.0.0-20240105091254-efafeb428cb5 + github.com/openshift/cluster-policy-controller efafeb428cb5fb95eb997873dc0d7c9d306df8f1 github.com/openshift/library-go v0.0.0-20231218143352-99cedb2a141c github.com/openshift/route-controller-manager v0.0.0-20240105122523-95aa561e9387 github.com/pkg/errors v0.9.1 // indirect diff --git a/rebase_sh.log b/rebase_sh.log new file mode 100644 index 0000000000..b9e3ed71d3 --- /dev/null +++ b/rebase_sh.log @@ -0,0 +1,209 @@ +# Rebasing to registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-01-15-061927 +# Fetching release info for registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 (amd64) +# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-01-15-061927 (arm64) +# Extracting registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 manifest content +# Cloning registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 component repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-csi-snapshot-controller-operator/.git/ +HEAD is now at cc14f55 Merge pull request #187 from jsafrane/fix-lease-origin-master + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/ +HEAD is now at 75c5dc1 Merge pull request #397 from openshift-bot/art-consistency-openshift-4.16-ose-cluster-dns-operator + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/ +HEAD is now at 9c62f2b Merge pull request #1012 from candita/NE-1490-Update-to-go1.20 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/ +HEAD is now at 31380bd Merge pull request #1584 from deads2k/more-cert-ownership + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/ +HEAD is now at fc039eb Merge pull request #786 from ingvagabund/sync-library-go + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/ +HEAD is now at d0d89c8 Merge pull request #530 from ingvagabund/readme-me-dump-node-cache + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/ +HEAD is now at 2eed7cf Merge pull request #2191 from yuvalk/wip-enable-nsipsec + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/ +HEAD is now at 83d2ca9 Merge pull request #320 from ardaguclu/ocpbugs-24190 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/ +HEAD is now at efafeb4 Merge pull request #145 from ingvagabund/snyk + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/csi-external-snapshotter/.git/ +HEAD is now at 1e876f9 Merge pull request #137 from openshift-bot/art-consistency-openshift-4.16-csi-snapshot-validation-webhook + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/ +HEAD is now at 66af0e5d Merge pull request #237 from Elbehery/rebase-etcd-3.5.11-openshift-4.16 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/ +HEAD is now at f629574cc Merge pull request #1845 from soltysh/golang_1.21 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes-kube-storage-version-migrator/.git/ +HEAD is now at 2646eac Merge pull request #202 from openshift-bot/art-consistency-openshift-4.16-ose-kube-storage-version-migrator + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/ +HEAD is now at e86fa920 Merge pull request #4126 from JoelSpeed/nodeenv-typo + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/ +HEAD is now at 2a28a78 Merge pull request #280 from coreydaley/2023-11-15-rekor + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/operator-framework-olm/.git/ +HEAD is now at e30565fc Merge pull request #659 from tmshort/synchonize-upstream + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/ +HEAD is now at 95aa561 Merge pull request #37 from ingvagabund/snyk + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/ +HEAD is now at 4d3d966 Merge pull request #225 from dinhxuanvu/cert-description + +# Cloning registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434 image repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/ +HEAD is now at e3734ee4 Merge pull request #1653 from flavianmissi/WRKLDS-950-inspect + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/ +HEAD is now at b6a657d Merge pull request #107 from openshift-bot/art-consistency-openshift-4.16-coredns + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-external-snapshotter/.git/ +HEAD is now at 1e876f9 Merge pull request #137 from openshift-bot/art-consistency-openshift-4.16-csi-snapshot-validation-webhook + + + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/ +HEAD is now at fcead81 Merge pull request #550 from openshift-bot/art-consistency-openshift-4.16-ose-haproxy-router-base + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/ +HEAD is now at e8e8c84 Merge pull request #80 from ibihim/CVE-2023-44487-trimming-http2 + +openssl not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/ovn-kubernetes/.git/ +HEAD is now at be6c5c5 Merge pull request #1979 from openshift-bot/art-consistency-openshift-4.16-ovn-kubernetes-microshift + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/ +HEAD is now at f629574cc Merge pull request #1845 from soltysh/golang_1.21 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/service-ca-operator/.git/ +HEAD is now at 4d3d966 Merge pull request #225 from dinhxuanvu/cert-description + +topolvm_csi not from release payload, skipping + +topolvm_csi_livenessprobe not from release payload, skipping + +topolvm_csi_provisioner not from release payload, skipping + +topolvm_csi_registrar not from release payload, skipping + +topolvm_csi_resizer not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/oc/.git/ +HEAD is now at f5542cb4 Merge pull request #1650 from deads2k/release-info + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/coredns/.git/ +HEAD is now at b6a657d Merge pull request #107 from openshift-bot/art-consistency-openshift-4.16-coredns + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-external-snapshotter/.git/ +HEAD is now at 1e876f9 Merge pull request #137 from openshift-bot/art-consistency-openshift-4.16-csi-snapshot-validation-webhook + + + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/router/.git/ +HEAD is now at fcead81 Merge pull request #550 from openshift-bot/art-consistency-openshift-4.16-ose-haproxy-router-base + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kube-rbac-proxy/.git/ +HEAD is now at e8e8c84 Merge pull request #80 from ibihim/CVE-2023-44487-trimming-http2 + +openssl not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/ovn-kubernetes/.git/ +HEAD is now at be6c5c5 Merge pull request #1979 from openshift-bot/art-consistency-openshift-4.16-ovn-kubernetes-microshift + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/ +HEAD is now at 913d16a5d Merge pull request #1849 from soltysh/fix_skips + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/ +HEAD is now at 4d3d966 Merge pull request #225 from dinhxuanvu/cert-description + +topolvm_csi not from release payload, skipping + +topolvm_csi_livenessprobe not from release payload, skipping + +topolvm_csi_provisioner not from release payload, skipping + +topolvm_csi_registrar not from release payload, skipping + +topolvm_csi_resizer not from release payload, skipping + +Warning: env var PULL_BASE_REF not found or empty, falling back to local active branch. +error: branch 'rebase-main-4.16.0-0.nightly-2024-01-18-153434_amd64-2024-01-18_arm64-2024-01-15' not found. +Switched to a new branch 'rebase-main-4.16.0-0.nightly-2024-01-18-153434_amd64-2024-01-18_arm64-2024-01-15' +## Updating last_rebase.sh +## Committing changes to last_rebase.sh +[rebase-main-4.16.0-0.nightly-2024-01-18-153434_amd64-2024-01-18_arm64-2024-01-15 d9eb8f936] update last_rebase.sh + 1 file changed, 1 insertion(+), 1 deletion(-) +cluster-csi-snapshot-controller-operator embedded-component no change + +cluster-dns-operator embedded-component no change + +cluster-ingress-operator embedded-component no change + +cluster-kube-controller-manager-operator embedded-component no change + +cluster-openshift-controller-manager-operator embedded-component no change + +cluster-policy-controller embedded-component no change + +csi-external-snapshotter embedded-component no change + +etcd embedded-component no change + +kubernetes-kube-storage-version-migrator embedded-component no change + +openshift-controller-manager embedded-component no change + +route-controller-manager embedded-component no change + +service-ca-operator embedded-component no change + +coredns image-amd64 no change + +csi-external-snapshotter image-amd64 no change + +csi-external-snapshotter image-amd64 no change + +csi-external-snapshotter image-amd64 no change + +router image-amd64 no change + +kube-rbac-proxy image-amd64 no change + +ovn-kubernetes image-amd64 no change + +service-ca-operator image-amd64 no change + +oc image-arm64 no change + +coredns image-arm64 no change + +csi-external-snapshotter image-arm64 no change + +csi-external-snapshotter image-arm64 no change + +csi-external-snapshotter image-arm64 no change + +router image-arm64 no change + +kube-rbac-proxy image-arm64 no change + +ovn-kubernetes image-arm64 no change + +kubernetes image-arm64 no change + +service-ca-operator image-arm64 no change + +## Committing changes to changelog +[rebase-main-4.16.0-0.nightly-2024-01-18-153434_amd64-2024-01-18_arm64-2024-01-15 91e9857c8] update changelog + 2 files changed, 75 insertions(+), 37 deletions(-) +# Updating microshift/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@efafeb428cb5fb95eb997873dc0d7c9d306df8f1 +go: go.mod file indicates go 1.21, but maximum version supported by tidy is 1.20 diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 1da723033f..b31d9022f0 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,30 +1,68 @@ -- cluster-network-operator embedded-component 0196de9b213cf462c9f08685a72b58e22e862f85 to 45bc1ab8881c23f6bde187ea544861240925f632 - - 1bb16ff 2024-01-11T16:15:26+01:00 Render IPsec MachineConfig after cluster settles with MachineConfigs - - 97ba1b2 2023-12-19T17:53:38+01:00 remove microshift folder, since CNO doesn't manage it - -- kubernetes embedded-component 1e00cd0f1770004e5ce0e0394ae9cb378c0abc13 to 913d16a5d9fb76dfb617551d46b8c361a7128d3f - - da9dd58b5 2024-01-11T17:44:04+01:00 UPSTREAM: : update test rules - -- machine-config-operator embedded-component 8c4ca51b2f9c22c4dc14092166e0d454ba1401b7 to 81b767ca8e0379863bde61ba40f318afe57d292e - - 3f0a69f3 2024-01-03T16:40:55-05:00 OCPBUGS-5452: If node is not in pool, error - -- operator-framework-olm embedded-component 0081ef32987ed53e18b4bc48edc4919080238e1e to a6d77a19bec8c667695df8ef8ddc234b2e63dfd3 - - 62d2a7c8 2024-01-12T07:30:54-07:00 go.mod: update metadata - - 9cf02638 2024-01-12T07:30:35-07:00 Updating operator-registry-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/bdea42c1a90f912d46961e65074c6a675cfb896b/images/operator-registry.yml - -- oc image-amd64 f3c090fb1f9ca2a57aa37cf58e2b80cf900d2abd to f5542cb40b186c17de4a2b7377584094f14fac97 - - 988a1757 2024-01-11T16:22:09-05:00 report kubectl version to the release controller - - f237103d 2024-01-11T15:33:31-05:00 add markdown representation of features - - 5b8c90f4 2024-01-11T13:19:41-05:00 add information about featuregate diff in a particular release - - 06d13215 2024-01-08T10:56:35+03:00 Skip rhel9 binary not found error for older releases - - 10b06af4 2024-01-05T09:41:25+03:00 Allow extracted binary name can be set to different - - 70101593 2024-01-04T16:53:14+03:00 Generate RHEL8 based oc and add as target to extract - - 129da484 2024-01-04T11:06:19+03:00 Add RHEL9 oc as linux command in target list - - e17fb41e 2024-01-04T11:06:19+03:00 Skip release-arch and arch type collision per command - -- router image-amd64 00f1690d49de86206bee1a54c9153747565b4186 to fcead817a0181a6326c15c8bd2e31b5fb3acdc14 - - ca7f0bb 2023-12-21T05:04:11+00:00 Updating ose-haproxy-router-base-container image to be consistent with ART for 4.16 Reconciling with https://github.com/openshift/ocp-build-data/tree/af2133c5194e28075efb48f4b508a98759b079d2/images/ose-haproxy-router-base.yml - -- kubernetes image-amd64 1e00cd0f1770004e5ce0e0394ae9cb378c0abc13 to 913d16a5d9fb76dfb617551d46b8c361a7128d3f - - da9dd58b5 2024-01-11T17:44:04+01:00 UPSTREAM: : update test rules +- cluster-kube-apiserver-operator embedded-component 72a91de0baf62173c9d873165f6faf08deeb7214 to 31380bd1f08416d27b8978bcd91df27ea01419c3 + - 806b367 2024-01-10T15:32:53-05:00 update library-go to deconflict updates + - 1056020 2023-11-17T10:49:04-05:00 Add ownership for the admin kubeconfig + - 9612e26 2023-09-13T12:32:18+02:00 manifest: drop slo latency metrics in favor of sli + - 4304f3e 2023-09-13T12:26:16+02:00 bindata: update recording rules to use sli metric + +- cluster-kube-scheduler-operator embedded-component 092925fffd900a5ca71cd5075cd8d9e401b460be to d0d89c8e9d9ebbcaab846af8b0ddb442d713f539 + - 75af70a 2024-01-15T11:33:26+01:00 README: add notes about dumping KS's node cache + +- cluster-network-operator embedded-component 45bc1ab8881c23f6bde187ea544861240925f632 to 2eed7cf61ba1cfd8b9739862d37f36809258d670 + - a8e1208 2024-01-15T16:24:57+02:00 Add the implementation of the new IPsec enablement API + - 621fb76 2024-01-12T20:09:08+02:00 Bump openshift/api and kubernetes dependencies to latest v0.29.0 + - 8bf8aa9 2024-01-12T20:09:08+02:00 Remove check not allowing to change ipsecConfig + - c5aa153 2023-12-19T11:26:23+01:00 Remove egressip write permissions from ovn-kubernetes-node + - 94287c4 2023-12-08T11:06:27+01:00 Network node identity: tolarate all taints + +- kubernetes embedded-component 913d16a5d9fb76dfb617551d46b8c361a7128d3f to f629574ccc853fb3bdcf028dbee42352d12c2fa9 + - 79cb0c11b 2024-01-15T19:46:52+01:00 UPSTREAM: : use go.1.20 - revert + - dd2ebd8a2 2024-01-15T19:46:52+01:00 UPSTREAM: : switch to go1.21 + - acdc24336 2024-01-11T11:44:10+01:00 UPSTREAM: : Update management webhook pod admission logic + +- machine-config-operator embedded-component 81b767ca8e0379863bde61ba40f318afe57d292e to e86fa92021166b9d15b0f5f058a067f76d31e637 + - 7b84adad 2024-01-17T12:33:08+00:00 Fix typo in AWS node env unit + - 66004cdc 2024-01-10T11:42:20-05:00 use machine client instead of oc for teardown + - 98434a2b 2024-01-08T12:22:28-05:00 controller: change machineset arch detection + - a5f2eeec 2024-01-04T16:27:21-05:00 Update the design doc dual support icsp and idms + - a1e6058c 2024-01-02T14:46:50-08:00 pkg/operator/sync: Set apiVersion and kind in pool list response + - 0d57de27 2024-01-02T12:29:33-08:00 pkg/operator/sync: Set ownerReferences on *-user-data-managed Secrets + +- operator-framework-olm embedded-component a6d77a19bec8c667695df8ef8ddc234b2e63dfd3 to e30565fc5fc126f3146754aa886309ae486c61e1 + - 53871a37 2024-01-16T11:31:44-05:00 UPSTREAM: : Fix PSM + - 56ef2715 2024-01-16T11:26:46-05:00 Catch whitespace csv.spec.provider.name values (#272) + - 4e5c6dac 2024-01-16T11:26:46-05:00 [chore]: Re-bump opentelemetry to v1.20.0 (#310) + - 38f48707 2024-01-16T11:26:45-05:00 k8s 1.28 version update and go 1.20 (#292) + - fad53760 2024-01-16T11:26:45-05:00 build(deps): bump github.com/containers/common from 0.56.0 to 0.57.1 (#1200) + - 1add15c0 2024-01-16T11:26:45-05:00 build(deps): bump github.com/onsi/ginkgo/v2 from 2.12.0 to 2.13.2 (#1198) + - ce15db03 2024-01-16T11:26:45-05:00 build(deps): bump github.com/grpc-ecosystem/grpc-health-probe (#1197) + - c156a8fe 2024-01-16T11:26:45-05:00 build(deps): bump go.etcd.io/bbolt from 1.3.7 to 1.3.8 (#1196) + - f8f4ab83 2024-01-16T11:26:44-05:00 build(deps): bump github.com/otiai10/copy from 1.2.0 to 1.14.0 (#1194) + - 9c60b163 2024-01-16T11:26:44-05:00 build(deps): bump github.com/mattn/go-sqlite3 from 1.14.17 to 1.14.19 (#1195) + - 604cdfd0 2024-01-16T11:26:44-05:00 updating operator-framework/api dependency which has k8s 1.28 changes (#1189) + - 0fe64d6e 2024-01-16T11:26:44-05:00 build(deps): bump actions/{download,upload}-artifact to v4 (#1193) + - a8b19cc2 2024-01-16T11:26:44-05:00 build(deps): bump docker/setup-qemu-action from 1 to 3 (#1181) + - 717074ec 2024-01-16T11:26:44-05:00 Update k8s dependencies to v0.28.5 (#1176) + - da7fcac5 2024-01-16T11:26:44-05:00 build(deps): bump golang.org/x/net from 0.19.0 to 0.20.0 (#1190) + - 78fdd4d6 2024-01-16T11:26:43-05:00 build(deps): bump github.com/golang-migrate/migrate/v4 (#1191) + - 40d4c06e 2024-01-16T11:26:43-05:00 build(deps): bump sigs.k8s.io/yaml from 1.3.0 to 1.4.0 (#1187) + - c85d8456 2024-01-16T11:26:43-05:00 build(deps): bump google.golang.org/grpc from 1.59.0 to 1.60.1 (#1186) + - fb21f428 2024-01-16T11:26:43-05:00 build(deps): bump actions/checkout from 3 to 4 (#1180) + - 14dcc083 2024-01-16T11:26:43-05:00 build(deps): bump docker/login-action from 1 to 3 (#1192) + - 9eec4b45 2024-01-16T11:26:42-05:00 build(deps): bump github.com/containerd/containerd from 1.7.6 to 1.7.11 (#1188) + - 35c8e6fc 2024-01-16T11:26:42-05:00 build(deps): bump github.com/h2non/filetype from 1.1.1 to 1.1.3 (#1185) + - 27bd4bd1 2024-01-16T11:26:42-05:00 build(deps): bump actions/setup-go from 4 to 5 (#1183) + - 7004d1c1 2024-01-16T11:26:42-05:00 enable dependabot (#1178) + - 746bbf17 2024-01-16T11:26:38-05:00 Update to k8s v0.28.5 and other operator-framework components (#3155) + - d0e80d64 2024-01-16T10:55:39-05:00 Fix Condition check for Reconcile InstallPlan status (#3153) + - 4667e9e8 2024-01-16T10:55:07-05:00 Add finalizer for CSV cleanup (#3148) + - c1744a00 2024-01-16T10:54:34-05:00 build(deps): bump github.com/containerd/containerd from 1.7.6 to 1.7.11 (#3135) + - 43b8f7e6 2024-01-16T10:54:00-05:00 build(deps): bump golang.org/x/crypto from 0.14.0 to 0.17.0 (#3134) + +- oc image-amd64 f5542cb40b186c17de4a2b7377584094f14fac97 to e3734ee406f32d2ae97cf8fc7b71c852d11aa386 + - 7909d0dc 2024-01-16T12:30:23+01:00 pkg/cli/admin/inspect: use since/since-time for rotated logs + +- kubernetes image-amd64 913d16a5d9fb76dfb617551d46b8c361a7128d3f to f629574ccc853fb3bdcf028dbee42352d12c2fa9 + - 79cb0c11b 2024-01-15T19:46:52+01:00 UPSTREAM: : use go.1.20 - revert + - dd2ebd8a2 2024-01-15T19:46:52+01:00 UPSTREAM: : switch to go1.21 + - acdc24336 2024-01-11T11:44:10+01:00 UPSTREAM: : Update management webhook pod admission logic diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index f8834b261a..6131059374 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,22 +1,22 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component cc14f55465a7600b4f4f2944fcb8cc4991486ecf https://github.com/openshift/cluster-dns-operator embedded-component 75c5dc17111dc498efd849f5a905b006681d8ddf https://github.com/openshift/cluster-ingress-operator embedded-component 9c62f2b499cc3d2f793370f42f85a9f158b3bf57 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 72a91de0baf62173c9d873165f6faf08deeb7214 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 31380bd1f08416d27b8978bcd91df27ea01419c3 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component fc039eb97932f5a4b1bcd4721860fe88eee36a08 -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 092925fffd900a5ca71cd5075cd8d9e401b460be -https://github.com/openshift/cluster-network-operator embedded-component 45bc1ab8881c23f6bde187ea544861240925f632 +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component d0d89c8e9d9ebbcaab846af8b0ddb442d713f539 +https://github.com/openshift/cluster-network-operator embedded-component 2eed7cf61ba1cfd8b9739862d37f36809258d670 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 83d2ca92d4cb9b242849590fd5d6530d31aeba5f https://github.com/openshift/cluster-policy-controller embedded-component efafeb428cb5fb95eb997873dc0d7c9d306df8f1 https://github.com/openshift/csi-external-snapshotter embedded-component 1e876f976503b343c7a9939d9ba30e3010abc6b9 https://github.com/openshift/etcd embedded-component 66af0e5d532b10a23f6e40ec8cbafa0f275f6ee5 -https://github.com/openshift/kubernetes embedded-component 913d16a5d9fb76dfb617551d46b8c361a7128d3f +https://github.com/openshift/kubernetes embedded-component f629574ccc853fb3bdcf028dbee42352d12c2fa9 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 2646eac05dc16eac71d1d79509ed5800c437e0de -https://github.com/openshift/machine-config-operator embedded-component 81b767ca8e0379863bde61ba40f318afe57d292e +https://github.com/openshift/machine-config-operator embedded-component e86fa92021166b9d15b0f5f058a067f76d31e637 https://github.com/openshift/openshift-controller-manager embedded-component 2a28a78279b127075b399a3442a2042f4a7d190d -https://github.com/openshift/operator-framework-olm embedded-component a6d77a19bec8c667695df8ef8ddc234b2e63dfd3 +https://github.com/openshift/operator-framework-olm embedded-component e30565fc5fc126f3146754aa886309ae486c61e1 https://github.com/openshift/route-controller-manager embedded-component 95aa561e93876a3542db3c6aa64773ee98fefe39 https://github.com/openshift/service-ca-operator embedded-component 4d3d966edaaafcae7c9d4a1aa87a67ac627a6ebd -https://github.com/openshift/oc image-amd64 f5542cb40b186c17de4a2b7377584094f14fac97 +https://github.com/openshift/oc image-amd64 e3734ee406f32d2ae97cf8fc7b71c852d11aa386 https://github.com/openshift/coredns image-amd64 b6a657d656bef2631c4675a819ce25a4662b0978 https://github.com/openshift/csi-external-snapshotter image-amd64 1e876f976503b343c7a9939d9ba30e3010abc6b9 https://github.com/openshift/csi-external-snapshotter image-amd64 1e876f976503b343c7a9939d9ba30e3010abc6b9 @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 1e876f976503b3 https://github.com/openshift/router image-amd64 fcead817a0181a6326c15c8bd2e31b5fb3acdc14 https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 https://github.com/openshift/ovn-kubernetes image-amd64 be6c5c5ce948c6549b4b1308e770c3897dcd5576 -https://github.com/openshift/kubernetes image-amd64 913d16a5d9fb76dfb617551d46b8c361a7128d3f +https://github.com/openshift/kubernetes image-amd64 f629574ccc853fb3bdcf028dbee42352d12c2fa9 https://github.com/openshift/service-ca-operator image-amd64 4d3d966edaaafcae7c9d4a1aa87a67ac627a6ebd https://github.com/openshift/oc image-arm64 f5542cb40b186c17de4a2b7377584094f14fac97 https://github.com/openshift/coredns image-arm64 b6a657d656bef2631c4675a819ce25a4662b0978 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index c8553ea077..cce28e39ff 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.16.0-0.nightly-2024-01-15-064322" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-01-15-061927" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-01-18-153434" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-01-15-061927"