mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-04 23:17:50 +00:00
Merge pull request #50008 from atlassian/meta-controller-ref
Automatic merge from submit-queue Migrate to controller references helpers in meta/v1 **What this PR does / why we need it**: This is a follow up for #48319 that migrates all method usages to new methods in meta/v1. **Special notes for your reviewer**: Looking at each commit individually might be easier. **Release note**: ```release-note NONE ``` /sig api-machinery /kind cleanup
This commit is contained in:
@@ -31,7 +31,6 @@ import (
|
||||
apps "k8s.io/api/apps/v1beta1"
|
||||
"k8s.io/api/core/v1"
|
||||
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
|
||||
"k8s.io/kubernetes/pkg/controller"
|
||||
"k8s.io/kubernetes/pkg/controller/history"
|
||||
)
|
||||
|
||||
@@ -252,7 +251,7 @@ func TestOverlappingStatefulSets(t *testing.T) {
|
||||
func TestNewPodControllerRef(t *testing.T) {
|
||||
set := newStatefulSet(1)
|
||||
pod := newStatefulSetPod(set, 0)
|
||||
controllerRef := controller.GetControllerOf(pod)
|
||||
controllerRef := metav1.GetControllerOf(pod)
|
||||
if controllerRef == nil {
|
||||
t.Fatalf("No ControllerRef found on new pod")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user