From 797d01a9629e0a57c1466f370265402eaf2c0df6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Apr 2023 05:09:36 +0000 Subject: [PATCH 1/7] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 8f441c27e9..b412e49bdf 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-04-03-132047" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-30-084912" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-04-07-211226" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-04-07-173314" From dc005059e27d07a70588e6a1f160b77c9e0f2059 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Apr 2023 05:09:37 +0000 Subject: [PATCH 2/7] update changelog --- scripts/auto-rebase/changelog.txt | 95 ++++++++++++++++++++++++++++--- scripts/auto-rebase/commits.txt | 16 +++--- 2 files changed, 96 insertions(+), 15 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 4fa47e4883..63b7ffcf9e 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,7 +1,88 @@ -# cluster-network-operator embedded-component 41a8c00b633446c2ee05fc19b924240de2d8b18f to 6878a2cec16309dcd96aaf03ae0d7db8f37d3cde -4fbe0b47753fd408689b94b7ee0094f7db8da6e2 2022-12-09T11:58:33+00:00 Fix info log formatting -# machine-config-operator embedded-component 52fe26136643a946ff1dd1307012cbdef31ebf97 to e8291b07876fd93fad5ef8c09b9f47621186cb17 -963248648c0e90610fd3d88ee252d9d484c73d7a 2023-01-17T15:54:12+00:00 OCPBUGS-5872: Wrap podman commands in a while loop -# ovn-kubernetes image-amd64 78938a80db83ac5df2d450103829c319c733b23a to ffce71cb9cc045517288ed0f28a5d25c059d2438 -8ce4aa4f4594271b53e7833dd9713605845d2b3a 2023-03-28T10:16:27+02:00 fix multiple error aggregation: `errors.Wrapf` always returns nil if the first argument is nil. -c43e230cff6bdd811448d528699635387187b74f 2023-03-28T10:14:11+02:00 Egress firewall creation error was overridden by the status update error and never returned. That would prevent retry on failure. +# cluster-kube-controller-manager-operator embedded-component b108134de5b1c7ef179fc523ffd62bc5898106a3 to 1c2157df6e9031bf6abb9250d2bec901608fe5b4 +46d4cbcd5d6d41480088c4597736eb450460fd24 2023-03-07T10:21:54+01:00 add featuregates for clusterpolicycontroller +3f435b6ffe739bbb945084d1f86b16e32726e15c 2023-03-07T10:14:25+01:00 update openshift/api to get new featuregates +# cluster-network-operator embedded-component 6878a2cec16309dcd96aaf03ae0d7db8f37d3cde to 529ff4a694ff0f4598d5763b20f78fe44cd14f22 +5dd5e9963ec960c0c6a1f28ad9137d1bfe2ba77f 2023-03-30T20:35:41+00:00 remove TLS_RSA_WITH_AES_128_CBC_SHA256 cipher +# kubernetes embedded-component eab9cc98fe4c002916621ace6cdd623afa519203 to 27e744f55d2e99eb8265c837e2571e47559079f6 +def0270a79c7f63435613f8f29ed5e731503d0ea 2023-04-05T16:19:35+02:00 UPSTREAM: : Force using the go tooling from the system +60398d079008c394fb817b1f5f37155dd47cc346 2023-03-30T18:47:02+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +0ce7342c984110dfc93657d64df5dc3b2c0d1fe9 2023-03-15T13:31:32+00:00 Release commit for Kubernetes v1.25.8 +42c5d12dabca806ca24cf886b26f5eb29ebb7af7 2023-03-09T16:00:44-05:00 One lock among PodNominator and SchedulingQueue +360e5303abc8ef88f4fa7f388d303b81cb60c028 2023-03-09T10:09:17+01:00 releng/go: Update images, dependencies and version to Go 1.19.7 +a561bb21aa9eb60cc00f1f203f04bb16da3365da 2023-03-03T11:20:16+05:30 Fix for windows kube-proxy: 'externalTrafficPolicy: Local' results in no clusterIP entry in windows node. +e64823164d7569f2eea7ce43c8a5e6b45d8aec3d 2023-03-02T02:28:33+00:00 add unit test +ca14d024105553724722ba44d9b30f4f6e2e5fa5 2023-03-02T02:28:32+00:00 fix 116028 +fa67514717bd8ab66be9dd35de66b54e07d5168c 2023-02-28T17:11:26-03:00 Re-enable label selector +557582e467fa64bd468f793e3ba4645feb436fee 2023-02-28T17:11:26-03:00 Add integration test for diff --prune --selector +92fff2577a08b0db131193a63b7d5903b75d2d4c 2023-02-28T17:11:24-03:00 Use label selector for filtering out resources when pruning. Matches same behavior as for kubectl apply +33c239a372de8fae329ddc898c431621549bc355 2023-02-24T20:21:38+01:00 scheduler/framework/plugins/volumebinding: fix inaccurate log for when a volume is bound to a claim +1f40263f4f1b1a28e69172e9b364e6ec0af70751 2023-02-22T14:59:51+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.7 +0dd0c702133d51d69d0e6ed019820eeaecb1242f 2023-02-22T13:56:51+00:00 Release commit for Kubernetes v1.25.8-rc.0 +05844c82d10b2b735fba485a8fc32a53a3678a30 2023-02-14T17:47:25+00:00 Remove check for CSI driver running on node for CSI migration attach operations +792b44dfe04e1b832ed7959ac7d84d6e04235b52 2023-02-13T21:31:10-05:00 Simplify construction of /metrics request +02d8672f8f8b2c4d0c5e7b9e902f2fee733001e9 2023-02-10T09:57:24-07:00 test: remove flaky pod update test in CSIInlineVolumes e2e +8f09151d9c11b0219450ca8160fb770512fe68e5 2023-02-09T10:47:54-08:00 Move CSI json file saving to SetUpAt() +9be591d06a0a7da0100401deea1e39be18f171d6 2023-02-08T16:49:10+05:30 Fix for issue with Loadbalancer policy creation for IPV6 endpoints in Dualstack mode. +029bde8d3d2111d05c72b26f31779e43f0082254 2023-02-03T00:03:49-05:00 Invoke gimme from kube::golang::verify_go_version +8b8eee429c84938f17d9d6ed4c1c604810020a6f 2023-02-03T00:03:49-05:00 Add gimme +441276ceb06eb5804256ab8331e10da8b46c2f1e 2023-02-03T00:03:48-05:00 Defer builds to test-cmd and test-integration targets +514352be24319a5825de8ed23940beaf83cc04c4 2023-01-30T15:38:00-05:00 Carefully compute request path for metrics +# machine-config-operator embedded-component e8291b07876fd93fad5ef8c09b9f47621186cb17 to 87fedee690ae487f8ae044ac416000172c9576a5 +150f62ac3a81d1e83c4f7f05f2338e41c61a479a 2023-04-06T11:01:52-05:00 OCPBUGS-5872: Wrap podman commands in a while loop +0d261434b2b2efb54a0151174e104802ed10c6db 2023-04-06T11:01:52-05:00 Remove timeout and separate image pull from prepender script +b360ceb047b11233551764e6e1b7518872e87b92 2023-04-06T11:01:50-05:00 Forklift most of resolv-prepender dispatcher script to systemd +db1e14f40de91e0b5b9628bb7facc223bfb93096 2023-02-17T17:11:51+00:00 OCPBUGS-1565: Prevent possible split-brain scenario with keepalived unicast +# ovn-kubernetes image-amd64 ffce71cb9cc045517288ed0f28a5d25c059d2438 to 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +0bc8f1412f1a462900961e4e54bc747b7a83d52a 2023-03-30T18:38:13+02:00 Optimize egress firewall cleanup to only select switches that have stale acls. +88ecd8b1b477c09a10bc7e151a181580fc8ca79f 2023-03-30T09:44:23+02:00 Batch potentially big transaction on egress firewall ACLs migration. The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches. +# kubernetes image-amd64 eab9cc98fe4c002916621ace6cdd623afa519203 to 27e744f55d2e99eb8265c837e2571e47559079f6 +def0270a79c7f63435613f8f29ed5e731503d0ea 2023-04-05T16:19:35+02:00 UPSTREAM: : Force using the go tooling from the system +60398d079008c394fb817b1f5f37155dd47cc346 2023-03-30T18:47:02+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +0ce7342c984110dfc93657d64df5dc3b2c0d1fe9 2023-03-15T13:31:32+00:00 Release commit for Kubernetes v1.25.8 +42c5d12dabca806ca24cf886b26f5eb29ebb7af7 2023-03-09T16:00:44-05:00 One lock among PodNominator and SchedulingQueue +360e5303abc8ef88f4fa7f388d303b81cb60c028 2023-03-09T10:09:17+01:00 releng/go: Update images, dependencies and version to Go 1.19.7 +a561bb21aa9eb60cc00f1f203f04bb16da3365da 2023-03-03T11:20:16+05:30 Fix for windows kube-proxy: 'externalTrafficPolicy: Local' results in no clusterIP entry in windows node. +e64823164d7569f2eea7ce43c8a5e6b45d8aec3d 2023-03-02T02:28:33+00:00 add unit test +ca14d024105553724722ba44d9b30f4f6e2e5fa5 2023-03-02T02:28:32+00:00 fix 116028 +fa67514717bd8ab66be9dd35de66b54e07d5168c 2023-02-28T17:11:26-03:00 Re-enable label selector +557582e467fa64bd468f793e3ba4645feb436fee 2023-02-28T17:11:26-03:00 Add integration test for diff --prune --selector +92fff2577a08b0db131193a63b7d5903b75d2d4c 2023-02-28T17:11:24-03:00 Use label selector for filtering out resources when pruning. Matches same behavior as for kubectl apply +33c239a372de8fae329ddc898c431621549bc355 2023-02-24T20:21:38+01:00 scheduler/framework/plugins/volumebinding: fix inaccurate log for when a volume is bound to a claim +1f40263f4f1b1a28e69172e9b364e6ec0af70751 2023-02-22T14:59:51+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.7 +0dd0c702133d51d69d0e6ed019820eeaecb1242f 2023-02-22T13:56:51+00:00 Release commit for Kubernetes v1.25.8-rc.0 +05844c82d10b2b735fba485a8fc32a53a3678a30 2023-02-14T17:47:25+00:00 Remove check for CSI driver running on node for CSI migration attach operations +792b44dfe04e1b832ed7959ac7d84d6e04235b52 2023-02-13T21:31:10-05:00 Simplify construction of /metrics request +02d8672f8f8b2c4d0c5e7b9e902f2fee733001e9 2023-02-10T09:57:24-07:00 test: remove flaky pod update test in CSIInlineVolumes e2e +8f09151d9c11b0219450ca8160fb770512fe68e5 2023-02-09T10:47:54-08:00 Move CSI json file saving to SetUpAt() +9be591d06a0a7da0100401deea1e39be18f171d6 2023-02-08T16:49:10+05:30 Fix for issue with Loadbalancer policy creation for IPV6 endpoints in Dualstack mode. +029bde8d3d2111d05c72b26f31779e43f0082254 2023-02-03T00:03:49-05:00 Invoke gimme from kube::golang::verify_go_version +8b8eee429c84938f17d9d6ed4c1c604810020a6f 2023-02-03T00:03:49-05:00 Add gimme +441276ceb06eb5804256ab8331e10da8b46c2f1e 2023-02-03T00:03:48-05:00 Defer builds to test-cmd and test-integration targets +514352be24319a5825de8ed23940beaf83cc04c4 2023-01-30T15:38:00-05:00 Carefully compute request path for metrics +# ovn-kubernetes image-arm64 ffce71cb9cc045517288ed0f28a5d25c059d2438 to 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +0bc8f1412f1a462900961e4e54bc747b7a83d52a 2023-03-30T18:38:13+02:00 Optimize egress firewall cleanup to only select switches that have stale acls. +88ecd8b1b477c09a10bc7e151a181580fc8ca79f 2023-03-30T09:44:23+02:00 Batch potentially big transaction on egress firewall ACLs migration. The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches. +# kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203 to 27e744f55d2e99eb8265c837e2571e47559079f6 +def0270a79c7f63435613f8f29ed5e731503d0ea 2023-04-05T16:19:35+02:00 UPSTREAM: : Force using the go tooling from the system +60398d079008c394fb817b1f5f37155dd47cc346 2023-03-30T18:47:02+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +0ce7342c984110dfc93657d64df5dc3b2c0d1fe9 2023-03-15T13:31:32+00:00 Release commit for Kubernetes v1.25.8 +42c5d12dabca806ca24cf886b26f5eb29ebb7af7 2023-03-09T16:00:44-05:00 One lock among PodNominator and SchedulingQueue +360e5303abc8ef88f4fa7f388d303b81cb60c028 2023-03-09T10:09:17+01:00 releng/go: Update images, dependencies and version to Go 1.19.7 +a561bb21aa9eb60cc00f1f203f04bb16da3365da 2023-03-03T11:20:16+05:30 Fix for windows kube-proxy: 'externalTrafficPolicy: Local' results in no clusterIP entry in windows node. +e64823164d7569f2eea7ce43c8a5e6b45d8aec3d 2023-03-02T02:28:33+00:00 add unit test +ca14d024105553724722ba44d9b30f4f6e2e5fa5 2023-03-02T02:28:32+00:00 fix 116028 +fa67514717bd8ab66be9dd35de66b54e07d5168c 2023-02-28T17:11:26-03:00 Re-enable label selector +557582e467fa64bd468f793e3ba4645feb436fee 2023-02-28T17:11:26-03:00 Add integration test for diff --prune --selector +92fff2577a08b0db131193a63b7d5903b75d2d4c 2023-02-28T17:11:24-03:00 Use label selector for filtering out resources when pruning. Matches same behavior as for kubectl apply +33c239a372de8fae329ddc898c431621549bc355 2023-02-24T20:21:38+01:00 scheduler/framework/plugins/volumebinding: fix inaccurate log for when a volume is bound to a claim +1f40263f4f1b1a28e69172e9b364e6ec0af70751 2023-02-22T14:59:51+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.7 +0dd0c702133d51d69d0e6ed019820eeaecb1242f 2023-02-22T13:56:51+00:00 Release commit for Kubernetes v1.25.8-rc.0 +05844c82d10b2b735fba485a8fc32a53a3678a30 2023-02-14T17:47:25+00:00 Remove check for CSI driver running on node for CSI migration attach operations +792b44dfe04e1b832ed7959ac7d84d6e04235b52 2023-02-13T21:31:10-05:00 Simplify construction of /metrics request +02d8672f8f8b2c4d0c5e7b9e902f2fee733001e9 2023-02-10T09:57:24-07:00 test: remove flaky pod update test in CSIInlineVolumes e2e +8f09151d9c11b0219450ca8160fb770512fe68e5 2023-02-09T10:47:54-08:00 Move CSI json file saving to SetUpAt() +9be591d06a0a7da0100401deea1e39be18f171d6 2023-02-08T16:49:10+05:30 Fix for issue with Loadbalancer policy creation for IPV6 endpoints in Dualstack mode. +029bde8d3d2111d05c72b26f31779e43f0082254 2023-02-03T00:03:49-05:00 Invoke gimme from kube::golang::verify_go_version +8b8eee429c84938f17d9d6ed4c1c604810020a6f 2023-02-03T00:03:49-05:00 Add gimme +441276ceb06eb5804256ab8331e10da8b46c2f1e 2023-02-03T00:03:48-05:00 Defer builds to test-cmd and test-integration targets +514352be24319a5825de8ed23940beaf83cc04c4 2023-01-30T15:38:00-05:00 Carefully compute request path for metrics diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 46bfe690aa..cdf6dad9ec 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,14 +1,14 @@ https://github.com/openshift/cluster-dns-operator embedded-component 1c136fe38b8cd5c0de99577d23157f884728d20b https://github.com/openshift/cluster-ingress-operator embedded-component 992b43b3cf3e1784bfe8d3083229c7ecb410e7e3 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2076f3d0e4fea6fca54028ec7831407173ea81f5 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component b108134de5b1c7ef179fc523ffd62bc5898106a3 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 1c2157df6e9031bf6abb9250d2bec901608fe5b4 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 845ae423e831b1cacf0bcae5e6528f1d21b5ddf2 -https://github.com/openshift/cluster-network-operator embedded-component 6878a2cec16309dcd96aaf03ae0d7db8f37d3cde +https://github.com/openshift/cluster-network-operator embedded-component 529ff4a694ff0f4598d5763b20f78fe44cd14f22 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d1915d130481541b8bacb5b98eddbc1541809d0a https://github.com/openshift/cluster-policy-controller embedded-component 139ac0499ac4d744023827ceb6d16aa6b467be27 https://github.com/openshift/etcd embedded-component c1d76ffd4b4cf0a0d2a6056a505fbef0b187c027 -https://github.com/openshift/kubernetes embedded-component eab9cc98fe4c002916621ace6cdd623afa519203 -https://github.com/openshift/machine-config-operator embedded-component e8291b07876fd93fad5ef8c09b9f47621186cb17 +https://github.com/openshift/kubernetes embedded-component 27e744f55d2e99eb8265c837e2571e47559079f6 +https://github.com/openshift/machine-config-operator embedded-component 87fedee690ae487f8ae044ac416000172c9576a5 https://github.com/openshift/openshift-controller-manager embedded-component b6528f9ea28164af9f1ceea0e50f18116fe3c90e https://github.com/openshift/route-controller-manager embedded-component 9e74d175e81ef6a2beb3718398e3fc99dded037c https://github.com/openshift/service-ca-operator embedded-component 299b7097a49385fdd4f86eccedc07f3a192e2504 @@ -20,8 +20,8 @@ https://github.com/openshift/csi-livenessprobe image-amd64 720e1d6e3e828dec99080 https://github.com/openshift/csi-node-driver-registrar image-amd64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-amd64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33 https://github.com/openshift/kube-rbac-proxy image-amd64 513fd32175af4bb03f2e8a31030477e63380b5bc -https://github.com/openshift/ovn-kubernetes image-amd64 ffce71cb9cc045517288ed0f28a5d25c059d2438 -https://github.com/openshift/kubernetes image-amd64 eab9cc98fe4c002916621ace6cdd623afa519203 +https://github.com/openshift/ovn-kubernetes image-amd64 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +https://github.com/openshift/kubernetes image-amd64 27e744f55d2e99eb8265c837e2571e47559079f6 https://github.com/openshift/service-ca-operator image-amd64 299b7097a49385fdd4f86eccedc07f3a192e2504 https://github.com/openshift/oc image-arm64 31aa3e89a926f81aa0af30320ffcb71acadf3015 https://github.com/openshift/coredns image-arm64 9aaa7e0a86b69bafb9f544a0e5cb1873535a8f6b @@ -31,6 +31,6 @@ https://github.com/openshift/csi-livenessprobe image-arm64 720e1d6e3e828dec99080 https://github.com/openshift/csi-node-driver-registrar image-arm64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-arm64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33 https://github.com/openshift/kube-rbac-proxy image-arm64 513fd32175af4bb03f2e8a31030477e63380b5bc -https://github.com/openshift/ovn-kubernetes image-arm64 ffce71cb9cc045517288ed0f28a5d25c059d2438 -https://github.com/openshift/kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203 +https://github.com/openshift/ovn-kubernetes image-arm64 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +https://github.com/openshift/kubernetes image-arm64 27e744f55d2e99eb8265c837e2571e47559079f6 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504 From 8f9cfb72e44b5049ab51232af43642d1ca7c15b1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Apr 2023 05:11:47 +0000 Subject: [PATCH 3/7] update go.mod --- go.mod | 54 +++++++++++++++++------------------ go.sum | 90 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/go.mod b/go.mod index b22dddb8f6..cd9a2dfa0b 100644 --- a/go.mod +++ b/go.mod @@ -294,36 +294,36 @@ replace ( gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // from kubernetes gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 // from kubernetes gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230406202355-27e744f55d2e // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230406202355-27e744f55d2e // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230406202355-27e744f55d2e // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230406202355-27e744f55d2e // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230406202355-27e744f55d2e // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230406202355-27e744f55d2e // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230406202355-27e744f55d2e // staging kubernetes k8s.io/component-helpers => k8s.io/component-helpers v0.25.0 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230406202355-27e744f55d2e // from kubernetes k8s.io/klog/v2 => k8s.io/klog/v2 v2.70.1 // from kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230406202355-27e744f55d2e // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230406202355-27e744f55d2e // from kubernetes k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230406202355-27e744f55d2e // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230406202355-27e744f55d2e // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230406202355-27e744f55d2e // from kubernetes sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // from kubernetes sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 // from kubernetes ) diff --git a/go.sum b/go.sum index 1ff9ab5d77..90d04c0770 100644 --- a/go.sum +++ b/go.sum @@ -546,51 +546,51 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 h1:50GOFZ github.com/openshift/etcd/raft/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7/go.mod h1:kCV6hIjK2Oe4UBxDM5dWYs5wZGsiSYH7JvGaEXDlpD4= github.com/openshift/etcd/server/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 h1:iMup9OQMjZkONA/lAGIfjr6UxboUOBqrbrBMNh2ZtPs= github.com/openshift/etcd/server/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7/go.mod h1:xwZlQLuAWsWw5rpb/Gwzi3nFie9STKcrKQbM6evLi5g= -github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c h1:IkEJvk3ky9d2edAyumMjjeGu9A/F2H/1N9IcdEGkLVQ= -github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:U7onx+dLL248udqLPp6SzctRAMzhBDh07QEJQHM3XyU= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c h1:p2wTy6HEQ5q28fhoCTwmSnozpk9CaDyyQlIl6NY3BSs= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:0e+IH7CyGwrfYDYKUsNW0HpasrfRUy40RzB40z/JbZ4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c h1:EZWEdmDFHY6AM1baGoR7JZe+2pWwRJKH/lBXuphvtDQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:hBdDIJQkeKDFqRAp9Ech139uPvJOcZEpWo4tbYmqA6M= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c h1:8HjWNDIBpyg3zVW/Pul5Yi4PXHh/QhMdnweRC4TB/3s= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:/dAmLhFRrTAOxBqEzOSfq6uwHMc01RcEOLQSgn0dcEI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c h1:NYDbBduI38QWWUDASym3aE9B9ibmsdzzheR+SEL9olI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:WxJC79h0dcYKXW91x4lOYZ/pgqSY3hijo70Pvl1KpsQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c h1:/RPE3PRWNA8ay/iVdpxLtm4vmxj1H9yrqqL7E6eCUcE= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:TDc7mrGQx8Nf4cZNEFiC1V3WMxB3778rOR5x6gXOIoE= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c h1:SR2U7FXJh/KerG8ZA5AGk2OTd7cm7HtlkAX1X7lqGcg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:9i/tdbVTiKs2vDQXHHAZq+oqWZtGhCD7aQyG/8bIo8A= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c h1:lA3qqvigRlYUX06mapLRvIT5IIfn3tyG7FNPkfgl9tg= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:C3S9pGVUJ1ZJctifufBiW6irF58tKVNb45AzOz4Rf3s= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c h1:NJNlgcyLxjClIXbdqg2DtMiIfl2VOmLr/Tr4UOobYCA= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:b6xZvVxbH8qUSoWcf846qX5FW2AYHTAG05DbWsLkpPo= -github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:nlTUosKhyPHcHLK4E/4po4K1L0UAv3xOrjsmqh3Ajg8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c h1:bS9IcTXkRvBok4F7FVMiBYsZBGuCRRxr098EoXUQcPU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:L7BiyM59UntZGlq44Q/vU58vEpzE/5VzT01MqhSTQ4E= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313212328-eab9cc98fe4c h1:fboqsaCBSwrCAqG/lsoHjjqi6uHjsbCjRjYnBBcylfo= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:dfD8ftEhCiM45p69/5z062RjYSkAGawKJmsC2KcTTaU= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c h1:7fMg9eN2W9t0uI/q7L6vqvvJTjOpVfzbyk4NxqNKhrg= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:DryNsLe7F3ksuOaUI+fegc4FjAA1JPEjC/JdS26jmEs= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c h1:JmSD6F37Gyez0OXrZAxOr7KYRbsOgSEPp7QsbE3ZknE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:/LWVVHxMwaRLi1FM52S+cILPiCfyvGVp19+Jk6RI+2Y= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313212328-eab9cc98fe4c h1:FRfEXzln/Xi2jJ3RBpd2s9sCRCvVmlURmbjJ4ROG54M= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:SmLWO2lhU1+6BWREplK+xlQb//1A1vxVaslGyn92hJg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c h1:Qe43otYf6GCwUQAFUA2/Gaa7VUPe9GJTdQSO2MbDods= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:DzYd8HeRsfeaWvGd7wKLJ39lpOJLqhSDMqck8PX4pAY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c h1:SPzLZ33a2sxtlVkh5ZZK4wVCAiv+3g9uuMfU7iNSMYQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:z0eu9TAAbVW9kToIi3N1nU+KHixqZgWMNOCahYI0iGc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c h1:k3qlbNh4zfJwIqAbnYTiZEsBCNMHEhpCESlmHbJIUyE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:s3M05wMMLIiuoAoecZluKPLUZkOrUriugdllXGHkkV8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c h1:ib12w40DnLuiobLUpV/5fnhwFb5DiPZ8PhZsJUhKY6Q= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:ESILSRwpo8poU3ATlwWZo6brt9OHnEvTKtmQHJ+6HQE= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c h1:y2YhsHU3APTfvqUefAu/+SQfizsAOoMbDgtG3G4xVlU= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:2l8i9L4kEAYkA6PZhZXJFy0GaS9ddrxRQcRk9rEG+gM= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c h1:MGTrqI1w6BhdS0lj/+MyEC+XOBKBkiF9sILMjJ7DVSE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:L6C2zrYe/5jHVxZMsBFoyjm0d9TcRZsDYkZYD4l0vZg= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c h1:6hQ6IR1lPZYsjPb98DDAr9FBWbTazx1elqkX9JMNTrU= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:fOVqNHsdAuwlu7rxsSQXqrCQiU0arPSyhS5bf8aNkwA= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c h1:04uyU64i3JxCLtptIyQG1fFY97tEVvYiPksJlU9bCXk= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:D98prnW5V9uL2O02gtTYNjA6rAVy7eS8D3hEJzw+Luo= +github.com/openshift/kubernetes v0.0.0-20230406202355-27e744f55d2e h1:ZBMwep3Xil5zzotprFTsQcqsWbEqidGlJN/s3uN9uBI= +github.com/openshift/kubernetes v0.0.0-20230406202355-27e744f55d2e/go.mod h1:U7onx+dLL248udqLPp6SzctRAMzhBDh07QEJQHM3XyU= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230406202355-27e744f55d2e h1:BN+XI7UlfoQ6OpHfMZWsLKDbG5w3qrEKL6Y1Gldlrq8= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230406202355-27e744f55d2e/go.mod h1:0e+IH7CyGwrfYDYKUsNW0HpasrfRUy40RzB40z/JbZ4= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230406202355-27e744f55d2e h1:myMIzPo9cwGRvYNXYcxksBMDpFvIOPG6KCXSO2jV3ZY= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230406202355-27e744f55d2e/go.mod h1:hBdDIJQkeKDFqRAp9Ech139uPvJOcZEpWo4tbYmqA6M= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230406202355-27e744f55d2e h1:Af+Ay8cll7FSv1csP5vDT8fx5MIVoHZWUpzFhwLp0QA= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230406202355-27e744f55d2e/go.mod h1:/dAmLhFRrTAOxBqEzOSfq6uwHMc01RcEOLQSgn0dcEI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230406202355-27e744f55d2e h1:ayRAkoCmvGXmJ44Mhsj5nF2Gx7f6rwfrnbcVP++Plow= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230406202355-27e744f55d2e/go.mod h1:WxJC79h0dcYKXW91x4lOYZ/pgqSY3hijo70Pvl1KpsQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230406202355-27e744f55d2e h1:rocr47U+V7XGH/R5INsca2NquYb639jIilWiT2hLpL0= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230406202355-27e744f55d2e/go.mod h1:TDc7mrGQx8Nf4cZNEFiC1V3WMxB3778rOR5x6gXOIoE= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230406202355-27e744f55d2e h1:aWq1VAV2+6+aiJisKkvTfizkagtLwIgXMPBxZuLocSw= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230406202355-27e744f55d2e/go.mod h1:9i/tdbVTiKs2vDQXHHAZq+oqWZtGhCD7aQyG/8bIo8A= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230406202355-27e744f55d2e h1:TFls2/krQi85Ks1cyZnKruBDk6A7Y+ZdjDslhLF6CGw= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230406202355-27e744f55d2e/go.mod h1:C3S9pGVUJ1ZJctifufBiW6irF58tKVNb45AzOz4Rf3s= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230406202355-27e744f55d2e h1:ndc7BouRcQcW2f1DF8CwEWiV/QWZ8IEs5jKP7MbWp5c= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230406202355-27e744f55d2e/go.mod h1:b6xZvVxbH8qUSoWcf846qX5FW2AYHTAG05DbWsLkpPo= +github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230406202355-27e744f55d2e/go.mod h1:nlTUosKhyPHcHLK4E/4po4K1L0UAv3xOrjsmqh3Ajg8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230406202355-27e744f55d2e h1:ekUcA/J3mBrgmXGTalKvc6VpQNRejP+Hl5Y931J6BS8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230406202355-27e744f55d2e/go.mod h1:L7BiyM59UntZGlq44Q/vU58vEpzE/5VzT01MqhSTQ4E= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230406202355-27e744f55d2e h1:z55py5zOu+/bAfDKwp5SU5nYTImb6yv1E1VXfpyDlAk= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230406202355-27e744f55d2e/go.mod h1:dfD8ftEhCiM45p69/5z062RjYSkAGawKJmsC2KcTTaU= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230406202355-27e744f55d2e h1:LlLv6zNnnVIcI0lOezhWsYdmS/d2n3U3GcYm8679TpQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230406202355-27e744f55d2e/go.mod h1:DryNsLe7F3ksuOaUI+fegc4FjAA1JPEjC/JdS26jmEs= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230406202355-27e744f55d2e h1:3SlQMT4H4KHWwdSNGoUu+L0avW8bzmnViStG9hzudyU= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230406202355-27e744f55d2e/go.mod h1:/LWVVHxMwaRLi1FM52S+cILPiCfyvGVp19+Jk6RI+2Y= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230406202355-27e744f55d2e h1:iUT9Nk8jK2S2ELFADVhsFVXzuIlu+h8RPYKNOgkrTwo= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230406202355-27e744f55d2e/go.mod h1:SmLWO2lhU1+6BWREplK+xlQb//1A1vxVaslGyn92hJg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230406202355-27e744f55d2e h1:PcyJP6FT8SVpjv4wLzCx3gCxhCK1gtpgOpuj+AX8O+c= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230406202355-27e744f55d2e/go.mod h1:DzYd8HeRsfeaWvGd7wKLJ39lpOJLqhSDMqck8PX4pAY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230406202355-27e744f55d2e h1:F8kclAQJneIHpmomqMFc5GJvp6+hSCnhdnmBBkj2hLM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230406202355-27e744f55d2e/go.mod h1:z0eu9TAAbVW9kToIi3N1nU+KHixqZgWMNOCahYI0iGc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230406202355-27e744f55d2e h1:Q+q4jHo7GFVuiV9wKBWfbRCyjqEnU9RKeYw/059MvhQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230406202355-27e744f55d2e/go.mod h1:s3M05wMMLIiuoAoecZluKPLUZkOrUriugdllXGHkkV8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230406202355-27e744f55d2e h1:VPLGcmU8RUiNqDyo5zf6Cwu3CxXNC12Odm5NumZhok8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230406202355-27e744f55d2e/go.mod h1:ESILSRwpo8poU3ATlwWZo6brt9OHnEvTKtmQHJ+6HQE= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230406202355-27e744f55d2e h1:7ankkMR0zvtpEzzDtCU/evYkQbvGXHJDYWOn67z2ewI= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230406202355-27e744f55d2e/go.mod h1:2l8i9L4kEAYkA6PZhZXJFy0GaS9ddrxRQcRk9rEG+gM= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230406202355-27e744f55d2e h1:HBq+NhudrWE2ECNBil7IeZQtu/Xvet3JCorWYQ8Ts3k= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230406202355-27e744f55d2e/go.mod h1:L6C2zrYe/5jHVxZMsBFoyjm0d9TcRZsDYkZYD4l0vZg= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230406202355-27e744f55d2e h1:bd58HiichnotbpKIYQ8R1kcqU2I12ptX5iFIjbzb9TU= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230406202355-27e744f55d2e/go.mod h1:fOVqNHsdAuwlu7rxsSQXqrCQiU0arPSyhS5bf8aNkwA= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230406202355-27e744f55d2e h1:r4Ike1I47x6X7PEymIIA6nFs8uPuLF7DMAJa3TwQlaw= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230406202355-27e744f55d2e/go.mod h1:D98prnW5V9uL2O02gtTYNjA6rAVy7eS8D3hEJzw+Luo= github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43 h1:siIMiY/kTrQvUzpwseN9Esw6fH+PD21VfqAzTa1b53M= github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43/go.mod h1:KPBAXGaq7pPmA+1wUVtKr5Axg3R68IomWDkzaOxIhxM= github.com/openshift/onsi-ginkgo/v2 v2.0.0-20221005160638-5fa9cd70cd8c h1:bRjMBrKdts7PdEHiF7Z9Q+LZR8NFVfF0HsDQJJzWLco= From cf5f6c9e7df1c48924d11c1bb9e75e1fb8f1ac1e Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Apr 2023 05:12:19 +0000 Subject: [PATCH 4/7] update vendoring --- .../volume/attachdetach/util/util.go | 17 ---- .../volume/persistentvolume/pv_controller.go | 2 +- .../pkg/scheduler/framework/interface.go | 3 + .../framework/plugins/volumebinding/binder.go | 9 +- .../scheduler/framework/runtime/framework.go | 4 + .../internal/queue/scheduling_queue.go | 77 ++++++++------- .../kubernetes/pkg/scheduler/scheduler.go | 9 +- .../kubernetes/pkg/volume/csi/csi_mounter.go | 29 ++++++ .../kubernetes/pkg/volume/csi/csi_plugin.go | 42 -------- vendor/modules.txt | 98 +++++++++---------- 10 files changed, 137 insertions(+), 153 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/util/util.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/util/util.go index 3abb4d68b3..73c858a445 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/util/util.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/volume/attachdetach/util/util.go @@ -371,22 +371,5 @@ func isCSIMigrationSupportedOnNode(nodeName types.NodeName, spec *volume.Spec, v isMigratedOnNode := mpaSet.Has(pluginName) - if isMigratedOnNode { - installed := false - driverName, err := csiMigratedPluginManager.GetCSINameFromInTreeName(pluginName) - if err != nil { - return isMigratedOnNode, err - } - for _, driver := range csiNode.Spec.Drivers { - if driver.Name == driverName { - installed = true - break - } - } - if !installed { - return true, fmt.Errorf("in-tree plugin %s is migrated on node %s but driver %s is not installed", pluginName, string(nodeName), driverName) - } - } - return isMigratedOnNode, nil } diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go index 8e6e66de08..0d4c80a176 100644 --- a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go @@ -930,7 +930,7 @@ func (ctrl *PersistentVolumeController) updateVolumePhaseWithEvent(volume *v1.Pe // Ignores claims that already have a storage class. // TODO: if resync is ever changed to a larger period, we might need to change how we set the default class on existing unbound claims func (ctrl *PersistentVolumeController) assignDefaultStorageClass(claim *v1.PersistentVolumeClaim) (*v1.PersistentVolumeClaim, error) { - if claim.Spec.StorageClassName != nil { + if storagehelpers.GetPersistentVolumeClaimClass(claim) != "" { return claim, nil } diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go index 00a14ad1a3..7dc8214b85 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/interface.go @@ -573,6 +573,9 @@ type Framework interface { // ProfileName returns the profile name associated to this framework. ProfileName() string + + // SetPodNominator sets the PodNominator + SetPodNominator(nominator PodNominator) } // Handle provides data and some tools that plugins can use. It is diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/binder.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/binder.go index 1c116431b9..f92b4e20db 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/binder.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding/binder.go @@ -500,15 +500,14 @@ func (b *volumeBinder) bindAPIUpdate(ctx context.Context, pod *v1.Pod, bindings // Do the actual prebinding. Let the PV controller take care of the rest // There is no API rollback if the actual binding fails for _, binding = range bindings { - klog.V(5).InfoS("bindAPIUpdate: binding PV to PVC", "pod", klog.KObj(pod), "PV", klog.KObj(binding.pv), "PVC", klog.KObj(binding.pvc)) // TODO: does it hurt if we make an api call and nothing needs to be updated? - klog.V(2).InfoS("Claim bound to volume", "PVC", klog.KObj(binding.pvc), "PV", klog.KObj(binding.pv)) + klog.V(5).InfoS("Updating PersistentVolume: binding to claim", "pod", klog.KObj(pod), "PV", klog.KObj(binding.pv), "PVC", klog.KObj(binding.pvc)) newPV, err := b.kubeClient.CoreV1().PersistentVolumes().Update(ctx, binding.pv, metav1.UpdateOptions{}) if err != nil { - klog.V(4).InfoS("Updating PersistentVolume: binding to claim failed", "PV", klog.KObj(binding.pv), "PVC", klog.KObj(binding.pvc), "err", err) + klog.V(4).InfoS("Updating PersistentVolume: binding to claim failed", "pod", klog.KObj(pod), "PV", klog.KObj(binding.pv), "PVC", klog.KObj(binding.pvc), "err", err) return err } - klog.V(4).InfoS("Updating PersistentVolume: bound to claim", "PV", klog.KObj(binding.pv), "PVC", klog.KObj(binding.pvc)) + klog.V(2).InfoS("Updated PersistentVolume with claim. Waiting for binding to complete", "pod", klog.KObj(pod), "PV", klog.KObj(binding.pv), "PVC", klog.KObj(binding.pvc)) // Save updated object from apiserver for later checking. binding.pv = newPV lastProcessedBinding++ @@ -669,7 +668,7 @@ func (b *volumeBinder) checkBindings(pod *v1.Pod, bindings []*BindingInfo, claim } // All pvs and pvcs that we operated on are bound - klog.V(4).InfoS("All PVCs for pod are bound", "pod", klog.KObj(pod)) + klog.V(2).InfoS("All PVCs for pod are bound", "pod", klog.KObj(pod)) return true, nil } diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/runtime/framework.go b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/runtime/framework.go index d58263480d..9408ff4bdb 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/framework/runtime/framework.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/framework/runtime/framework.go @@ -363,6 +363,10 @@ func NewFramework(r Registry, profile *config.KubeSchedulerProfile, stopCh <-cha return f, nil } +func (f *frameworkImpl) SetPodNominator(n framework.PodNominator) { + f.PodNominator = n +} + // getScoreWeights makes sure that, between MultiPoint-Score plugin weights and individual Score // plugin weights there is not an overflow of MaxTotalScore. func getScoreWeights(f *frameworkImpl, pluginsMap map[string]framework.Plugin, plugins []config.Plugin) error { diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go b/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go index 8de1a09c03..ab1103e632 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/internal/queue/scheduling_queue.go @@ -33,7 +33,6 @@ import ( "time" v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" @@ -133,8 +132,7 @@ func NominatedNodeName(pod *v1.Pod) string { // - unschedulablePods holds pods that were already attempted for scheduling and // are currently determined to be unschedulable. type PriorityQueue struct { - // PodNominator abstracts the operations to maintain nominated Pods. - framework.PodNominator + *nominator stop chan struct{} clock clock.Clock @@ -146,7 +144,6 @@ type PriorityQueue struct { // the maximum time a pod can stay in the unschedulablePods. podMaxInUnschedulablePodsDuration time.Duration - lock sync.RWMutex cond sync.Cond // activeQ is heap structure that scheduler actively looks at to find pods to @@ -180,7 +177,7 @@ type priorityQueueOptions struct { podInitialBackoffDuration time.Duration podMaxBackoffDuration time.Duration podMaxInUnschedulablePodsDuration time.Duration - podNominator framework.PodNominator + podLister listersv1.PodLister clusterEventMap map[framework.ClusterEvent]sets.String } @@ -208,10 +205,10 @@ func WithPodMaxBackoffDuration(duration time.Duration) Option { } } -// WithPodNominator sets pod nominator for PriorityQueue. -func WithPodNominator(pn framework.PodNominator) Option { +// WithPodLister sets pod lister for PriorityQueue. +func WithPodLister(pl listersv1.PodLister) Option { return func(o *priorityQueueOptions) { - o.podNominator = pn + o.podLister = pl } } @@ -256,6 +253,9 @@ func NewPriorityQueue( opts ...Option, ) *PriorityQueue { options := defaultPriorityQueueOptions + if options.podLister == nil { + options.podLister = informerFactory.Core().V1().Pods().Lister() + } for _, opt := range opts { opt(&options) } @@ -266,12 +266,8 @@ func NewPriorityQueue( return lessFn(pInfo1, pInfo2) } - if options.podNominator == nil { - options.podNominator = NewPodNominator(informerFactory.Core().V1().Pods().Lister()) - } - pq := &PriorityQueue{ - PodNominator: options.podNominator, + nominator: newPodNominator(options.podLister), clock: options.clock, stop: make(chan struct{}), podInitialBackoffDuration: options.podInitialBackoffDuration, @@ -314,7 +310,7 @@ func (p *PriorityQueue) Add(pod *v1.Pod) error { klog.ErrorS(nil, "Error: pod is already in the podBackoff queue", "pod", klog.KObj(pod)) } metrics.SchedulerQueueIncomingPods.WithLabelValues("active", PodAdd).Inc() - p.PodNominator.AddNominatedPod(pInfo.PodInfo, nil) + p.addNominatedPodUnlocked(pInfo.PodInfo, nil) p.cond.Broadcast() return nil @@ -368,7 +364,7 @@ func (p *PriorityQueue) activate(pod *v1.Pod) bool { p.unschedulablePods.delete(pod) p.podBackoffQ.Delete(pInfo) metrics.SchedulerQueueIncomingPods.WithLabelValues("active", ForceActivate).Inc() - p.PodNominator.AddNominatedPod(pInfo.PodInfo, nil) + p.addNominatedPodUnlocked(pInfo.PodInfo, nil) return true } @@ -424,7 +420,7 @@ func (p *PriorityQueue) AddUnschedulableIfNotPresent(pInfo *framework.QueuedPodI } - p.PodNominator.AddNominatedPod(pInfo.PodInfo, nil) + p.addNominatedPodUnlocked(pInfo.PodInfo, nil) return nil } @@ -531,14 +527,14 @@ func (p *PriorityQueue) Update(oldPod, newPod *v1.Pod) error { // If the pod is already in the active queue, just update it there. if oldPodInfo, exists, _ := p.activeQ.Get(oldPodInfo); exists { pInfo := updatePod(oldPodInfo, newPod) - p.PodNominator.UpdateNominatedPod(oldPod, pInfo.PodInfo) + p.updateNominatedPodUnlocked(oldPod, pInfo.PodInfo) return p.activeQ.Update(pInfo) } // If the pod is in the backoff queue, update it there. if oldPodInfo, exists, _ := p.podBackoffQ.Get(oldPodInfo); exists { pInfo := updatePod(oldPodInfo, newPod) - p.PodNominator.UpdateNominatedPod(oldPod, pInfo.PodInfo) + p.updateNominatedPodUnlocked(oldPod, pInfo.PodInfo) return p.podBackoffQ.Update(pInfo) } } @@ -546,7 +542,7 @@ func (p *PriorityQueue) Update(oldPod, newPod *v1.Pod) error { // If the pod is in the unschedulable queue, updating it may make it schedulable. if usPodInfo := p.unschedulablePods.get(newPod); usPodInfo != nil { pInfo := updatePod(usPodInfo, newPod) - p.PodNominator.UpdateNominatedPod(oldPod, pInfo.PodInfo) + p.updateNominatedPodUnlocked(oldPod, pInfo.PodInfo) if isPodUpdated(oldPod, newPod) { if p.isPodBackingoff(usPodInfo) { if err := p.podBackoffQ.Add(pInfo); err != nil { @@ -572,7 +568,7 @@ func (p *PriorityQueue) Update(oldPod, newPod *v1.Pod) error { if err := p.activeQ.Add(pInfo); err != nil { return err } - p.PodNominator.AddNominatedPod(pInfo.PodInfo, nil) + p.addNominatedPodUnlocked(pInfo.PodInfo, nil) p.cond.Broadcast() return nil } @@ -582,7 +578,7 @@ func (p *PriorityQueue) Update(oldPod, newPod *v1.Pod) error { func (p *PriorityQueue) Delete(pod *v1.Pod) error { p.lock.Lock() defer p.lock.Unlock() - p.PodNominator.DeleteNominatedPodIfExists(pod) + p.deleteNominatedPodIfExistsUnlocked(pod) if err := p.activeQ.Delete(newQueuedPodInfoForLookup(pod)); err != nil { // The item was probably not found in the activeQ. p.podBackoffQ.Delete(newQueuedPodInfoForLookup(pod)) @@ -662,8 +658,7 @@ func (p *PriorityQueue) movePodsToActiveOrBackoffQueue(podInfoList []*framework. // any affinity term that matches "pod". // NOTE: this function assumes lock has been acquired in caller. func (p *PriorityQueue) getUnschedulablePodsWithMatchingAffinityTerm(pod *v1.Pod) []*framework.QueuedPodInfo { - var nsLabels labels.Set - nsLabels = interpodaffinity.GetNamespaceLabelsSnapshot(pod.Namespace, p.nsLister) + nsLabels := interpodaffinity.GetNamespaceLabelsSnapshot(pod.Namespace, p.nsLister) var podsToMove []*framework.QueuedPodInfo for _, pInfo := range p.unschedulablePods.podInfoMap { @@ -707,9 +702,13 @@ func (p *PriorityQueue) Close() { // DeleteNominatedPodIfExists deletes from nominatedPods. func (npm *nominator) DeleteNominatedPodIfExists(pod *v1.Pod) { - npm.Lock() + npm.lock.Lock() + npm.deleteNominatedPodIfExistsUnlocked(pod) + npm.lock.Unlock() +} + +func (npm *nominator) deleteNominatedPodIfExistsUnlocked(pod *v1.Pod) { npm.delete(pod) - npm.Unlock() } // AddNominatedPod adds a pod to the nominated pods of the given node. @@ -717,16 +716,16 @@ func (npm *nominator) DeleteNominatedPodIfExists(pod *v1.Pod) { // the pod. We update the structure before sending a request to update the pod // object to avoid races with the following scheduling cycles. func (npm *nominator) AddNominatedPod(pi *framework.PodInfo, nominatingInfo *framework.NominatingInfo) { - npm.Lock() - npm.add(pi, nominatingInfo) - npm.Unlock() + npm.lock.Lock() + npm.addNominatedPodUnlocked(pi, nominatingInfo) + npm.lock.Unlock() } // NominatedPodsForNode returns a copy of pods that are nominated to run on the given node, // but they are waiting for other pods to be removed from the node. func (npm *nominator) NominatedPodsForNode(nodeName string) []*framework.PodInfo { - npm.RLock() - defer npm.RUnlock() + npm.lock.RLock() + defer npm.lock.RUnlock() // Make a copy of the nominated Pods so the caller can mutate safely. pods := make([]*framework.PodInfo, len(npm.nominatedPods[nodeName])) for i := 0; i < len(pods); i++ { @@ -852,10 +851,10 @@ type nominator struct { // nominated. nominatedPodToNode map[types.UID]string - sync.RWMutex + lock sync.RWMutex } -func (npm *nominator) add(pi *framework.PodInfo, nominatingInfo *framework.NominatingInfo) { +func (npm *nominator) addNominatedPodUnlocked(pi *framework.PodInfo, nominatingInfo *framework.NominatingInfo) { // Always delete the pod if it already exists, to ensure we never store more than // one instance of the pod. npm.delete(pi.Pod) @@ -912,8 +911,12 @@ func (npm *nominator) delete(p *v1.Pod) { // UpdateNominatedPod updates the with . func (npm *nominator) UpdateNominatedPod(oldPod *v1.Pod, newPodInfo *framework.PodInfo) { - npm.Lock() - defer npm.Unlock() + npm.lock.Lock() + defer npm.lock.Unlock() + npm.updateNominatedPodUnlocked(oldPod, newPodInfo) +} + +func (npm *nominator) updateNominatedPodUnlocked(oldPod *v1.Pod, newPodInfo *framework.PodInfo) { // In some cases, an Update event with no "NominatedNode" present is received right // after a node("NominatedNode") is reserved for this pod in memory. // In this case, we need to keep reserving the NominatedNode when updating the pod pointer. @@ -934,13 +937,17 @@ func (npm *nominator) UpdateNominatedPod(oldPod *v1.Pod, newPodInfo *framework.P // We update irrespective of the nominatedNodeName changed or not, to ensure // that pod pointer is updated. npm.delete(oldPod) - npm.add(newPodInfo, nominatingInfo) + npm.addNominatedPodUnlocked(newPodInfo, nominatingInfo) } // NewPodNominator creates a nominator as a backing of framework.PodNominator. // A podLister is passed in so as to check if the pod exists // before adding its nominatedNode info. func NewPodNominator(podLister listersv1.PodLister) framework.PodNominator { + return newPodNominator(podLister) +} + +func newPodNominator(podLister listersv1.PodLister) *nominator { return &nominator{ podLister: podLister, nominatedPods: make(map[string][]*framework.PodInfo), diff --git a/vendor/k8s.io/kubernetes/pkg/scheduler/scheduler.go b/vendor/k8s.io/kubernetes/pkg/scheduler/scheduler.go index 060dcc31ba..1b0a9e02ad 100644 --- a/vendor/k8s.io/kubernetes/pkg/scheduler/scheduler.go +++ b/vendor/k8s.io/kubernetes/pkg/scheduler/scheduler.go @@ -270,8 +270,6 @@ func New(client clientset.Interface, podLister := informerFactory.Core().V1().Pods().Lister() nodeLister := informerFactory.Core().V1().Nodes().Lister() - // The nominator will be passed all the way to framework instantiation. - nominator := internalqueue.NewPodNominator(podLister) snapshot := internalcache.NewEmptySnapshot() clusterEventMap := make(map[framework.ClusterEvent]sets.String) @@ -281,7 +279,6 @@ func New(client clientset.Interface, frameworkruntime.WithKubeConfig(options.kubeConfig), frameworkruntime.WithInformerFactory(informerFactory), frameworkruntime.WithSnapshotSharedLister(snapshot), - frameworkruntime.WithPodNominator(nominator), frameworkruntime.WithCaptureProfile(frameworkruntime.CaptureProfile(options.frameworkCapturer)), frameworkruntime.WithClusterEventMap(clusterEventMap), frameworkruntime.WithParallelism(int(options.parallelism)), @@ -300,11 +297,15 @@ func New(client clientset.Interface, informerFactory, internalqueue.WithPodInitialBackoffDuration(time.Duration(options.podInitialBackoffSeconds)*time.Second), internalqueue.WithPodMaxBackoffDuration(time.Duration(options.podMaxBackoffSeconds)*time.Second), - internalqueue.WithPodNominator(nominator), + internalqueue.WithPodLister(podLister), internalqueue.WithClusterEventMap(clusterEventMap), internalqueue.WithPodMaxInUnschedulablePodsDuration(options.podMaxInUnschedulablePodsDuration), ) + for _, fwk := range profiles { + fwk.SetPodNominator(podQueue) + } + schedulerCache := internalcache.New(durationToExpireAssumedPod, stopEverything) // Setup cache debugger. diff --git a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_mounter.go b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_mounter.go index 6c67b6ac86..4b9f05ca0b 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_mounter.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_mounter.go @@ -255,6 +255,35 @@ func (c *csiMountMgr) SetUpAt(dir string, mounterArgs volume.MounterArgs) error } } + // Save volume info in pod dir + // persist volume info data for teardown + nodeName := string(c.plugin.host.GetNodeName()) + volData := map[string]string{ + volDataKey.specVolID: c.spec.Name(), + volDataKey.volHandle: volumeHandle, + volDataKey.driverName: string(c.driverName), + volDataKey.nodeName: nodeName, + volDataKey.volumeLifecycleMode: string(c.volumeLifecycleMode), + volDataKey.attachmentID: getAttachmentName(volumeHandle, string(c.driverName), nodeName), + } + + err = saveVolumeData(parentDir, volDataFileName, volData) + defer func() { + // Only if there was an error and volume operation was considered + // finished, we should remove the directory. + if err != nil && volumetypes.IsOperationFinishedError(err) { + // attempt to cleanup volume mount dir + if removeerr := removeMountDir(c.plugin, dir); removeerr != nil { + klog.Error(log("mounter.SetUpAt failed to remove mount dir after error [%s]: %v", dir, removeerr)) + } + } + }() + if err != nil { + errorMsg := log("mounter.SetUpAt failed to save volume info data: %v", err) + klog.Error(errorMsg) + return volumetypes.NewTransientOperationFailure(errorMsg) + } + err = csi.NodePublishVolume( ctx, volumeHandle, diff --git a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go index e7690ee50c..01a2d04422 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go @@ -432,51 +432,9 @@ func (p *csiPlugin) NewMounter( } mounter.csiClientGetter.driverName = csiDriverName(driverName) - // Save volume info in pod dir dir := mounter.GetPath() - dataDir := filepath.Dir(dir) // dropoff /mount at end - - if err := os.MkdirAll(dataDir, 0750); err != nil { - return nil, errors.New(log("failed to create dir %#v: %v", dataDir, err)) - } - klog.V(4).Info(log("created path successfully [%s]", dataDir)) - mounter.MetricsProvider = NewMetricsCsi(volumeHandle, dir, csiDriverName(driverName)) - - // persist volume info data for teardown - node := string(p.host.GetNodeName()) - volData := map[string]string{ - volDataKey.specVolID: spec.Name(), - volDataKey.volHandle: volumeHandle, - volDataKey.driverName: driverName, - volDataKey.nodeName: node, - volDataKey.volumeLifecycleMode: string(volumeLifecycleMode), - } - - attachID := getAttachmentName(volumeHandle, driverName, node) - volData[volDataKey.attachmentID] = attachID - - err = saveVolumeData(dataDir, volDataFileName, volData) - defer func() { - // Only if there was an error and volume operation was considered - // finished, we should remove the directory. - if err != nil && volumetypes.IsOperationFinishedError(err) { - // attempt to cleanup volume mount dir. - if err = removeMountDir(p, dir); err != nil { - klog.Error(log("attacher.MountDevice failed to remove mount dir after error [%s]: %v", dir, err)) - } - } - }() - - if err != nil { - errorMsg := log("csi.NewMounter failed to save volume info data: %v", err) - klog.Error(errorMsg) - - return nil, errors.New(errorMsg) - } - klog.V(4).Info(log("mounter created successfully")) - return mounter, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index 78f1e01809..d83b769896 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1546,7 +1546,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/api v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1597,7 +1597,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/apiextensions-apiserver v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1643,7 +1643,7 @@ k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model -# k8s.io/apimachinery v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/apimachinery v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1707,7 +1707,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/apiserver v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1853,12 +1853,12 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/cli-runtime v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/cli-runtime v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/client-go v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1 @@ -2170,7 +2170,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/cloud-provider v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2190,14 +2190,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/component-base v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2240,7 +2240,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/controller-manager v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2257,13 +2257,13 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/apis/runtime/v1alpha2 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins @@ -2283,7 +2283,7 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kube-aggregator v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/kube-aggregator v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2314,7 +2314,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 @@ -2345,13 +2345,13 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta2 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/kubectl v0.25.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2387,7 +2387,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/kubelet v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/kubelet/config/v1alpha1 k8s.io/kubelet/config/v1beta1 @@ -2401,7 +2401,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1 k8s.io/kubelet/pkg/apis/podresources/v1 k8s.io/kubelet/pkg/apis/podresources/v1alpha1 k8s.io/kubelet/pkg/apis/stats/v1alpha1 -# k8s.io/kubernetes v1.25.2 => github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/kubernetes v1.25.2 => github.com/openshift/kubernetes v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3155,7 +3155,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/azure @@ -3199,7 +3199,7 @@ k8s.io/legacy-cloud-providers/openstack k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3214,10 +3214,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/pod-security-admission v0.25.0 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230406202355-27e744f55d2e ## explicit; go 1.19 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3401,35 +3401,35 @@ sigs.k8s.io/yaml # gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e # gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 # gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230406202355-27e744f55d2e +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230406202355-27e744f55d2e +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230406202355-27e744f55d2e +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230406202355-27e744f55d2e +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230406202355-27e744f55d2e +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230406202355-27e744f55d2e +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230406202355-27e744f55d2e +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230406202355-27e744f55d2e +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230406202355-27e744f55d2e +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230406202355-27e744f55d2e # k8s.io/component-helpers => k8s.io/component-helpers v0.25.0 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230406202355-27e744f55d2e +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230406202355-27e744f55d2e +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230406202355-27e744f55d2e # k8s.io/klog/v2 => k8s.io/klog/v2 v2.70.1 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230406202355-27e744f55d2e +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230406202355-27e744f55d2e # k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230313212328-eab9cc98fe4c -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230313212328-eab9cc98fe4c +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230406202355-27e744f55d2e +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230406202355-27e744f55d2e +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230406202355-27e744f55d2e +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230406202355-27e744f55d2e +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230406202355-27e744f55d2e +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230406202355-27e744f55d2e +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230406202355-27e744f55d2e +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230406202355-27e744f55d2e +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230406202355-27e744f55d2e +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230406202355-27e744f55d2e +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230406202355-27e744f55d2e +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230406202355-27e744f55d2e # sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 # sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 From 2c9484446641b19289d9834747765aa219672c70 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Apr 2023 05:12:20 +0000 Subject: [PATCH 5/7] update component images --- packaging/crio.conf.d/microshift_amd64.conf | 2 +- packaging/crio.conf.d/microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index 176d1bfecb..fbef798913 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/microshift_amd64.conf @@ -15,4 +15,4 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d324064f11fbdd1534bd82623cebdff34742bca90258005f381c60259ce8ad57" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a13c22901925a66052e1a9fccf23fbeec5262ead835bb26ea2ff0e21dd66d75" diff --git a/packaging/crio.conf.d/microshift_arm64.conf b/packaging/crio.conf.d/microshift_arm64.conf index 96696ba639..132582bf5c 100644 --- a/packaging/crio.conf.d/microshift_arm64.conf +++ b/packaging/crio.conf.d/microshift_arm64.conf @@ -15,4 +15,4 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5adebe588ac1dac69767ed98e34943446fe3c8a3cf9a83f00f10c770d721f504" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76ae10b81db6e2525bf812f9534186b2bac54c98d2198b2c0debea3f7be8ec29" From 9383b32096dd55791dfc2fdba817d50562d54fe4 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Apr 2023 05:12:21 +0000 Subject: [PATCH 6/7] update manifests --- assets/release/release-aarch64.json | 24 ++++++++++++------------ assets/release/release-x86_64.json | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index db12575cde..a9678882ee 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,20 +1,20 @@ { "release": { - "base": "4.12.0-0.nightly-arm64-2023-03-30-084912" + "base": "4.12.0-0.nightly-arm64-2023-04-07-173314" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e6a4aca31c9ed4c7ad57fe760da981541b3535a28e6c37098c78f3fcc9a1c2f", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71bcd679a06b394854fde90dc133681eb69c6eb7bef3564b54cbd2982ba9c7b1", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ebd415abc99e64b5afda3a7fa3bf512602aae4488f1e4400c093801299b1c6a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b3d9e90dd4ab535ec6d5512b4fbf739d33d61514bbd10d76fe98d2d5996ac35", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fec7d3fcf6f3f5dec420817329ad60e6822e16977bda55493bbbbc1f150dcc1", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38d477ccc95cfef01d41fd2a75a0b391efdff7e01ba7f6878db860ac6c12286d", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a10e8133c979164e0ce0469c2a68a0743b953a207ed35391c33e6fdbdcf92de", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1f3abde04550170e005cd59ecc0d9db2ad4854f1ea868de81df6ba050a33cf9", "lvms-topolvm": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5931deade8033a5637208cce4efe29c6f008c47ae3e0c76161aea6ae67480ee", - "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70f5ba75da255a2f176b9d5d657c062b9206bf986d6b41f4f2ce3339a0caefb9", - "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22002726742d2f312fcf8a4ad27544de30bd41c9276ef69fd67d25335ae4a617", - "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d66df63eeced9bf996628cbd046d654bf26f5a51a8e199f42125d07126bb8dcf", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48f36418f9dae877fc618ab91ce84851e66099d2c1cc82e996936c9c5d244e17", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5adebe588ac1dac69767ed98e34943446fe3c8a3cf9a83f00f10c770d721f504", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e0beedf4bf2cc075705d11cb7c54b7a4ad802c33b084139d7f7990cc18afe4f" + "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6bf5d986589a6dd335d41b799102694dbe1130124dec43322192e07762092c0", + "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a45dc331d00c2c1a3cc835a0cd21fd2683aab57db3035574a5ac0a60090b22bc", + "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79a6615b96c9e05d838f5a276f58614315029149ea4e9975585b3185f0dc8a0c", + "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78046f7d60616709fdcd615b687deab6548ebfdc49ad53ab7838c6a959ea391f", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb884fe0a607ff571592e6b496ec5519328bfd713a8da94f5fa95e2020829ff", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76ae10b81db6e2525bf812f9534186b2bac54c98d2198b2c0debea3f7be8ec29", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e419e06763c56cd5c374b4ba82faed004255543a77febc956929c301ee08021e" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 0f54ec0372..ae4a644d57 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,20 +1,20 @@ { "release": { - "base": "4.12.0-0.nightly-2023-04-03-132047" + "base": "4.12.0-0.nightly-2023-04-07-211226" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e43f69774d9411a1eece3f564e138e1eb547e7a8c08350987cda4e1d950adff3", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65e8df341fd89862aded89c73a368e3e7c568bb8304cac5ea4af14793397bb48", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96df903a6ce89acebee3f5b05a8de69437b213797d0ed5cf3bc824440d133b31", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a68f56ec1f9fdc03290d420085d108fe8be13d390a4354607b79f6946cfaa2d", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:533ac47e89e1bcf15a78df47260558b022cd41ce89cb353d72dd5ec315823027", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6b37db6614e5e6f573e7fa4a92926b49cc19a66c0421a0e9d57b1cfbc01acaf", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2774c71dd16b8a25cb6d19d0c0a02bf6582915c78766b918c65c5c55bffae52", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c28ac772ec8f918036b4c9876ec5a0c333f909cb502d52d836f46fd179c5735", "lvms-topolvm": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", - "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23cf7d6419275c4237d2ed4a3d0f73f242a9d114a7204186f96bceb4582c2a4b", - "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:869df0ee2e3c6034a1129f312878c6cebc923b883cf7057779cf2da75123f35e", - "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f27960af53fb94bd3a0dcf2015e84f7193f973dbd855ebdcbe28020986e30b6c", - "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5458bc9d131a9783f35d430a74d6b7ed94fc62d2239e372f809fac5ca0ee076e", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae636ff200105cccab1e7872332b5d4349fa86e1119f40fc5bfa044fb913e0dd", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d324064f11fbdd1534bd82623cebdff34742bca90258005f381c60259ce8ad57", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43c0e1a4cb6d0b1167777f3f087e32389522c7d820981af74c653e76773d92db" + "csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5382380185f0b0ea058b1f1395d2de0af7dc90343868bb639b629bfb9ec03e47", + "csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e25cd6c4997ef7c71db31ef9f400e4442d99e42e43d784d6f798c658f15e25c", + "csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2609f5c0c8b106482b4876f59067252f352ea4aa1e590b7080a410fb581fd001", + "csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20fb28ec66f85711821ebfff9ed883b27b866541a1c4eb12aa864f29cbf28047", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bf7f7777c9c8880d115cea1ac6300f8e8eef5cd2736077d4d97b1695772f47a", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a13c22901925a66052e1a9fccf23fbeec5262ead835bb26ea2ff0e21dd66d75", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:717a72f7e9f17a0b41e33541ec65e21c8e5e86132866cb5bc11527d529f2e058" } } From c4a8de88eff2e5bf2bc3b027fc78b2d8b22b79f8 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 10 Apr 2023 05:12:22 +0000 Subject: [PATCH 7/7] update buildfiles --- Makefile.kube_git.var | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 54affe4ef2..5210ac840f 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=25 KUBE_GIT_VERSION=v1.25.0 -KUBE_GIT_COMMIT=eab9cc98fe4c002916621ace6cdd623afa519203 +KUBE_GIT_COMMIT=27e744f55d2e99eb8265c837e2571e47559079f6 KUBE_GIT_TREE_STATE=clean