Merge pull request #118168 from neolit123/automated-cherry-pick-of-#118150-origin-release-1.26

Automated cherry pick of #118150: kubeadm: remove function pointer comparison in phase test

Kubernetes-commit: 5b5c00771700285823963ab05ca7e68ff56ecb5e
This commit is contained in:
Kubernetes Publisher
2023-07-05 15:13:32 +00:00
parent 596ec3c132
commit f21770dd03
2 changed files with 16 additions and 27 deletions
+8 -9
View File
@@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.19
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20230612172015-e5ccf2eb3112
k8s.io/apimachinery v0.0.0-20230612171130-c23a82e9e261
k8s.io/client-go v0.0.0-20230612174153-cb4594adb388
k8s.io/code-generator v0.0.0-20230705140334-b770688429e1
k8s.io/klog/v2 v2.80.1
)
@@ -57,9 +57,8 @@ require (
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20230612172015-e5ccf2eb3112
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230612171130-c23a82e9e261
k8s.io/client-go => k8s.io/client-go v0.0.0-20230612174153-cb4594adb388
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230705140334-b770688429e1
)