github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

pkg/util: move uuid and strategicpatch into k8s.io/apimachinery

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-01-24 15:35:22 +01:00
parent fb60807040
commit d7eb3b6870
88 changed files with 103 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/taint_test.go
View File

@@ -27,12 +27,12 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/client-go/rest/fake"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/util/strategicpatch"
)
func generateNodeAndTaintedNode(oldTaints []v1.Taint, newTaints []v1.Taint) (*api.Node, *api.Node) {