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

[Federation] Convert the ReplicaSet controller to a sync controller.

Browse Source
This commit is contained in:
Jonathan MacMillan
2017-05-26 12:23:16 -07:00
parent e123311d8a
commit 16943f6f30
20 changed files with 692 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e_federation/BUILD
View File

@@ -29,7 +29,6 @@ go_library(
"//federation/client/clientset_generated/federation_clientset:go_default_library",
"//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library",
"//federation/pkg/federatedtypes:go_default_library",
"//federation/pkg/federation-controller/replicaset:go_default_library",
"//federation/pkg/federation-controller/util:go_default_library",
"//pkg/api:go_default_library",
"//pkg/api/v1:go_default_library",

4
test/e2e_federation/replicaset.go
View File

@@ -37,7 +37,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/uuid"
"k8s.io/kubernetes/federation/apis/federation"
fedreplicsetcontroller "k8s.io/kubernetes/federation/pkg/federation-controller/replicaset"
federatedtypes "k8s.io/kubernetes/federation/pkg/federatedtypes"
)
const (
@@ -513,7 +513,7 @@ func newReplicaSetObj(namespace string, replicas int32, pref *federation.Replica
if pref != nil {
prefBytes, _ := json.Marshal(pref)
prefString := string(prefBytes)
rs.Annotations[fedreplicsetcontroller.FedReplicaSetPreferencesAnnotation] = prefString
rs.Annotations[federatedtypes.FedReplicaSetPreferencesAnnotation] = prefString
}
return rs