Merge pull request #48827 from foxish/move-more-e2e

Automatic merge from submit-queue (batch tested with PRs 46738, 48827, 48831)

Moving disruption controller e2es to workload/

Based on #45301
Moving to track sig-apps in a single directory

cc @kubernetes/sig-contributor-experience-misc @kubernetes/sig-apps-misc @erictune @kow3ns @crimsonfaith91
This commit is contained in:
Kubernetes Submit Queue 2017-07-12 16:00:09 -07:00 committed by GitHub
commit 4da48f1c04
4 changed files with 8 additions and 4 deletions

View File

@ -53,7 +53,6 @@ go_library(
"cluster_upgrade.go",
"custom_resource_definition.go",
"dashboard.go",
"disruption.go",
"dns.go",
"dns_common.go",
"dns_configmap.go",
@ -153,7 +152,6 @@ go_library(
"//vendor/k8s.io/api/certificates/v1beta1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/api/policy/v1beta1:go_default_library",
"//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
"//vendor/k8s.io/api/settings/v1alpha1:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
@ -176,7 +174,6 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library",
"//vendor/k8s.io/client-go/discovery:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
"//vendor/k8s.io/client-go/util/cert:go_default_library",

View File

@ -41,6 +41,10 @@ import (
. "github.com/onsi/gomega"
)
const (
timeout = 60 * time.Second
)
func expectNodeReadiness(isReady bool, newNode chan *v1.Node) {
timeout := false
expected := false

View File

@ -14,6 +14,7 @@ go_library(
"daemon_restart.go",
"daemon_set.go",
"deployment.go",
"disruption.go",
"job.go",
"rc.go",
"replica_set.go",
@ -50,6 +51,7 @@ go_library(
"//vendor/k8s.io/api/batch/v2alpha1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/api/policy/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
@ -63,6 +65,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
],
)

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e
package workload
import (
"fmt"