Skip to content

NO-ISSUE: rebase-4.12.0-0.nightly_amd64-2023-06-06-200734_arm64-2023-06-07-014206 #1897

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-robot merged 5 commits into from
Jun 7, 2023
Merged

NO-ISSUE: rebase-4.12.0-0.nightly_amd64-2023-06-06-200734_arm64-2023-06-07-014206 #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9fcc155
update last_rebase.sh
Jun 7, 2023
1342b47
update changelog
Jun 7, 2023
10c230c
update go.mod
Jun 7, 2023
bde2ecb
update vendoring
Jun 7, 2023
7c576de
update manifests
Jun 7, 2023
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 assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-arm64-2023-06-06-014821"
"base": "4.12.0-0.nightly-arm64-2023-06-07-014206"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e37fa713c8dc78c02d7c1d8de6160e786926f3773fdb36035391fcd5eae2b5b4",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-2023-06-05-213911"
"base": "4.12.0-0.nightly-2023-06-06-200734"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ce010cf8a1292ce086a6c321775578aaa492c8dbb2186976c8df4c824f41615",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
github.com/openshift/cluster-policy-controller v0.0.0-20230525171858-9aaf6fea45f7
github.com/openshift/cluster-policy-controller v0.0.0-20230606001043-a83965ee1e76
github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43
github.com/openshift/route-controller-manager v0.0.0-20230601091943-0f141ce9d349
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,8 @@ github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c h1:CV76yFOTXmq9VciBR3Bve5ZWzSxdft7gaMVB3kS0rwg=
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c/go.mod h1:lFMO8mLHXWFzSdYvGNo8ivF9SfF6zInA8ZGw4phRnUE=
github.com/openshift/cluster-policy-controller v0.0.0-20230525171858-9aaf6fea45f7 h1:qJ8amhkcjmjTeNATQImTUXIY+00jW7e83taErZqvs+4=
github.com/openshift/cluster-policy-controller v0.0.0-20230525171858-9aaf6fea45f7/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU=
github.com/openshift/cluster-policy-controller v0.0.0-20230606001043-a83965ee1e76 h1:TU8bb648c6knVPG4vOW2v/bCmy+0vo40upUJHi/7mNU=
github.com/openshift/cluster-policy-controller v0.0.0-20230606001043-a83965ee1e76/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU=
github.com/openshift/etcd/api/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 h1:0zi9RAHd0uq9gwtbMvRbLJJkgVBpFU7EIj3LQkY7hXk=
github.com/openshift/etcd/api/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 h1:AYz2JmZ7SCtJnpN4HiAgoVYW9AV54CJSiz8c9vig0NM=
Expand Down
203 changes: 3 additions & 200 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ https://github.com/openshift/cluster-kube-controller-manager-operator embedded-c
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 845ae423e831b1cacf0bcae5e6528f1d21b5ddf2
https://github.com/openshift/cluster-network-operator embedded-component 422174789356e3bd2af543ab6513e3491593837f
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d1915d130481541b8bacb5b98eddbc1541809d0a
https://github.com/openshift/cluster-policy-controller embedded-component 9aaf6fea45f75b813ccb7441b9c350fe35d1dd9f
https://github.com/openshift/cluster-policy-controller embedded-component a83965ee1e76beb788bf572dcb86375ceaba3889
https://github.com/openshift/etcd embedded-component c1d76ffd4b4cf0a0d2a6056a505fbef0b187c027
https://github.com/openshift/kubernetes embedded-component 3fe29064317f72fce3606a38883d66a91a7c43dc
https://github.com/openshift/machine-config-operator embedded-component 4accd895aa8fe5ccbd166b9562fdcf5a2112c5ec
Expand Down
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.12.0-0.nightly-2023-06-05-213911" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-06-06-014821"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-06-06-200734" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-06-07-014206"
197 changes: 11 additions & 186 deletions vendor/github.com/openshift/cluster-policy-controller/pkg/cmd/controller/interfaces.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ github.com/openshift/client-go/user/informers/externalversions/internalinterface
github.com/openshift/client-go/user/informers/externalversions/user
github.com/openshift/client-go/user/informers/externalversions/user/v1
github.com/openshift/client-go/user/listers/user/v1
# github.com/openshift/cluster-policy-controller v0.0.0-20230525171858-9aaf6fea45f7
# github.com/openshift/cluster-policy-controller v0.0.0-20230606001043-a83965ee1e76
## explicit; go 1.19
github.com/openshift/cluster-policy-controller/pkg/client/genericinformers
github.com/openshift/cluster-policy-controller/pkg/cmd/cluster-policy-controller
Expand Down