github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #106242 from thockin/revive-copy-lb-status-type-to-ingress

Browse Source 
Copy LoadBalancerStatus from core to networking
This commit is contained in:
Kubernetes Prow Robot
2022-11-02 21:39:34 -07:00
committed by GitHub
parent 3cf75a2f76 0153bfad16
commit 818b13544f
46 changed files with 4712 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/network/ingress.go
View File

@@ -596,7 +596,7 @@ var _ = common.SIGDescribe("Ingress API", func() {
},
},
},
Status: networkingv1.IngressStatus{LoadBalancer: v1.LoadBalancerStatus{}},
Status: networkingv1.IngressStatus{LoadBalancer: networkingv1.IngressLoadBalancerStatus{}},
}
ingress1 := ingTemplate.DeepCopy()
@@ -741,8 +741,8 @@ var _ = common.SIGDescribe("Ingress API", func() {
// /status subresource operations
ginkgo.By("patching /status")
lbStatus := v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{IP: "169.1.1.1"}},
lbStatus := networkingv1.IngressLoadBalancerStatus{
Ingress: []networkingv1.IngressLoadBalancerIngress{{IP: "169.1.1.1"}},
}
lbStatusJSON, err := json.Marshal(lbStatus)
framework.ExpectNoError(err)
@@ -760,8 +760,8 @@ var _ = common.SIGDescribe("Ingress API", func() {
if err != nil {
return err
}
statusToUpdate.Status.LoadBalancer = v1.LoadBalancerStatus{
Ingress: []v1.LoadBalancerIngress{{IP: "169.1.1.2"}},
statusToUpdate.Status.LoadBalancer = networkingv1.IngressLoadBalancerStatus{
Ingress: []networkingv1.IngressLoadBalancerIngress{{IP: "169.1.1.2"}},
}
updatedStatus, err = ingClient.UpdateStatus(context.TODO(), statusToUpdate, metav1.UpdateOptions{})
return err