Skip to content

rebase-4.13.0-0.nightly-2023-05-22-040653_amd64-2023-05-22_arm64-2023-05-22 #1829

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 6 commits into from
May 23, 2023
Merged

rebase-4.13.0-0.nightly-2023-05-22-040653_amd64-2023-05-22_arm64-2023-05-22 #1829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e51fa39
update last_rebase.sh
May 23, 2023
2039928
update changelog
May 23, 2023
d37ac8d
update microshift/go.mod
May 23, 2023
08186b4
update microshift/vendor
May 23, 2023
b9d7a1e
update manifests
May 23, 2023
3d962d3
update buildfiles
May 23, 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 Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.13.0-0.nightly-arm64-2023-05-18-192101
OCP_VERSION := 4.13.0-0.nightly-arm64-2023-05-22-181751
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.13.0-0.nightly-2023-05-18-195839
OCP_VERSION := 4.13.0-0.nightly-2023-05-22-040653
6 changes: 3 additions & 3 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.13.0-0.nightly-arm64-2023-05-18-192101"
"base": "4.13.0-0.nightly-arm64-2023-05-22-181751"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25b1bb086a4eee276897911075a9034ddbf44d2ccce39c3c4b79cc59bfb6f226",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12a7b9e5d6bb21667dcf8e87435f32e3249e8c519793b6e7909e61cd3878c47c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:168dfab7cbbec299af9b729c51255fc77f6e5f5b9cc1017904d42f21ee07bdf7",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa21d034ad8f9eacd82430b1d602338954bd2b675f9e5352a0e2a1c6160ac306",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b21d44f9b053592278a87f4dcd42ce35de5e66a4a0cbeb8e92cbe5f521285a2",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22047b1588c632916bd741744643fec116b78ea9ed79230ff586cda5583c40d7",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0f5cfcb5f71f3f0a2bc16a2d8182688f1eaa9941c918682a54e8a7614f46747",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2a89b27563e268eb3c5a16ff555fba061a9904abe5d65f5a39312e816a01776",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a89e4c39eeba38f2f48f8d40fd6cfbf3d2c407d1f6d9ea00be9e1456524e488a",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
Expand Down
6 changes: 3 additions & 3 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.13.0-0.nightly-2023-05-18-195839"
"base": "4.13.0-0.nightly-2023-05-22-040653"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:800f0bb464dc9d622c3a670e503bee267670395c9bea0fb6247737b6f826ba7d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef20b93c7bad79e4fa20cecaf85af5a897342aefd133b5d2c693d74a4813df2c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e0fd73f8c615cffe134f1dafaa756bf5674337ab7d50c49c9a313ce0a58eec26",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f755f27f5d363577d621ca03ac7de209af9333112a5daa9b4c2efd3448ed3ed",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2b2c89aedaa44964e4cf003ef94963da2e773ace08e601592078adefa482b52",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1625fc8b335143ae6e613699e9f72371b657031ec38024dba600e396da5af691",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac4f440d2ab7fb2adcee335bcfb6780b50a75398f119b8e28e2c446dd90e6fe2",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09d4bee015dd9cdd168968be3fd91106af558e82cb8975191fb905d9f8825418",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ba8c66a65d8a7d32c7d6aec772d0cc88f65bf54b16664cfedf8e068c00689a4",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
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 @@ -10,7 +10,7 @@ require (
github.com/openshift/api v0.0.0-20230208193339-068b2ae5534f
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
github.com/openshift/cluster-policy-controller v0.0.0-20230418022813-20a47733b59b
github.com/openshift/cluster-policy-controller v0.0.0-20230522020023-4aa5ecd04fa2
github.com/openshift/library-go v0.0.0-20230222090221-582055a1d5c4
github.com/openshift/route-controller-manager v0.0.0-20230205134410-d7a8e22db412
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 @@ -607,8 +607,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-20230120202327-72f107311084 h1:66uaqNwA+qYyQDwsMWUfjjau8ezmg1dzCqub13KZOcE=
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084/go.mod h1:M3h9m001PWac3eAudGG3isUud6yBjr5XpzLYLLTlHKo=
github.com/openshift/cluster-policy-controller v0.0.0-20230418022813-20a47733b59b h1:+M3DP23PKS2HZb43xPbyHn2f2qYjsEWJQKLlxA+reNk=
github.com/openshift/cluster-policy-controller v0.0.0-20230418022813-20a47733b59b/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU=
github.com/openshift/cluster-policy-controller v0.0.0-20230522020023-4aa5ecd04fa2 h1:N67Dfgok+tmD1TyaxKNey+yiuLAGQDgKWgYsiHt7hAY=
github.com/openshift/cluster-policy-controller v0.0.0-20230522020023-4aa5ecd04fa2/go.mod h1:vlkRuwyRueLOQ/ZRRle+rCrh+YNoh+pzJm9WaN9e6mU=
github.com/openshift/kubernetes v0.0.0-20230419022048-b40493584076 h1:u2AkkiDmxDq//dPFtBWKCr78vBInHHfg3WZB2Pbabyc=
github.com/openshift/kubernetes v0.0.0-20230419022048-b40493584076/go.mod h1:T0+m4H3K5iWzDP65vb1st8Pd3siJoeSpbC0EzmymTVk=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230419022048-b40493584076 h1:18/Voa5HNjfoibC1gIg3QjJcnWfVG0kQV9/mYaXXbbg=
Expand Down
20 changes: 6 additions & 14 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
# cluster-network-operator embedded-component fed9560d379fa9e178441642a69746a126ac39b5 to 3ed6bef191d49ede92ab8f7f684826a1b7967928
fd324089e6266d3164e1982c090fc2bdabd5be72 2023-05-05T11:14:29+00:00 HyperShift: Add support for HostedControlPlane nodeSelector field
10462673af4afde8854a25334b0fd52f6ab862ae 2023-05-05T11:14:29+00:00 HyperShift: Retrieve HostedControlPlane as part of bootstrap process
65f31351f11e131ebfffa2191a66db495f23f553 2023-05-05T11:14:29+00:00 HyperShift: Move hypershift.go to platform package
63bc9cfb0cb4b80d357bae7bdd7802a290bca338 2023-05-05T11:14:29+00:00 Migrate to hypershift v1beta1
79ac53c377b60d121c68019d3271a7448401d6a0 2023-05-05T11:14:29+00:00 Fix go mod.
c17476e3ee4cc9a190aa227aeb11af3f1584a8f6 2023-04-26T16:24:28+02:00 Fix priority class name on allowlist daemonset
247b33c837d91ece2cb0d81699943d0aa2eeee19 2023-04-26T16:24:28+02:00 Ensure pods are present for allowlist daemonset
14a718cf87a8ee27866f22eef97a22260286d29e 2023-04-26T16:24:28+02:00 Improve logging on allowlist controller
# machine-config-operator embedded-component f2cdca82301940d827f763dcdeaeb1d860c0bf6d to 230bb7e5f5620af293f3dc5b9740e01f5644262f
a46ecd83469dbec1c358935ba640d7c957260ec1 2023-04-28T16:32:06+00:00 Removed pivot func and added depreciation warning
079d89218ceac3d887920912d10790af41f5ae31 2023-04-26T14:48:32+00:00 Bug OCPBUGS-4476: keepalived/ingress: change healthcheck script
62de2db79f7a4668d4df8882ecfe906682802624 2023-04-03T16:37:38+00:00 OCPBUGS-10414: Fix regex dot in coredns config file
f4f2e8beb4035d0f10ab2cd7cb65c6d1e8092c68 2023-03-28T12:06:22+00:00 configure-ovs: support UUID in vlan.parent
# cluster-policy-controller embedded-component 20a47733b59ba746aa3c6410dca2d1a1ab6339de to 4aa5ecd04fa2a35a5ae07a13707bd2e0239432a9
08178e0ec64c4458590b5c0a5650f3ecccff75f4 2023-05-17T12:23:58+00:00 external template and route Informer
# ovn-kubernetes image-amd64 86284e6d4f67a4c56c9d6c2dc48e83f02ff84eef to 9b6742d1022709cc023e395e2c7fa8a7141ea325
2fb43e12293002b275e190789b63eb709f5ccaa1 2023-05-15T09:33:54+02:00 Call SyncEndpoints from AddService
# ovn-kubernetes image-arm64 86284e6d4f67a4c56c9d6c2dc48e83f02ff84eef to 9b6742d1022709cc023e395e2c7fa8a7141ea325
2fb43e12293002b275e190789b63eb709f5ccaa1 2023-05-15T09:33:54+02:00 Call SyncEndpoints from AddService
6 changes: 3 additions & 3 deletions 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 dc5cba57ddcdb5a4b43240d1c2ab908fa953d887
https://github.com/openshift/cluster-network-operator embedded-component 3ed6bef191d49ede92ab8f7f684826a1b7967928
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9a8aba8cad6491a31e743a7e366d758351482d88
https://github.com/openshift/cluster-policy-controller embedded-component 20a47733b59ba746aa3c6410dca2d1a1ab6339de
https://github.com/openshift/cluster-policy-controller embedded-component 4aa5ecd04fa2a35a5ae07a13707bd2e0239432a9
https://github.com/openshift/etcd embedded-component f70da9d78221bc3e6bf8ac14c0c4ecc106f4f57d
https://github.com/openshift/kubernetes embedded-component b40493584076fb1ab29f3bed1d05d16cbc5b17f1
https://github.com/openshift/machine-config-operator embedded-component 230bb7e5f5620af293f3dc5b9740e01f5644262f
Expand All @@ -16,13 +16,13 @@ https://github.com/openshift/oc image-amd64 92b1a3d0e5d092430b523f6541aa0c504b22
https://github.com/openshift/coredns image-amd64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb
https://github.com/openshift/router image-amd64 e28644631982fb4596e065d3ae85099f0886829d
https://github.com/openshift/kube-rbac-proxy image-amd64 11b1439d48a47a408ae7e2dd851989f7b7b4f595
https://github.com/openshift/ovn-kubernetes image-amd64 86284e6d4f67a4c56c9d6c2dc48e83f02ff84eef
https://github.com/openshift/ovn-kubernetes image-amd64 9b6742d1022709cc023e395e2c7fa8a7141ea325
https://github.com/openshift/kubernetes image-amd64 b40493584076fb1ab29f3bed1d05d16cbc5b17f1
https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
https://github.com/openshift/oc image-arm64 92b1a3d0e5d092430b523f6541aa0c504b2222b3
https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb
https://github.com/openshift/router image-arm64 e28644631982fb4596e065d3ae85099f0886829d
https://github.com/openshift/kube-rbac-proxy image-arm64 11b1439d48a47a408ae7e2dd851989f7b7b4f595
https://github.com/openshift/ovn-kubernetes image-arm64 86284e6d4f67a4c56c9d6c2dc48e83f02ff84eef
https://github.com/openshift/ovn-kubernetes image-arm64 9b6742d1022709cc023e395e2c7fa8a7141ea325
https://github.com/openshift/kubernetes image-arm64 b40493584076fb1ab29f3bed1d05d16cbc5b17f1
https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
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.13.0-0.nightly-2023-05-18-195839" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-05-18-192101" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-05-22-040653" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-05-22-181751" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"
14 changes: 0 additions & 14 deletions ...r/github.com/openshift/cluster-policy-controller/pkg/client/genericinformers/interface.go
View file
Open in desktop

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

4 changes: 2 additions & 2 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 @@ -808,7 +808,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-20230418022813-20a47733b59b
# github.com/openshift/cluster-policy-controller v0.0.0-20230522020023-4aa5ecd04fa2
## 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