github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81808 from dims/drop-azure-go-autorest-from-pkg/controller

Browse Source 
Drop Azure/go-autorest from pkg/controller
This commit is contained in:
Kubernetes Prow Robot 2019-08-23 06:54:02 -07:00 committed by GitHub
commit 9c69a45b52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/disruption/BUILD
View File

@ -68,7 +68,7 @@ go_test(
"//staging/src/k8s.io/client-go/testing:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library",
"//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/client-go/util/workqueue:go_default_library", "//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
"//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library",
], ],
) )

7
pkg/controller/disruption/disruption_test.go
View File

@ -41,8 +41,7 @@ import (
"k8s.io/client-go/util/workqueue" "k8s.io/client-go/util/workqueue"
_ "k8s.io/kubernetes/pkg/apis/core/install" _ "k8s.io/kubernetes/pkg/apis/core/install"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"
utilpointer "k8s.io/utils/pointer"
"github.com/Azure/go-autorest/autorest/to"
) )
type pdbStates map[string]policy.PodDisruptionBudget type pdbStates map[string]policy.PodDisruptionBudget
@ -445,7 +444,7 @@ func TestIntegerMaxUnavailableWithScaling(t *testing.T) {
ps.VerifyPdbStatus(t, pdbName, 0, 1, 5, 7, map[string]metav1.Time{}) ps.VerifyPdbStatus(t, pdbName, 0, 1, 5, 7, map[string]metav1.Time{})
// Update scale of ReplicaSet and check PDB // Update scale of ReplicaSet and check PDB
rs.Spec.Replicas = to.Int32Ptr(5) rs.Spec.Replicas = utilpointer.Int32Ptr(5)
update(t, dc.rsStore, rs) update(t, dc.rsStore, rs)
dc.sync(pdbName) dc.sync(pdbName)
@ -470,7 +469,7 @@ func TestPercentageMaxUnavailableWithScaling(t *testing.T) {
ps.VerifyPdbStatus(t, pdbName, 0, 1, 4, 7, map[string]metav1.Time{}) ps.VerifyPdbStatus(t, pdbName, 0, 1, 4, 7, map[string]metav1.Time{})
// Update scale of ReplicaSet and check PDB // Update scale of ReplicaSet and check PDB
rs.Spec.Replicas = to.Int32Ptr(3) rs.Spec.Replicas = utilpointer.Int32Ptr(3)
update(t, dc.rsStore, rs) update(t, dc.rsStore, rs)
dc.sync(pdbName) dc.sync(pdbName)