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

Merge pull request #38402 from madhusudancs/fed-svc-e2e-cm-fix-2

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 36310, 37349, 38319, 38402, 38338)

Use the `serviceShard` variable in the service shard block, not the `service` variable.

cc @kubernetes/sig-federation
This commit is contained in:
Kubernetes Submit Queue 2016-12-08 13:44:57 -08:00 committed by GitHub
commit 9c166ddf46
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/federated-service.go
View File

@ -217,8 +217,8 @@ var _ = framework.KubeDescribe("[Feature:Federation]", func() {
} }
if serviceShard != nil { if serviceShard != nil {
By(fmt.Sprintf("Deleting service shards and their provider resources in underlying clusters for service %q in namespace %q", service.Name, nsName)) By(fmt.Sprintf("Deleting service shards and their provider resources in underlying clusters for service %q in namespace %q", serviceShard.Name, nsName))
cleanupServiceShardsAndProviderResources(nsName, service, clusters) cleanupServiceShardsAndProviderResources(nsName, serviceShard, clusters)
serviceShard = nil serviceShard = nil
} else { } else {
By("No service shards to delete. `serviceShard` is nil") By("No service shards to delete. `serviceShard` is nil")