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

SimpleNameGenerator: unify to use k8s.io/apiserver/pkg/storage/names

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2017-10-09 17:22:26 +02:00
parent b926ca40de
commit 9488150762
10 changed files with 64 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/deployment/util/deployment_util_test.go
View File

@@ -32,9 +32,9 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/apiserver/pkg/storage/names"
"k8s.io/client-go/kubernetes/fake"
core "k8s.io/client-go/testing"
apiv1 "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/controller"
)
@@ -88,7 +88,7 @@ func addUpdatePodsReactor(fakeClient *fake.Clientset) *fake.Clientset {
func generateRSWithLabel(labels map[string]string, image string) extensions.ReplicaSet {
return extensions.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{
Name: apiv1.SimpleNameGenerator.GenerateName("replicaset"),
Name: names.SimpleNameGenerator.GenerateName("replicaset"),
Labels: labels,
},
Spec: extensions.ReplicaSetSpec{
@@ -130,7 +130,7 @@ func generateRS(deployment extensions.Deployment) extensions.ReplicaSet {
return extensions.ReplicaSet{
ObjectMeta: metav1.ObjectMeta{
UID: randomUID(),
Name: apiv1.SimpleNameGenerator.GenerateName("replicaset"),
Name: names.SimpleNameGenerator.GenerateName("replicaset"),
Labels: template.Labels,
OwnerReferences: []metav1.OwnerReference{*newDControllerRef(&deployment)},
},