github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17993 from eosrei/1111-minion-node-hack-e2e

Browse Source 
Minion->Node rename: comments/vars for e2e.go, e2e.sh, resize_nodes.go for #1111
This commit is contained in:
Marek Grabowski
2015-12-03 09:23:22 +01:00
parent 813a4c9d19 6ac427a501
commit 1a59e031e2
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/resize_nodes.go
View File

@@ -485,7 +485,7 @@ var _ = Describe("Nodes", func() {
})
Describe("Network", func() {
Context("when a minion node becomes unreachable", func() {
Context("when a node becomes unreachable", func() {
BeforeEach(func() {
SkipUnlessProviderIs("gce", "gke", "aws")
SkipUnlessNodeCountIsAtLeast(2)
@@ -497,8 +497,8 @@ var _ = Describe("Nodes", func() {
// 1. pods from a uncontactable nodes are rescheduled
// 2. when a node joins the cluster, it can host new pods.
// Factor out the cases into two separate tests.
It("[replication controller] recreates pods scheduled on the unreachable minion node "+
"AND allows scheduling of pods on a minion after it rejoins the cluster", func() {
It("[replication controller] recreates pods scheduled on the unreachable node "+
"AND allows scheduling of pods on a node after it rejoins the cluster", func() {
// Create a replication controller for a service that serves its hostname.
// The source for the Docker container kubernetes/serve_hostname is in contrib/for-demos/serve_hostname