mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #71952 from vyta/sig-windows-tests
Sig windows tests
This commit is contained in:
commit
c9e1ffb0e7
@ -732,6 +732,7 @@ test/e2e/ui
|
|||||||
test/e2e/upgrades
|
test/e2e/upgrades
|
||||||
test/e2e/upgrades/apps
|
test/e2e/upgrades/apps
|
||||||
test/e2e/upgrades/storage
|
test/e2e/upgrades/storage
|
||||||
|
test/e2e/windows
|
||||||
test/e2e_kubeadm
|
test/e2e_kubeadm
|
||||||
test/e2e_node
|
test/e2e_node
|
||||||
test/e2e_node/builder
|
test/e2e_node/builder
|
||||||
|
@ -32,6 +32,7 @@ go_test(
|
|||||||
"//test/e2e/servicecatalog:go_default_library",
|
"//test/e2e/servicecatalog:go_default_library",
|
||||||
"//test/e2e/storage:go_default_library",
|
"//test/e2e/storage:go_default_library",
|
||||||
"//test/e2e/ui:go_default_library",
|
"//test/e2e/ui:go_default_library",
|
||||||
|
"//test/e2e/windows:go_default_library",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -120,6 +121,7 @@ filegroup(
|
|||||||
"//test/e2e/testing-manifests:all-srcs",
|
"//test/e2e/testing-manifests:all-srcs",
|
||||||
"//test/e2e/ui:all-srcs",
|
"//test/e2e/ui:all-srcs",
|
||||||
"//test/e2e/upgrades:all-srcs",
|
"//test/e2e/upgrades:all-srcs",
|
||||||
|
"//test/e2e/windows:all-srcs",
|
||||||
],
|
],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
)
|
)
|
||||||
|
@ -44,6 +44,7 @@ import (
|
|||||||
_ "k8s.io/kubernetes/test/e2e/servicecatalog"
|
_ "k8s.io/kubernetes/test/e2e/servicecatalog"
|
||||||
_ "k8s.io/kubernetes/test/e2e/storage"
|
_ "k8s.io/kubernetes/test/e2e/storage"
|
||||||
_ "k8s.io/kubernetes/test/e2e/ui"
|
_ "k8s.io/kubernetes/test/e2e/ui"
|
||||||
|
_ "k8s.io/kubernetes/test/e2e/windows"
|
||||||
)
|
)
|
||||||
|
|
||||||
var viperConfig = flag.String("viper-config", "", "The name of a viper config file (https://github.com/spf13/viper#what-is-viper). All e2e command line parameters can also be configured in such a file. May contain a path and may or may not contain the file suffix. The default is to look for an optional file with `e2e` as base name. If a file is specified explicitly, it must be present.")
|
var viperConfig = flag.String("viper-config", "", "The name of a viper config file (https://github.com/spf13/viper#what-is-viper). All e2e command line parameters can also be configured in such a file. May contain a path and may or may not contain the file suffix. The default is to look for an optional file with `e2e` as base name. If a file is specified explicitly, it must be present.")
|
||||||
|
39
test/e2e/windows/BUILD
Normal file
39
test/e2e/windows/BUILD
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
|
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||||
|
|
||||||
|
go_library(
|
||||||
|
name = "go_default_library",
|
||||||
|
srcs = [
|
||||||
|
"density.go",
|
||||||
|
"framework.go",
|
||||||
|
],
|
||||||
|
importpath = "k8s.io/kubernetes/test/e2e/windows",
|
||||||
|
visibility = ["//visibility:public"],
|
||||||
|
deps = [
|
||||||
|
"//staging/src/k8s.io/api/core/v1:go_default_library",
|
||||||
|
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||||
|
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
|
||||||
|
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
|
||||||
|
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
|
||||||
|
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
|
||||||
|
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
|
||||||
|
"//test/e2e/framework:go_default_library",
|
||||||
|
"//test/utils/image:go_default_library",
|
||||||
|
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
||||||
|
"//vendor/github.com/onsi/gomega:go_default_library",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
filegroup(
|
||||||
|
name = "package-srcs",
|
||||||
|
srcs = glob(["**"]),
|
||||||
|
tags = ["automanaged"],
|
||||||
|
visibility = ["//visibility:private"],
|
||||||
|
)
|
||||||
|
|
||||||
|
filegroup(
|
||||||
|
name = "all-srcs",
|
||||||
|
srcs = [":package-srcs"],
|
||||||
|
tags = ["automanaged"],
|
||||||
|
)
|
12
test/e2e/windows/OWNERS
Normal file
12
test/e2e/windows/OWNERS
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
approvers:
|
||||||
|
- dchen1107
|
||||||
|
- michmike
|
||||||
|
- patricklang
|
||||||
|
reviewers:
|
||||||
|
- adelina-t
|
||||||
|
- bclau
|
||||||
|
- benmoss
|
||||||
|
- dineshgovindasamy
|
||||||
|
- feiskyer
|
||||||
|
- madhanrm
|
||||||
|
- yujuhong
|
20
test/e2e/windows/README.md
Normal file
20
test/e2e/windows/README.md
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
# Notes to run sig-windows tests
|
||||||
|
|
||||||
|
1. Prereqs:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
KUBECONFIG=path/to/kubeconfig
|
||||||
|
curl https://raw.githubusercontent.com/e2e-win/e2e-win-prow-deployment/master/repo-list -o repo_list
|
||||||
|
export KUBE_TEST_REPO_LIST=$(pwd)/repo_list
|
||||||
|
```
|
||||||
|
|
||||||
|
1. Run only sig-windows tests:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./e2e.test --provider=local --ginkgo.noColor --ginkgo.focus="\[sig-windows\]" --node-os-distro="windows"
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
# e2e_node/density_test diff
|
||||||
|
|
||||||
|
This test is borrowed from the density test in e2e_node/density_test. All but the first test were omitted as well as some logging.
|
303
test/e2e/windows/density.go
Normal file
303
test/e2e/windows/density.go
Normal file
@ -0,0 +1,303 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2018 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package windows
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"k8s.io/api/core/v1"
|
||||||
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
"k8s.io/apimachinery/pkg/labels"
|
||||||
|
"k8s.io/apimachinery/pkg/runtime"
|
||||||
|
"k8s.io/apimachinery/pkg/util/uuid"
|
||||||
|
"k8s.io/apimachinery/pkg/watch"
|
||||||
|
"k8s.io/client-go/tools/cache"
|
||||||
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
|
|
||||||
|
. "github.com/onsi/ginkgo"
|
||||||
|
. "github.com/onsi/gomega"
|
||||||
|
)
|
||||||
|
|
||||||
|
var _ = SIGDescribe("[Feature:Windows] Density [Serial] [Slow]", func() {
|
||||||
|
|
||||||
|
f := framework.NewDefaultFramework("density-test-windows")
|
||||||
|
|
||||||
|
BeforeEach(func() {
|
||||||
|
// NOTE(vyta): these tests are Windows specific
|
||||||
|
framework.SkipUnlessNodeOSDistroIs("windows")
|
||||||
|
})
|
||||||
|
|
||||||
|
Context("create a batch of pods", func() {
|
||||||
|
// TODO(coufon): the values are generous, set more precise limits with benchmark data
|
||||||
|
// and add more tests
|
||||||
|
dTests := []densityTest{
|
||||||
|
{
|
||||||
|
podsNr: 10,
|
||||||
|
interval: 0 * time.Millisecond,
|
||||||
|
// percentile limit of single pod startup latency
|
||||||
|
podStartupLimits: framework.LatencyMetric{
|
||||||
|
Perc50: 30 * time.Second,
|
||||||
|
Perc90: 54 * time.Second,
|
||||||
|
Perc99: 59 * time.Second,
|
||||||
|
},
|
||||||
|
// upbound of startup latency of a batch of pods
|
||||||
|
podBatchStartupLimit: 10 * time.Minute,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, testArg := range dTests {
|
||||||
|
itArg := testArg
|
||||||
|
desc := fmt.Sprintf("latency/resource should be within limit when create %d pods with %v interval", itArg.podsNr, itArg.interval)
|
||||||
|
It(desc, func() {
|
||||||
|
itArg.createMethod = "batch"
|
||||||
|
|
||||||
|
runDensityBatchTest(f, itArg)
|
||||||
|
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
})
|
||||||
|
|
||||||
|
type densityTest struct {
|
||||||
|
// number of pods
|
||||||
|
podsNr int
|
||||||
|
// number of background pods
|
||||||
|
bgPodsNr int
|
||||||
|
// interval between creating pod (rate control)
|
||||||
|
interval time.Duration
|
||||||
|
// create pods in 'batch' or 'sequence'
|
||||||
|
createMethod string
|
||||||
|
// API QPS limit
|
||||||
|
APIQPSLimit int
|
||||||
|
// performance limits
|
||||||
|
cpuLimits framework.ContainersCPUSummary
|
||||||
|
memLimits framework.ResourceUsagePerContainer
|
||||||
|
podStartupLimits framework.LatencyMetric
|
||||||
|
podBatchStartupLimit time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
// runDensityBatchTest runs the density batch pod creation test
|
||||||
|
func runDensityBatchTest(f *framework.Framework, testArg densityTest) (time.Duration, []framework.PodLatencyData) {
|
||||||
|
const (
|
||||||
|
podType = "density_test_pod"
|
||||||
|
)
|
||||||
|
var (
|
||||||
|
mutex = &sync.Mutex{}
|
||||||
|
watchTimes = make(map[string]metav1.Time, 0)
|
||||||
|
stopCh = make(chan struct{})
|
||||||
|
)
|
||||||
|
|
||||||
|
// create test pod data structure
|
||||||
|
pods := newTestPods(testArg.podsNr, false, imageutils.GetPauseImageName(), podType)
|
||||||
|
|
||||||
|
// the controller watches the change of pod status
|
||||||
|
controller := newInformerWatchPod(f, mutex, watchTimes, podType)
|
||||||
|
go controller.Run(stopCh)
|
||||||
|
defer close(stopCh)
|
||||||
|
|
||||||
|
By("Creating a batch of pods")
|
||||||
|
// It returns a map['pod name']'creation time' containing the creation timestamps
|
||||||
|
createTimes := createBatchPodWithRateControl(f, pods, testArg.interval)
|
||||||
|
|
||||||
|
By("Waiting for all Pods to be observed by the watch...")
|
||||||
|
|
||||||
|
Eventually(func() bool {
|
||||||
|
return len(watchTimes) == testArg.podsNr
|
||||||
|
}, 10*time.Minute, 10*time.Second).Should(BeTrue())
|
||||||
|
|
||||||
|
if len(watchTimes) < testArg.podsNr {
|
||||||
|
framework.Failf("Timeout reached waiting for all Pods to be observed by the watch.")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Analyze results
|
||||||
|
var (
|
||||||
|
firstCreate metav1.Time
|
||||||
|
lastRunning metav1.Time
|
||||||
|
init = true
|
||||||
|
e2eLags = make([]framework.PodLatencyData, 0)
|
||||||
|
)
|
||||||
|
|
||||||
|
for name, create := range createTimes {
|
||||||
|
watch, ok := watchTimes[name]
|
||||||
|
Expect(ok).To(Equal(true))
|
||||||
|
|
||||||
|
e2eLags = append(e2eLags,
|
||||||
|
framework.PodLatencyData{Name: name, Latency: watch.Time.Sub(create.Time)})
|
||||||
|
|
||||||
|
if !init {
|
||||||
|
if firstCreate.Time.After(create.Time) {
|
||||||
|
firstCreate = create
|
||||||
|
}
|
||||||
|
if lastRunning.Time.Before(watch.Time) {
|
||||||
|
lastRunning = watch
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
init = false
|
||||||
|
firstCreate, lastRunning = create, watch
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Sort(framework.LatencySlice(e2eLags))
|
||||||
|
batchLag := lastRunning.Time.Sub(firstCreate.Time)
|
||||||
|
|
||||||
|
deletePodsSync(f, pods)
|
||||||
|
|
||||||
|
return batchLag, e2eLags
|
||||||
|
}
|
||||||
|
|
||||||
|
// createBatchPodWithRateControl creates a batch of pods concurrently, uses one goroutine for each creation.
|
||||||
|
// between creations there is an interval for throughput control
|
||||||
|
func createBatchPodWithRateControl(f *framework.Framework, pods []*v1.Pod, interval time.Duration) map[string]metav1.Time {
|
||||||
|
createTimes := make(map[string]metav1.Time)
|
||||||
|
for _, pod := range pods {
|
||||||
|
createTimes[pod.ObjectMeta.Name] = metav1.Now()
|
||||||
|
go f.PodClient().Create(pod)
|
||||||
|
time.Sleep(interval)
|
||||||
|
}
|
||||||
|
return createTimes
|
||||||
|
}
|
||||||
|
|
||||||
|
// newInformerWatchPod creates an informer to check whether all pods are running.
|
||||||
|
func newInformerWatchPod(f *framework.Framework, mutex *sync.Mutex, watchTimes map[string]metav1.Time, podType string) cache.Controller {
|
||||||
|
ns := f.Namespace.Name
|
||||||
|
checkPodRunning := func(p *v1.Pod) {
|
||||||
|
mutex.Lock()
|
||||||
|
defer mutex.Unlock()
|
||||||
|
defer GinkgoRecover()
|
||||||
|
|
||||||
|
if p.Status.Phase == v1.PodRunning {
|
||||||
|
if _, found := watchTimes[p.Name]; !found {
|
||||||
|
watchTimes[p.Name] = metav1.Now()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_, controller := cache.NewInformer(
|
||||||
|
&cache.ListWatch{
|
||||||
|
ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
|
||||||
|
options.LabelSelector = labels.SelectorFromSet(labels.Set{"type": podType}).String()
|
||||||
|
obj, err := f.ClientSet.CoreV1().Pods(ns).List(options)
|
||||||
|
return runtime.Object(obj), err
|
||||||
|
},
|
||||||
|
WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
|
||||||
|
options.LabelSelector = labels.SelectorFromSet(labels.Set{"type": podType}).String()
|
||||||
|
return f.ClientSet.CoreV1().Pods(ns).Watch(options)
|
||||||
|
},
|
||||||
|
},
|
||||||
|
&v1.Pod{},
|
||||||
|
0,
|
||||||
|
cache.ResourceEventHandlerFuncs{
|
||||||
|
AddFunc: func(obj interface{}) {
|
||||||
|
p, ok := obj.(*v1.Pod)
|
||||||
|
Expect(ok).To(Equal(true))
|
||||||
|
go checkPodRunning(p)
|
||||||
|
},
|
||||||
|
UpdateFunc: func(oldObj, newObj interface{}) {
|
||||||
|
p, ok := newObj.(*v1.Pod)
|
||||||
|
Expect(ok).To(Equal(true))
|
||||||
|
go checkPodRunning(p)
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
|
return controller
|
||||||
|
}
|
||||||
|
|
||||||
|
// newTestPods creates a list of pods (specification) for test.
|
||||||
|
func newTestPods(numPods int, volume bool, imageName, podType string) []*v1.Pod {
|
||||||
|
var pods []*v1.Pod
|
||||||
|
for i := 0; i < numPods; i++ {
|
||||||
|
podName := "test-" + string(uuid.NewUUID())
|
||||||
|
labels := map[string]string{
|
||||||
|
"type": podType,
|
||||||
|
"name": podName,
|
||||||
|
}
|
||||||
|
if volume {
|
||||||
|
pods = append(pods,
|
||||||
|
&v1.Pod{
|
||||||
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
|
Name: podName,
|
||||||
|
Labels: labels,
|
||||||
|
},
|
||||||
|
Spec: v1.PodSpec{
|
||||||
|
// Restart policy is always (default).
|
||||||
|
Containers: []v1.Container{
|
||||||
|
{
|
||||||
|
Image: imageName,
|
||||||
|
Name: podName,
|
||||||
|
VolumeMounts: []v1.VolumeMount{
|
||||||
|
{MountPath: "/test-volume-mnt", Name: podName + "-volume"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
NodeSelector: map[string]string{
|
||||||
|
"beta.kubernetes.io/os": "windows",
|
||||||
|
},
|
||||||
|
Volumes: []v1.Volume{
|
||||||
|
{Name: podName + "-volume", VolumeSource: v1.VolumeSource{EmptyDir: &v1.EmptyDirVolumeSource{}}},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
pods = append(pods,
|
||||||
|
&v1.Pod{
|
||||||
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
|
Name: podName,
|
||||||
|
Labels: labels,
|
||||||
|
},
|
||||||
|
Spec: v1.PodSpec{
|
||||||
|
// Restart policy is always (default).
|
||||||
|
Containers: []v1.Container{
|
||||||
|
{
|
||||||
|
Image: imageName,
|
||||||
|
Name: podName,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
NodeSelector: map[string]string{
|
||||||
|
"beta.kubernetes.io/os": "windows",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
return pods
|
||||||
|
}
|
||||||
|
|
||||||
|
// deletePodsSync deletes a list of pods and block until pods disappear.
|
||||||
|
func deletePodsSync(f *framework.Framework, pods []*v1.Pod) {
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for _, pod := range pods {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(pod *v1.Pod) {
|
||||||
|
defer GinkgoRecover()
|
||||||
|
defer wg.Done()
|
||||||
|
|
||||||
|
err := f.PodClient().Delete(pod.ObjectMeta.Name, metav1.NewDeleteOptions(30))
|
||||||
|
Expect(err).NotTo(HaveOccurred())
|
||||||
|
|
||||||
|
Expect(framework.WaitForPodToDisappear(f.ClientSet, f.Namespace.Name, pod.ObjectMeta.Name, labels.Everything(),
|
||||||
|
30*time.Second, 10*time.Minute)).NotTo(HaveOccurred())
|
||||||
|
}(pod)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
return
|
||||||
|
}
|
23
test/e2e/windows/framework.go
Normal file
23
test/e2e/windows/framework.go
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2018 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package windows
|
||||||
|
|
||||||
|
import "github.com/onsi/ginkgo"
|
||||||
|
|
||||||
|
func SIGDescribe(text string, body func()) bool {
|
||||||
|
return ginkgo.Describe("[sig-windows] "+text, body)
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user