diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 795df2147d..b694529473 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -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", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 36b0f84923..d9c14e7330 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -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", diff --git a/go.mod b/go.mod index 1f2e29c0fe..cf542fe4c7 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 37527af8dd..447c4b871f 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index f1d024cb94..6fec7620cd 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,200 +1,3 @@ -# cluster-network-operator embedded-component d17cd49b76269870402b67a6967abdd6ddbc9952 to 422174789356e3bd2af543ab6513e3491593837f -a5c63c6c5552abe862da3a8ff97e2cd6f2ad577d 2023-01-19T17:05:00+01:00 Update github.com/Masterminds/sprig to v3 -# cluster-policy-controller embedded-component 139ac0499ac4d744023827ceb6d16aa6b467be27 to 9aaf6fea45f75b813ccb7441b9c350fe35d1dd9f -6249a8819009fa7ce046f53ae4dbba9c3abb07ac 2023-05-22T11:58:02+00:00 external template and route Informer -# kubernetes embedded-component 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3 to 3fe29064317f72fce3606a38883d66a91a7c43dc -70f21ece6d1a6cf873475ed16256b524cf23dc0a 2023-05-23T15:05:58+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image -2f033cdec2d935f95c3ce66b43964afd8973270d 2023-05-23T16:15:57+02:00 UPSTREAM: : manually resolve conflicts -e770bdbb87cccdc2daa790ecd69f40cf4df3cc9d 2023-05-17T14:05:24+00:00 Release commit for Kubernetes v1.25.10 -289faa2810c6f02d667cc60bdd37cff0231a9299 2023-05-05T15:03:17-07:00 benchmark test to evaluate the overhead of podMatchesScopeFunc -8d8ea64adffdfdd4c5641cbde51d17ab0067effa 2023-05-05T15:02:52-07:00 Fix incorrect calculation for ResourceQuota with PriorityClass as its scope -712575d9acda6fc947bb2ee658a0949318dcce7d 2023-05-04T10:52:40+02:00 releng/go: Update images, dependencies and version to Go 1.19.9 -7f1809dbc73001cbcbd5c394a89c470b4e04f78d 2023-05-03T13:46:19+01:00 node: device-plugin: e2e: Additional test cases -4ba6f87a0fb1ceea9ed6ba405879398e862a4b00 2023-05-03T13:36:53+01:00 node: device-plugin: add node reboot test scenario -b50d53f6c683204c591ac1d5f30ea94e2b4283ca 2023-05-03T13:36:53+01:00 node: device-plugin: e2e: Capture pod admission failure -9fc2d5c12c2e3f5abc17a1c1c5312f1c2b9de6d4 2023-05-03T13:36:53+01:00 node: device-mgr: e2e: adapt to sample device plugin refactoring -6c0c91e0d0f25acd6e81c25673de7d4bcc2ecaab 2023-05-03T13:36:49+01:00 node: device-mgr: e2e: Update the e2e test to reproduce issue:109595 -4eb2808deb8c073b4b9d31848c767e62abaa36f9 2023-05-03T13:22:41+01:00 node: device-mgr: e2e: Implement End to end test -337e6e76fbf110078a172430d610070b860dae67 2023-05-03T13:21:43+01:00 node: device-mgr: Handle recovery by checking if healthy devices exist -57b644b976c3623577064a4bd33028fe3026e660 2023-05-03T13:21:43+01:00 node: device-plugin: e2e: Add test case for kubelet restart -e53a7181a75d8cb379cf31b277868a3f81f51e98 2023-05-03T13:21:40+01:00 node: device-plugin: e2e: Provide sleep intervals via constants -60d81f0a304b799c8da9e00cfde285642fc5d347 2023-05-03T13:20:06+01:00 node: device-plugin: e2e: Update test description to make it explicit -b9ecf9862dc0d7825ca49483a5ee78b7cb90baed 2023-05-03T13:20:01+01:00 node: device-plugin: e2e: Isolate test to pod restart scenario -d1605c37bdabd0539328780231e76b7c3761f231 2023-05-02T21:34:37+00:00 Move glusterfs 1.25 deprecation notice to the deprecation section. -20f6635eb2394995159c5b97164ac75edd4ee450 2023-05-02T20:48:06+01:00 node: device-plugin: e2e: Annotate device check with error message -6bae194b1cfae983626c038ef5028ed41039812c 2023-05-02T20:46:02+01:00 node: device-plugins: e2e: s/devLen/expectedSampleDevsAmount -d00f41a173d35814affc044397356d4bf74f5fb3 2023-05-02T20:44:25+01:00 node: device-plugins: e2e: Refactor parse log to return string and error -7d1756abc694fd92d08e032a1e346a7184535878 2023-05-02T20:31:52+01:00 test: Fix path to e2e node sample device plugin -02e1fff86aaa0580097741d6e9e32f9f52212a16 2023-05-02T20:31:26+01:00 node: device-mgr: sample device plugin: manifest to avoid registration -3a9c226299ee9079cc27be76476ea7795411064f 2023-05-02T20:31:26+01:00 node: device-mgr: sample device plugin: control registration process -dd9dbcc5fde0a9e46fcf8daa8ab0a7c904c165c3 2023-05-02T20:27:29+01:00 e2e: node: unify sample device plugin utilities -cc3bdb6e1e5b2f69f0cac5d5529ab67abf0c3d18 2023-04-28T17:03:58-07:00 [1.25] vendor: bump runc to 1.1.6 -7c41bbbbdf41da1f366db4237cf25dbe0f05dd3a 2023-04-25T12:47:01-07:00 Fix directory mismatch for `volume.SetVolumeOwnership()` -f1a4bfbd597f25c0f1c9039423aadcbfebe550d3 2023-04-17T16:38:51+08:00 use case-insensitive header keys for http probes -0d433ae74ec5b46ce8f03cda216bf3edaf1ea01d 2023-04-15T23:56:29+08:00 add log includes pod preemption details -56f50bd0aecaa5877cf7b37bae6d5884007210b3 2023-04-14T08:26:13+00:00 fix: the volume is not detached after the pod and PVC objects are deleted -e68ff4549631829367c5418a09fbc8d13ec7f046 2023-04-13T13:13:43+02:00 Do not look at VPC-related resources outside the cluster's network -ad10f081586cac5b03bef619c90acd1f24c4c72e 2023-04-12T23:26:08-07:00 Bump konnectivity-client to 0.0.37 -f1a2a6c1e553056fe4cafa3182666fdc7518b555 2023-04-12T16:56:53-04:00 kubelet: Do not mutate pods in the pod manager -28e1b5d635d6217a5fb36e3b6eee256b13fc48a3 2023-04-12T12:38:32+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.9 -a1a87a0a2bcd605820920c6b0e618a8ab7d117d4 2023-04-12T12:06:19+00:00 Release commit for Kubernetes v1.25.9 -bf21b6de4a97fa01ddef72a03f14ccd22a50db2f 2023-04-06T09:44:33+02:00 releng/go: Update images, dependencies and version to Go 1.19.8 -604ad21799c43d87456cc76d3e591487de0a5152 2023-04-05T15:38:17+00:00 Return error for localhost seccomp type with no localhost profile defined -902a7591f917eb886306cca09e82a98ba815210a 2023-03-31T11:57:24-04:00 Clean up formatting -38d2613d16f4c51647bb1c37c87ef5773bd757a0 2023-03-22T10:37:26-04:00 Drop development dependencies from test targets -5355936e2022d550ce11e403922635e55d1ec82f 2023-03-21T11:42:25-04:00 Clear front proxy headers after authentication is complete -fb0741c2e7276ffe25f8b3978a2354f7b1cd1328 2023-03-21T09:28:59-04:00 Make prerelease tag optional in CI versions -7fc18651814feeae108cae82ebbcf977e95a0ea5 2023-03-21T09:09:12-04:00 Annotate CI version regexes -fb5eefc66b1be9af8ff52835525440c659a6b63c 2023-03-21T09:09:11-04:00 Drop unused regex grouping -7b88494c32dfb34f084035995dec7052faf21b88 2023-03-21T09:09:11-04:00 Update comments -c55deb4868a8b209d83dcd6e1c065ea236793080 2023-03-21T09:09:10-04:00 Delete unused version regex function -9cb693eadf04e0e71e6128d486ef846ea3ffb9db 2023-03-21T15:02:08+08:00 kubelet: Fix fs quota monitoring on volumes -32d3b4ef594c8fee005eac9c2bdf9a6c0eefb006 2023-03-21T15:02:07+08:00 fsquota: only generate pod uuid is nil -d72438efd47e4be01167dc44fd7623795da07783 2023-03-20T15:59:12-04:00 Preserve UID/ResourceVersion in the BindingREST endpoint -2257dba12f06c6b137a4c9a93a4f7fded8524479 2023-03-20T15:59:11-04:00 Add integration test for DefaultBinder -a247e48bcd3742da7ddb43aa0b4d2f947afc3d33 2023-03-17T14:51:09+00:00 Change where transformers are called. -3a14fe1af239a07ff8cdd13c6bd8fdbdb97fabeb 2023-03-15T14:02:25+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.8 -b67fe6e75a92ba082474b08ac49a6c1c04456832 2023-03-11T00:31:38+00:00 wait again on pending state -d7c1ba51f87c61572595be6206012e9431744279 2023-03-11T00:31:38+00:00 cacher allow context cancellation if not ready -9ac9c468ec9222949a397fbf692e5a9a05398efb 2023-03-08T07:16:40+00:00 Route controller should update routes with NodeIP changed When a node reboots or kubelet restarts, it is possible that its IP is changed. In this case, node route should be updated with the correct IP. In this PR, it checks if the IP in an existing route is the same as the actual one. If not, it marks it as "update" so the old route will be deleted and a new one will be created. There's a new field EnableNodeAddresses, which is a feature gate for specific cloud providers to enable after they update their cloud provider code for CreateRoute(). -cc675a5367d9d09992d7f12b8a43a10d672370b9 2023-02-20T09:58:12+00:00 client-go/cache: update Replace comment to be more clear -4283020151ab233101e77996fd8084488057f9c2 2023-02-20T09:58:12+00:00 client-go/cache: rewrite Replace to check queue first -db451e163d97f6a2c023efa30aa12b751c785798 2023-02-20T09:58:11+00:00 client-go/cache: merge ReplaceMakesDeletionsForObjectsInQueue tests -a818874dce54226ecc8ef384ff8b4c82aa6aaa85 2023-02-20T09:58:11+00:00 client-go/cache: fix missing delete event on replace without knownObjects -bdc4a22309fc51f824aca41f11ee4466758ea9b0 2023-02-20T09:58:11+00:00 client-go/cache: fix missing delete event on replace -3a5e85dff6d7412c512782da2f18ec7dde073e7d 2023-02-19T14:03:16-08:00 Bump konnectivity-client to v0.0.36 -c6d4552d7b5af6efe9a6af01b602c014da913cdb 2022-10-11T16:45:32-05:00 test: demote service ClientIP affinity timeout tests from conformance -# route-controller-manager embedded-component 9e74d175e81ef6a2beb3718398e3fc99dded037c to 0f141ce9d349fb30755e3d0d7f9f196a91782957 -c080501951ff53a43a770324c436a4195d2cd4d1 2023-05-30T17:22:03+02:00 Bump k8s to 1.25.10 -# oc image-amd64 31aa3e89a926f81aa0af30320ffcb71acadf3015 to 97c75d06a0f795872975e1d2335a2a932ca1b917 -e7786c5acc0de31c625a5fdbe9d75bfa2a242b5a 2023-05-29T13:19:33+00:00 Remove closed centos7 registry from newapp unit tests -# ovn-kubernetes image-amd64 ce142ecac5f04888793667e87304591a0dcffb5b to fec58c449e8fc691aff537ef64576e204b7191c3 -8d53f29d520afa7f077baaefb1f9cccc10dc8603 2023-05-24T10:37:40+02:00 Use loadbalancer.Name as client index Revert predicate search optimization 3369d387417ede05033c002b782b0279b201ea76 as predicate search should not bee needed anymore -# kubernetes image-amd64 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3 to 3fe29064317f72fce3606a38883d66a91a7c43dc -70f21ece6d1a6cf873475ed16256b524cf23dc0a 2023-05-23T15:05:58+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image -2f033cdec2d935f95c3ce66b43964afd8973270d 2023-05-23T16:15:57+02:00 UPSTREAM: : manually resolve conflicts -e770bdbb87cccdc2daa790ecd69f40cf4df3cc9d 2023-05-17T14:05:24+00:00 Release commit for Kubernetes v1.25.10 -289faa2810c6f02d667cc60bdd37cff0231a9299 2023-05-05T15:03:17-07:00 benchmark test to evaluate the overhead of podMatchesScopeFunc -8d8ea64adffdfdd4c5641cbde51d17ab0067effa 2023-05-05T15:02:52-07:00 Fix incorrect calculation for ResourceQuota with PriorityClass as its scope -712575d9acda6fc947bb2ee658a0949318dcce7d 2023-05-04T10:52:40+02:00 releng/go: Update images, dependencies and version to Go 1.19.9 -7f1809dbc73001cbcbd5c394a89c470b4e04f78d 2023-05-03T13:46:19+01:00 node: device-plugin: e2e: Additional test cases -4ba6f87a0fb1ceea9ed6ba405879398e862a4b00 2023-05-03T13:36:53+01:00 node: device-plugin: add node reboot test scenario -b50d53f6c683204c591ac1d5f30ea94e2b4283ca 2023-05-03T13:36:53+01:00 node: device-plugin: e2e: Capture pod admission failure -9fc2d5c12c2e3f5abc17a1c1c5312f1c2b9de6d4 2023-05-03T13:36:53+01:00 node: device-mgr: e2e: adapt to sample device plugin refactoring -6c0c91e0d0f25acd6e81c25673de7d4bcc2ecaab 2023-05-03T13:36:49+01:00 node: device-mgr: e2e: Update the e2e test to reproduce issue:109595 -4eb2808deb8c073b4b9d31848c767e62abaa36f9 2023-05-03T13:22:41+01:00 node: device-mgr: e2e: Implement End to end test -337e6e76fbf110078a172430d610070b860dae67 2023-05-03T13:21:43+01:00 node: device-mgr: Handle recovery by checking if healthy devices exist -57b644b976c3623577064a4bd33028fe3026e660 2023-05-03T13:21:43+01:00 node: device-plugin: e2e: Add test case for kubelet restart -e53a7181a75d8cb379cf31b277868a3f81f51e98 2023-05-03T13:21:40+01:00 node: device-plugin: e2e: Provide sleep intervals via constants -60d81f0a304b799c8da9e00cfde285642fc5d347 2023-05-03T13:20:06+01:00 node: device-plugin: e2e: Update test description to make it explicit -b9ecf9862dc0d7825ca49483a5ee78b7cb90baed 2023-05-03T13:20:01+01:00 node: device-plugin: e2e: Isolate test to pod restart scenario -d1605c37bdabd0539328780231e76b7c3761f231 2023-05-02T21:34:37+00:00 Move glusterfs 1.25 deprecation notice to the deprecation section. -20f6635eb2394995159c5b97164ac75edd4ee450 2023-05-02T20:48:06+01:00 node: device-plugin: e2e: Annotate device check with error message -6bae194b1cfae983626c038ef5028ed41039812c 2023-05-02T20:46:02+01:00 node: device-plugins: e2e: s/devLen/expectedSampleDevsAmount -d00f41a173d35814affc044397356d4bf74f5fb3 2023-05-02T20:44:25+01:00 node: device-plugins: e2e: Refactor parse log to return string and error -7d1756abc694fd92d08e032a1e346a7184535878 2023-05-02T20:31:52+01:00 test: Fix path to e2e node sample device plugin -02e1fff86aaa0580097741d6e9e32f9f52212a16 2023-05-02T20:31:26+01:00 node: device-mgr: sample device plugin: manifest to avoid registration -3a9c226299ee9079cc27be76476ea7795411064f 2023-05-02T20:31:26+01:00 node: device-mgr: sample device plugin: control registration process -dd9dbcc5fde0a9e46fcf8daa8ab0a7c904c165c3 2023-05-02T20:27:29+01:00 e2e: node: unify sample device plugin utilities -cc3bdb6e1e5b2f69f0cac5d5529ab67abf0c3d18 2023-04-28T17:03:58-07:00 [1.25] vendor: bump runc to 1.1.6 -7c41bbbbdf41da1f366db4237cf25dbe0f05dd3a 2023-04-25T12:47:01-07:00 Fix directory mismatch for `volume.SetVolumeOwnership()` -f1a4bfbd597f25c0f1c9039423aadcbfebe550d3 2023-04-17T16:38:51+08:00 use case-insensitive header keys for http probes -0d433ae74ec5b46ce8f03cda216bf3edaf1ea01d 2023-04-15T23:56:29+08:00 add log includes pod preemption details -56f50bd0aecaa5877cf7b37bae6d5884007210b3 2023-04-14T08:26:13+00:00 fix: the volume is not detached after the pod and PVC objects are deleted -e68ff4549631829367c5418a09fbc8d13ec7f046 2023-04-13T13:13:43+02:00 Do not look at VPC-related resources outside the cluster's network -ad10f081586cac5b03bef619c90acd1f24c4c72e 2023-04-12T23:26:08-07:00 Bump konnectivity-client to 0.0.37 -f1a2a6c1e553056fe4cafa3182666fdc7518b555 2023-04-12T16:56:53-04:00 kubelet: Do not mutate pods in the pod manager -28e1b5d635d6217a5fb36e3b6eee256b13fc48a3 2023-04-12T12:38:32+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.9 -a1a87a0a2bcd605820920c6b0e618a8ab7d117d4 2023-04-12T12:06:19+00:00 Release commit for Kubernetes v1.25.9 -bf21b6de4a97fa01ddef72a03f14ccd22a50db2f 2023-04-06T09:44:33+02:00 releng/go: Update images, dependencies and version to Go 1.19.8 -604ad21799c43d87456cc76d3e591487de0a5152 2023-04-05T15:38:17+00:00 Return error for localhost seccomp type with no localhost profile defined -902a7591f917eb886306cca09e82a98ba815210a 2023-03-31T11:57:24-04:00 Clean up formatting -38d2613d16f4c51647bb1c37c87ef5773bd757a0 2023-03-22T10:37:26-04:00 Drop development dependencies from test targets -5355936e2022d550ce11e403922635e55d1ec82f 2023-03-21T11:42:25-04:00 Clear front proxy headers after authentication is complete -fb0741c2e7276ffe25f8b3978a2354f7b1cd1328 2023-03-21T09:28:59-04:00 Make prerelease tag optional in CI versions -7fc18651814feeae108cae82ebbcf977e95a0ea5 2023-03-21T09:09:12-04:00 Annotate CI version regexes -fb5eefc66b1be9af8ff52835525440c659a6b63c 2023-03-21T09:09:11-04:00 Drop unused regex grouping -7b88494c32dfb34f084035995dec7052faf21b88 2023-03-21T09:09:11-04:00 Update comments -c55deb4868a8b209d83dcd6e1c065ea236793080 2023-03-21T09:09:10-04:00 Delete unused version regex function -9cb693eadf04e0e71e6128d486ef846ea3ffb9db 2023-03-21T15:02:08+08:00 kubelet: Fix fs quota monitoring on volumes -32d3b4ef594c8fee005eac9c2bdf9a6c0eefb006 2023-03-21T15:02:07+08:00 fsquota: only generate pod uuid is nil -d72438efd47e4be01167dc44fd7623795da07783 2023-03-20T15:59:12-04:00 Preserve UID/ResourceVersion in the BindingREST endpoint -2257dba12f06c6b137a4c9a93a4f7fded8524479 2023-03-20T15:59:11-04:00 Add integration test for DefaultBinder -a247e48bcd3742da7ddb43aa0b4d2f947afc3d33 2023-03-17T14:51:09+00:00 Change where transformers are called. -3a14fe1af239a07ff8cdd13c6bd8fdbdb97fabeb 2023-03-15T14:02:25+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.8 -b67fe6e75a92ba082474b08ac49a6c1c04456832 2023-03-11T00:31:38+00:00 wait again on pending state -d7c1ba51f87c61572595be6206012e9431744279 2023-03-11T00:31:38+00:00 cacher allow context cancellation if not ready -9ac9c468ec9222949a397fbf692e5a9a05398efb 2023-03-08T07:16:40+00:00 Route controller should update routes with NodeIP changed When a node reboots or kubelet restarts, it is possible that its IP is changed. In this case, node route should be updated with the correct IP. In this PR, it checks if the IP in an existing route is the same as the actual one. If not, it marks it as "update" so the old route will be deleted and a new one will be created. There's a new field EnableNodeAddresses, which is a feature gate for specific cloud providers to enable after they update their cloud provider code for CreateRoute(). -cc675a5367d9d09992d7f12b8a43a10d672370b9 2023-02-20T09:58:12+00:00 client-go/cache: update Replace comment to be more clear -4283020151ab233101e77996fd8084488057f9c2 2023-02-20T09:58:12+00:00 client-go/cache: rewrite Replace to check queue first -db451e163d97f6a2c023efa30aa12b751c785798 2023-02-20T09:58:11+00:00 client-go/cache: merge ReplaceMakesDeletionsForObjectsInQueue tests -a818874dce54226ecc8ef384ff8b4c82aa6aaa85 2023-02-20T09:58:11+00:00 client-go/cache: fix missing delete event on replace without knownObjects -bdc4a22309fc51f824aca41f11ee4466758ea9b0 2023-02-20T09:58:11+00:00 client-go/cache: fix missing delete event on replace -3a5e85dff6d7412c512782da2f18ec7dde073e7d 2023-02-19T14:03:16-08:00 Bump konnectivity-client to v0.0.36 -c6d4552d7b5af6efe9a6af01b602c014da913cdb 2022-10-11T16:45:32-05:00 test: demote service ClientIP affinity timeout tests from conformance -# oc image-arm64 31aa3e89a926f81aa0af30320ffcb71acadf3015 to 97c75d06a0f795872975e1d2335a2a932ca1b917 -e7786c5acc0de31c625a5fdbe9d75bfa2a242b5a 2023-05-29T13:19:33+00:00 Remove closed centos7 registry from newapp unit tests -# ovn-kubernetes image-arm64 ce142ecac5f04888793667e87304591a0dcffb5b to fec58c449e8fc691aff537ef64576e204b7191c3 -8d53f29d520afa7f077baaefb1f9cccc10dc8603 2023-05-24T10:37:40+02:00 Use loadbalancer.Name as client index Revert predicate search optimization 3369d387417ede05033c002b782b0279b201ea76 as predicate search should not bee needed anymore -# kubernetes image-arm64 37a9a084bcb483a38e8f88349fa6a21c1b6be8a3 to 3fe29064317f72fce3606a38883d66a91a7c43dc -70f21ece6d1a6cf873475ed16256b524cf23dc0a 2023-05-23T15:05:58+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image -2f033cdec2d935f95c3ce66b43964afd8973270d 2023-05-23T16:15:57+02:00 UPSTREAM: : manually resolve conflicts -e770bdbb87cccdc2daa790ecd69f40cf4df3cc9d 2023-05-17T14:05:24+00:00 Release commit for Kubernetes v1.25.10 -289faa2810c6f02d667cc60bdd37cff0231a9299 2023-05-05T15:03:17-07:00 benchmark test to evaluate the overhead of podMatchesScopeFunc -8d8ea64adffdfdd4c5641cbde51d17ab0067effa 2023-05-05T15:02:52-07:00 Fix incorrect calculation for ResourceQuota with PriorityClass as its scope -712575d9acda6fc947bb2ee658a0949318dcce7d 2023-05-04T10:52:40+02:00 releng/go: Update images, dependencies and version to Go 1.19.9 -7f1809dbc73001cbcbd5c394a89c470b4e04f78d 2023-05-03T13:46:19+01:00 node: device-plugin: e2e: Additional test cases -4ba6f87a0fb1ceea9ed6ba405879398e862a4b00 2023-05-03T13:36:53+01:00 node: device-plugin: add node reboot test scenario -b50d53f6c683204c591ac1d5f30ea94e2b4283ca 2023-05-03T13:36:53+01:00 node: device-plugin: e2e: Capture pod admission failure -9fc2d5c12c2e3f5abc17a1c1c5312f1c2b9de6d4 2023-05-03T13:36:53+01:00 node: device-mgr: e2e: adapt to sample device plugin refactoring -6c0c91e0d0f25acd6e81c25673de7d4bcc2ecaab 2023-05-03T13:36:49+01:00 node: device-mgr: e2e: Update the e2e test to reproduce issue:109595 -4eb2808deb8c073b4b9d31848c767e62abaa36f9 2023-05-03T13:22:41+01:00 node: device-mgr: e2e: Implement End to end test -337e6e76fbf110078a172430d610070b860dae67 2023-05-03T13:21:43+01:00 node: device-mgr: Handle recovery by checking if healthy devices exist -57b644b976c3623577064a4bd33028fe3026e660 2023-05-03T13:21:43+01:00 node: device-plugin: e2e: Add test case for kubelet restart -e53a7181a75d8cb379cf31b277868a3f81f51e98 2023-05-03T13:21:40+01:00 node: device-plugin: e2e: Provide sleep intervals via constants -60d81f0a304b799c8da9e00cfde285642fc5d347 2023-05-03T13:20:06+01:00 node: device-plugin: e2e: Update test description to make it explicit -b9ecf9862dc0d7825ca49483a5ee78b7cb90baed 2023-05-03T13:20:01+01:00 node: device-plugin: e2e: Isolate test to pod restart scenario -d1605c37bdabd0539328780231e76b7c3761f231 2023-05-02T21:34:37+00:00 Move glusterfs 1.25 deprecation notice to the deprecation section. -20f6635eb2394995159c5b97164ac75edd4ee450 2023-05-02T20:48:06+01:00 node: device-plugin: e2e: Annotate device check with error message -6bae194b1cfae983626c038ef5028ed41039812c 2023-05-02T20:46:02+01:00 node: device-plugins: e2e: s/devLen/expectedSampleDevsAmount -d00f41a173d35814affc044397356d4bf74f5fb3 2023-05-02T20:44:25+01:00 node: device-plugins: e2e: Refactor parse log to return string and error -7d1756abc694fd92d08e032a1e346a7184535878 2023-05-02T20:31:52+01:00 test: Fix path to e2e node sample device plugin -02e1fff86aaa0580097741d6e9e32f9f52212a16 2023-05-02T20:31:26+01:00 node: device-mgr: sample device plugin: manifest to avoid registration -3a9c226299ee9079cc27be76476ea7795411064f 2023-05-02T20:31:26+01:00 node: device-mgr: sample device plugin: control registration process -dd9dbcc5fde0a9e46fcf8daa8ab0a7c904c165c3 2023-05-02T20:27:29+01:00 e2e: node: unify sample device plugin utilities -cc3bdb6e1e5b2f69f0cac5d5529ab67abf0c3d18 2023-04-28T17:03:58-07:00 [1.25] vendor: bump runc to 1.1.6 -7c41bbbbdf41da1f366db4237cf25dbe0f05dd3a 2023-04-25T12:47:01-07:00 Fix directory mismatch for `volume.SetVolumeOwnership()` -f1a4bfbd597f25c0f1c9039423aadcbfebe550d3 2023-04-17T16:38:51+08:00 use case-insensitive header keys for http probes -0d433ae74ec5b46ce8f03cda216bf3edaf1ea01d 2023-04-15T23:56:29+08:00 add log includes pod preemption details -56f50bd0aecaa5877cf7b37bae6d5884007210b3 2023-04-14T08:26:13+00:00 fix: the volume is not detached after the pod and PVC objects are deleted -e68ff4549631829367c5418a09fbc8d13ec7f046 2023-04-13T13:13:43+02:00 Do not look at VPC-related resources outside the cluster's network -ad10f081586cac5b03bef619c90acd1f24c4c72e 2023-04-12T23:26:08-07:00 Bump konnectivity-client to 0.0.37 -f1a2a6c1e553056fe4cafa3182666fdc7518b555 2023-04-12T16:56:53-04:00 kubelet: Do not mutate pods in the pod manager -28e1b5d635d6217a5fb36e3b6eee256b13fc48a3 2023-04-12T12:38:32+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.9 -a1a87a0a2bcd605820920c6b0e618a8ab7d117d4 2023-04-12T12:06:19+00:00 Release commit for Kubernetes v1.25.9 -bf21b6de4a97fa01ddef72a03f14ccd22a50db2f 2023-04-06T09:44:33+02:00 releng/go: Update images, dependencies and version to Go 1.19.8 -604ad21799c43d87456cc76d3e591487de0a5152 2023-04-05T15:38:17+00:00 Return error for localhost seccomp type with no localhost profile defined -902a7591f917eb886306cca09e82a98ba815210a 2023-03-31T11:57:24-04:00 Clean up formatting -38d2613d16f4c51647bb1c37c87ef5773bd757a0 2023-03-22T10:37:26-04:00 Drop development dependencies from test targets -5355936e2022d550ce11e403922635e55d1ec82f 2023-03-21T11:42:25-04:00 Clear front proxy headers after authentication is complete -fb0741c2e7276ffe25f8b3978a2354f7b1cd1328 2023-03-21T09:28:59-04:00 Make prerelease tag optional in CI versions -7fc18651814feeae108cae82ebbcf977e95a0ea5 2023-03-21T09:09:12-04:00 Annotate CI version regexes -fb5eefc66b1be9af8ff52835525440c659a6b63c 2023-03-21T09:09:11-04:00 Drop unused regex grouping -7b88494c32dfb34f084035995dec7052faf21b88 2023-03-21T09:09:11-04:00 Update comments -c55deb4868a8b209d83dcd6e1c065ea236793080 2023-03-21T09:09:10-04:00 Delete unused version regex function -9cb693eadf04e0e71e6128d486ef846ea3ffb9db 2023-03-21T15:02:08+08:00 kubelet: Fix fs quota monitoring on volumes -32d3b4ef594c8fee005eac9c2bdf9a6c0eefb006 2023-03-21T15:02:07+08:00 fsquota: only generate pod uuid is nil -d72438efd47e4be01167dc44fd7623795da07783 2023-03-20T15:59:12-04:00 Preserve UID/ResourceVersion in the BindingREST endpoint -2257dba12f06c6b137a4c9a93a4f7fded8524479 2023-03-20T15:59:11-04:00 Add integration test for DefaultBinder -a247e48bcd3742da7ddb43aa0b4d2f947afc3d33 2023-03-17T14:51:09+00:00 Change where transformers are called. -3a14fe1af239a07ff8cdd13c6bd8fdbdb97fabeb 2023-03-15T14:02:25+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.8 -b67fe6e75a92ba082474b08ac49a6c1c04456832 2023-03-11T00:31:38+00:00 wait again on pending state -d7c1ba51f87c61572595be6206012e9431744279 2023-03-11T00:31:38+00:00 cacher allow context cancellation if not ready -9ac9c468ec9222949a397fbf692e5a9a05398efb 2023-03-08T07:16:40+00:00 Route controller should update routes with NodeIP changed When a node reboots or kubelet restarts, it is possible that its IP is changed. In this case, node route should be updated with the correct IP. In this PR, it checks if the IP in an existing route is the same as the actual one. If not, it marks it as "update" so the old route will be deleted and a new one will be created. There's a new field EnableNodeAddresses, which is a feature gate for specific cloud providers to enable after they update their cloud provider code for CreateRoute(). -cc675a5367d9d09992d7f12b8a43a10d672370b9 2023-02-20T09:58:12+00:00 client-go/cache: update Replace comment to be more clear -4283020151ab233101e77996fd8084488057f9c2 2023-02-20T09:58:12+00:00 client-go/cache: rewrite Replace to check queue first -db451e163d97f6a2c023efa30aa12b751c785798 2023-02-20T09:58:11+00:00 client-go/cache: merge ReplaceMakesDeletionsForObjectsInQueue tests -a818874dce54226ecc8ef384ff8b4c82aa6aaa85 2023-02-20T09:58:11+00:00 client-go/cache: fix missing delete event on replace without knownObjects -bdc4a22309fc51f824aca41f11ee4466758ea9b0 2023-02-20T09:58:11+00:00 client-go/cache: fix missing delete event on replace -3a5e85dff6d7412c512782da2f18ec7dde073e7d 2023-02-19T14:03:16-08:00 Bump konnectivity-client to v0.0.36 -c6d4552d7b5af6efe9a6af01b602c014da913cdb 2022-10-11T16:45:32-05:00 test: demote service ClientIP affinity timeout tests from conformance +# cluster-policy-controller embedded-component 9aaf6fea45f75b813ccb7441b9c350fe35d1dd9f to a83965ee1e76beb788bf572dcb86375ceaba3889 +f062afba8cca4bb53c28add96e4fd78b093c1b49 2023-05-26T17:48:29+02:00 go mod vendor +7d2c4122553c277e40b4413c92c3ddc2507fd8d2 2023-05-26T17:48:29+02:00 fix ClusterResourceQuotas to work for all api resources diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 12b4845c0c..3a4174df4c 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -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 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 83427a2cf4..bd76fa3b2b 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.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" diff --git a/vendor/github.com/openshift/cluster-policy-controller/pkg/cmd/controller/interfaces.go b/vendor/github.com/openshift/cluster-policy-controller/pkg/cmd/controller/interfaces.go index 6f6fbaaec0..4f02c205d1 100644 --- a/vendor/github.com/openshift/cluster-policy-controller/pkg/cmd/controller/interfaces.go +++ b/vendor/github.com/openshift/cluster-policy-controller/pkg/cmd/controller/interfaces.go @@ -11,30 +11,20 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" + "k8s.io/client-go/metadata" + "k8s.io/client-go/metadata/metadatainformer" "k8s.io/client-go/rest" "k8s.io/controller-manager/app" "k8s.io/controller-manager/pkg/clientbuilder" openshiftcontrolplanev1 "github.com/openshift/api/openshiftcontrolplane/v1" - appsclient "github.com/openshift/client-go/apps/clientset/versioned" - appsinformer "github.com/openshift/client-go/apps/informers/externalversions" - buildclient "github.com/openshift/client-go/build/clientset/versioned" - buildinformer "github.com/openshift/client-go/build/informers/externalversions" - configclient "github.com/openshift/client-go/config/clientset/versioned" - configinformer "github.com/openshift/client-go/config/informers/externalversions" imageclient "github.com/openshift/client-go/image/clientset/versioned" imageinformer "github.com/openshift/client-go/image/informers/externalversions" - operatorclient "github.com/openshift/client-go/operator/clientset/versioned" - operatorinformer "github.com/openshift/client-go/operator/informers/externalversions" quotaclient "github.com/openshift/client-go/quota/clientset/versioned" quotainformer "github.com/openshift/client-go/quota/informers/externalversions" - routeclient "github.com/openshift/client-go/route/clientset/versioned" - routeinformer "github.com/openshift/client-go/route/informers/externalversions" securityclient "github.com/openshift/client-go/security/clientset/versioned" securityinformer "github.com/openshift/client-go/security/informers/externalversions" securityinternalclient "github.com/openshift/client-go/securityinternal/clientset/versioned" - templateclient "github.com/openshift/client-go/template/clientset/versioned" - templateinformer "github.com/openshift/client-go/template/informers/externalversions" "github.com/openshift/library-go/pkg/controller/controllercmd" "github.com/openshift/cluster-policy-controller/pkg/client/genericinformers" @@ -64,18 +54,11 @@ func NewControllerContext( clientConfig.Burst = clientConfig.Burst/10 + 1 } - appsClient, err := appsclient.NewForConfig(clientConfig) - if err != nil { - return nil, err - } - buildClient, err := buildclient.NewForConfig(clientConfig) - if err != nil { - return nil, err - } - configClient, err := configclient.NewForConfig(nonProtobufConfig(clientConfig)) + metadataClient, err := metadata.NewForConfig(clientConfig) if err != nil { return nil, err } + imageClient, err := imageclient.NewForConfig(clientConfig) if err != nil { return nil, err @@ -84,18 +67,6 @@ func NewControllerContext( if err != nil { return nil, err } - routerClient, err := routeclient.NewForConfig(clientConfig) - if err != nil { - return nil, err - } - templateClient, err := templateclient.NewForConfig(clientConfig) - if err != nil { - return nil, err - } - operatorClient, err := operatorclient.NewForConfig(clientConfig) - if err != nil { - return nil, err - } securityClient, err := securityclient.NewForConfig(clientConfig) if err != nil { return nil, err @@ -109,15 +80,10 @@ func NewControllerContext( ControllerClientBuilder: clientbuilder.NewDynamicClientBuilder(rest.AnonymousClientConfig(clientConfig), kubeClient.CoreV1(), defaultOpenShiftInfraNamespace), }, KubernetesInformers: informers.NewSharedInformerFactory(kubeClient, defaultInformerResyncPeriod), - AppsInformers: appsinformer.NewSharedInformerFactory(appsClient, defaultInformerResyncPeriod), - BuildInformers: buildinformer.NewSharedInformerFactory(buildClient, defaultInformerResyncPeriod), - ConfigInformers: configinformer.NewSharedInformerFactory(configClient, defaultInformerResyncPeriod), + MetadataInformers: metadatainformer.NewSharedInformerFactory(metadataClient, defaultInformerResyncPeriod), ImageInformers: imageinformer.NewSharedInformerFactory(imageClient, defaultInformerResyncPeriod), - OperatorInformers: operatorinformer.NewSharedInformerFactory(operatorClient, defaultInformerResyncPeriod), QuotaInformers: quotainformer.NewSharedInformerFactory(quotaClient, defaultInformerResyncPeriod), - RouteInformers: routeinformer.NewSharedInformerFactory(routerClient, defaultInformerResyncPeriod), SecurityInformers: securityinformer.NewSharedInformerFactory(securityClient, defaultInformerResyncPeriod), - TemplateInformers: templateinformer.NewSharedInformerFactory(templateClient, defaultInformerResyncPeriod), InformersStarted: make(chan struct{}), } openshiftControllerContext.GenericResourceInformer = openshiftControllerContext.ToGenericInformer() @@ -128,27 +94,17 @@ func NewControllerContext( func (c *EnhancedControllerContext) ToGenericInformer() genericinformers.GenericResourceInformer { return genericinformers.NewGenericInformers( c.StartInformers, + // first shared informers used by the controllers c.KubernetesInformers, - genericinformers.GenericResourceInformerFunc(func(resource schema.GroupVersionResource) (informers.GenericInformer, error) { - return c.AppsInformers.ForResource(resource) - }), - genericinformers.GenericResourceInformerFunc(func(resource schema.GroupVersionResource) (informers.GenericInformer, error) { - return c.BuildInformers.ForResource(resource) - }), - genericinformers.GenericResourceInformerFunc(func(resource schema.GroupVersionResource) (informers.GenericInformer, error) { - return c.ConfigInformers.ForResource(resource) - }), genericinformers.GenericResourceInformerFunc(func(resource schema.GroupVersionResource) (informers.GenericInformer, error) { return c.ImageInformers.ForResource(resource) }), genericinformers.GenericResourceInformerFunc(func(resource schema.GroupVersionResource) (informers.GenericInformer, error) { return c.QuotaInformers.ForResource(resource) }), + // fallback to metadata shared informers genericinformers.GenericResourceInformerFunc(func(resource schema.GroupVersionResource) (informers.GenericInformer, error) { - return c.RouteInformers.ForResource(resource) - }), - genericinformers.GenericResourceInformerFunc(func(resource schema.GroupVersionResource) (informers.GenericInformer, error) { - return c.TemplateInformers.ForResource(resource) + return c.MetadataInformers.ForResource(resource), nil }), ) } @@ -161,16 +117,10 @@ type EnhancedControllerContext struct { ClientBuilder ControllerClientBuilder KubernetesInformers informers.SharedInformerFactory + MetadataInformers metadatainformer.SharedInformerFactory - TemplateInformers templateinformer.SharedInformerFactory QuotaInformers quotainformer.SharedInformerFactory - RouteInformers routeinformer.SharedInformerFactory - - AppsInformers appsinformer.SharedInformerFactory - BuildInformers buildinformer.SharedInformerFactory - ConfigInformers configinformer.SharedInformerFactory ImageInformers imageinformer.SharedInformerFactory - OperatorInformers operatorinformer.SharedInformerFactory SecurityInformers securityinformer.SharedInformerFactory GenericResourceInformer genericinformers.GenericResourceInformer @@ -185,16 +135,11 @@ type EnhancedControllerContext struct { func (c *EnhancedControllerContext) StartInformers(stopCh <-chan struct{}) { c.KubernetesInformers.Start(stopCh) - c.AppsInformers.Start(stopCh) - c.BuildInformers.Start(stopCh) - c.ConfigInformers.Start(stopCh) c.ImageInformers.Start(stopCh) c.SecurityInformers.Start(stopCh) - - c.TemplateInformers.Start(stopCh) c.QuotaInformers.Start(stopCh) - c.RouteInformers.Start(stopCh) - c.OperatorInformers.Start(stopCh) + + c.MetadataInformers.Start(stopCh) c.informersStartedLock.Lock() defer c.informersStartedLock.Unlock() @@ -211,30 +156,14 @@ func (c *EnhancedControllerContext) IsControllerEnabled(name string) bool { type ControllerClientBuilder interface { clientbuilder.ControllerClientBuilder - OpenshiftAppsClient(name string) (appsclient.Interface, error) - OpenshiftAppsClientOrDie(name string) appsclient.Interface - - OpenshiftBuildClient(name string) (buildclient.Interface, error) - OpenshiftBuildClientOrDie(name string) buildclient.Interface - - OpenshiftConfigClient(name string) (configclient.Interface, error) - OpenshiftConfigClientOrDie(name string) configclient.Interface - OpenshiftSecurityClient(name string) (securityinternalclient.Interface, error) OpenshiftSecurityClientOrDie(name string) securityinternalclient.Interface - // OpenShift clients based on generated internal clientsets - OpenshiftTemplateClient(name string) (templateclient.Interface, error) - OpenshiftTemplateClientOrDie(name string) templateclient.Interface - OpenshiftImageClient(name string) (imageclient.Interface, error) OpenshiftImageClientOrDie(name string) imageclient.Interface OpenshiftQuotaClient(name string) (quotaclient.Interface, error) OpenshiftQuotaClientOrDie(name string) quotaclient.Interface - - OpenshiftOperatorClient(name string) (operatorclient.Interface, error) - OpenshiftOperatorClientOrDie(name string) operatorclient.Interface } // InitFunc is used to launch a particular controller. It may run additional "should I activate checks". @@ -246,44 +175,6 @@ type OpenshiftControllerClientBuilder struct { clientbuilder.ControllerClientBuilder } -func (b OpenshiftControllerClientBuilder) OpenshiftOperatorClient(name string) (operatorclient.Interface, error) { - clientConfig, err := b.Config(name) - if err != nil { - return nil, err - } - return operatorclient.NewForConfig(clientConfig) -} - -func (b OpenshiftControllerClientBuilder) OpenshiftOperatorClientOrDie(name string) operatorclient.Interface { - client, err := b.OpenshiftOperatorClient(name) - if err != nil { - klog.Fatal(err) - } - return client -} - -// OpenshiftInternalTemplateClient provides a REST client for the template API. -// If the client cannot be created because of configuration error, this function -// will return an error. -func (b OpenshiftControllerClientBuilder) OpenshiftTemplateClient(name string) (templateclient.Interface, error) { - clientConfig, err := b.Config(name) - if err != nil { - return nil, err - } - return templateclient.NewForConfig(clientConfig) -} - -// OpenshiftInternalTemplateClientOrDie provides a REST client for the template API. -// If the client cannot be created because of configuration error, this function -// will panic. -func (b OpenshiftControllerClientBuilder) OpenshiftTemplateClientOrDie(name string) templateclient.Interface { - client, err := b.OpenshiftTemplateClient(name) - if err != nil { - klog.Fatal(err) - } - return client -} - // OpenshiftImageClient provides a REST client for the image API. // If the client cannot be created because of configuration error, this function // will error. @@ -306,72 +197,6 @@ func (b OpenshiftControllerClientBuilder) OpenshiftImageClientOrDie(name string) return client } -// OpenshiftAppsClient provides a REST client for the apps API. -// If the client cannot be created because of configuration error, this function -// will error. -func (b OpenshiftControllerClientBuilder) OpenshiftAppsClient(name string) (appsclient.Interface, error) { - clientConfig, err := b.Config(name) - if err != nil { - return nil, err - } - return appsclient.NewForConfig(clientConfig) -} - -// OpenshiftAppsClientOrDie provides a REST client for the apps API. -// If the client cannot be created because of configuration error, this function -// will panic. -func (b OpenshiftControllerClientBuilder) OpenshiftAppsClientOrDie(name string) appsclient.Interface { - client, err := b.OpenshiftAppsClient(name) - if err != nil { - klog.Fatal(err) - } - return client -} - -// OpenshiftBuildClient provides a REST client for the build API. -// If the client cannot be created because of configuration error, this function -// will error. -func (b OpenshiftControllerClientBuilder) OpenshiftBuildClient(name string) (buildclient.Interface, error) { - clientConfig, err := b.Config(name) - if err != nil { - return nil, err - } - return buildclient.NewForConfig(clientConfig) -} - -// OpenshiftBuildClientOrDie provides a REST client for the build API. -// If the client cannot be created because of configuration error, this function -// will panic. -func (b OpenshiftControllerClientBuilder) OpenshiftBuildClientOrDie(name string) buildclient.Interface { - client, err := b.OpenshiftBuildClient(name) - if err != nil { - klog.Fatal(err) - } - return client -} - -// OpenshiftConfigClient provides a REST client for the build API. -// If the client cannot be created because of configuration error, this function -// will error. -func (b OpenshiftControllerClientBuilder) OpenshiftConfigClient(name string) (configclient.Interface, error) { - clientConfig, err := b.Config(name) - if err != nil { - return nil, err - } - return configclient.NewForConfig(nonProtobufConfig(clientConfig)) -} - -// OpenshiftConfigClientOrDie provides a REST client for the build API. -// If the client cannot be created because of configuration error, this function -// will panic. -func (b OpenshiftControllerClientBuilder) OpenshiftConfigClientOrDie(name string) configclient.Interface { - client, err := b.OpenshiftConfigClient(name) - if err != nil { - klog.Fatal(err) - } - return client -} - func (b OpenshiftControllerClientBuilder) OpenshiftQuotaClient(name string) (quotaclient.Interface, error) { clientConfig, err := b.Config(name) if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index f2bf1f208f..91d97f7d41 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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