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

Merge pull request #43035 from perotinus/extrace

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42662, 43035, 42578, 43682)

[Federation] Fix a typo in the ReplicaSet E2E test: s/extrace/extract/

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-03-30 11:00:30 -07:00 committed by GitHub
commit 8b692907a0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e_federation/replicaset.go
View File

@ -275,7 +275,7 @@ func verifyCascadingDeletionForReplicaSet(clientset *fedclientset.Clientset, clu
func generateFedRSPrefsWithWeight(clusters map[string]*cluster) (pref *federation.FederatedReplicaSetPreferences, replicas int32, expect map[string]int32) { func generateFedRSPrefsWithWeight(clusters map[string]*cluster) (pref *federation.FederatedReplicaSetPreferences, replicas int32, expect map[string]int32) {
By("Generating replicaset preferences with weights") By("Generating replicaset preferences with weights")
clusterNames := extraceClusterNames(clusters) clusterNames := extractClusterNames(clusters)
pref = &federation.FederatedReplicaSetPreferences{ pref = &federation.FederatedReplicaSetPreferences{
Clusters: map[string]federation.ClusterReplicaSetPreferences{}, Clusters: map[string]federation.ClusterReplicaSetPreferences{},
} }
@ -296,7 +296,7 @@ func generateFedRSPrefsWithWeight(clusters map[string]*cluster) (pref *federatio
func generateFedRSPrefsWithMin(clusters map[string]*cluster) (pref *federation.FederatedReplicaSetPreferences, replicas int32, expect map[string]int32) { func generateFedRSPrefsWithMin(clusters map[string]*cluster) (pref *federation.FederatedReplicaSetPreferences, replicas int32, expect map[string]int32) {
By("Generating replicaset preferences with min replicas") By("Generating replicaset preferences with min replicas")
clusterNames := extraceClusterNames(clusters) clusterNames := extractClusterNames(clusters)
pref = &federation.FederatedReplicaSetPreferences{ pref = &federation.FederatedReplicaSetPreferences{
Clusters: map[string]federation.ClusterReplicaSetPreferences{ Clusters: map[string]federation.ClusterReplicaSetPreferences{
clusterNames[0]: {Weight: 100}, clusterNames[0]: {Weight: 100},
@ -323,7 +323,7 @@ func generateFedRSPrefsWithMin(clusters map[string]*cluster) (pref *federation.F
func generateFedRSPrefsWithMax(clusters map[string]*cluster) (pref *federation.FederatedReplicaSetPreferences, replicas int32, expect map[string]int32) { func generateFedRSPrefsWithMax(clusters map[string]*cluster) (pref *federation.FederatedReplicaSetPreferences, replicas int32, expect map[string]int32) {
By("Generating replicaset preferences with max replicas") By("Generating replicaset preferences with max replicas")
clusterNames := extraceClusterNames(clusters) clusterNames := extractClusterNames(clusters)
pref = &federation.FederatedReplicaSetPreferences{ pref = &federation.FederatedReplicaSetPreferences{
Clusters: map[string]federation.ClusterReplicaSetPreferences{ Clusters: map[string]federation.ClusterReplicaSetPreferences{
clusterNames[0]: {Weight: 1}, clusterNames[0]: {Weight: 1},
@ -356,7 +356,7 @@ func updateFedRSPrefsRebalance(pref *federation.FederatedReplicaSetPreferences,
func generateFedRSPrefsForRebalancing(clusters map[string]*cluster) (pref1, pref2 *federation.FederatedReplicaSetPreferences, replicas int32, expect1, expect2 map[string]int32) { func generateFedRSPrefsForRebalancing(clusters map[string]*cluster) (pref1, pref2 *federation.FederatedReplicaSetPreferences, replicas int32, expect1, expect2 map[string]int32) {
By("Generating replicaset for rebalancing") By("Generating replicaset for rebalancing")
clusterNames := extraceClusterNames(clusters) clusterNames := extractClusterNames(clusters)
replicas = 3 replicas = 3
pref1 = &federation.FederatedReplicaSetPreferences{ pref1 = &federation.FederatedReplicaSetPreferences{
@ -530,7 +530,7 @@ func newReplicaSetWithName(namespace string, name string, replicas int32, pref *
return rs return rs
} }
func extraceClusterNames(clusters map[string]*cluster) []string { func extractClusterNames(clusters map[string]*cluster) []string {
clusterNames := make([]string, 0, len(clusters)) clusterNames := make([]string, 0, len(clusters))
for clusterName := range clusters { for clusterName := range clusters {
clusterNames = append(clusterNames, clusterName) clusterNames = append(clusterNames, clusterName)