kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1143 from kgolab/kg-vpa-godeps2 

Fix e2e tests
This commit is contained in:
Beata Skiba 2018-08-14 11:22:24 +02:00 committed by GitHub
parent 8055c4a2b4 094737c77f
commit b3479c0001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 10111 additions and 1669 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3306
vertical-pod-autoscaler/Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

6
vertical-pod-autoscaler/e2e/actuation.go
View File

@ -20,8 +20,8 @@ import (
"fmt" "fmt"
"time" "time"
appsv1 "k8s.io/api/apps/v1"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/poc.autoscaling.k8s.io/v1alpha1" vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/poc.autoscaling.k8s.io/v1alpha1"
@ -46,7 +46,7 @@ var _ = actuationSuiteE2eDescribe("Actuation", func() {
memoryQuantity := parseQuantityOrDie("100Mi") memoryQuantity := parseQuantityOrDie("100Mi")
d := newHamsterDeploymentWithResources(f, cpuQuantity, memoryQuantity) d := newHamsterDeploymentWithResources(f, cpuQuantity, memoryQuantity)
d, err := c.ExtensionsV1beta1().Deployments(ns).Create(d) d, err := c.AppsV1().Deployments(ns).Create(d)
gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
err = framework.WaitForDeploymentComplete(c, d) err = framework.WaitForDeploymentComplete(c, d)
gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
@ -88,7 +88,7 @@ var _ = actuationSuiteE2eDescribe("Actuation", func() {
}) })
// assertPodsPendingForDuration checks that at most pendingPodsNum pods are pending for pendingDuration // assertPodsPendingForDuration checks that at most pendingPodsNum pods are pending for pendingDuration
func assertPodsPendingForDuration(c clientset.Interface, deployment *extensions.Deployment, pendingPodsNum int, pendingDuration time.Duration) error { func assertPodsPendingForDuration(c clientset.Interface, deployment *appsv1.Deployment, pendingPodsNum int, pendingDuration time.Duration) error {
pendingPods := make(map[string]time.Time) pendingPods := make(map[string]time.Time)

6
vertical-pod-autoscaler/e2e/admission_controller.go
View File

@ -17,8 +17,8 @@ limitations under the License.
package autoscaling package autoscaling
import ( import (
appsv1 "k8s.io/api/apps/v1"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/poc.autoscaling.k8s.io/v1alpha1" vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/poc.autoscaling.k8s.io/v1alpha1"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
@ -210,9 +210,9 @@ var _ = admissionControllerE2eDescribe("Admission-controller", func() {
}) })
func startDeploymentPods(f *framework.Framework, deployment *extensions.Deployment) *apiv1.PodList { func startDeploymentPods(f *framework.Framework, deployment *appsv1.Deployment) *apiv1.PodList {
c, ns := f.ClientSet, f.Namespace.Name c, ns := f.ClientSet, f.Namespace.Name
deployment, err := c.ExtensionsV1beta1().Deployments(ns).Create(deployment) deployment, err := c.AppsV1().Deployments(ns).Create(deployment)
gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
err = framework.WaitForDeploymentComplete(c, deployment) err = framework.WaitForDeploymentComplete(c, deployment)
gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())

4
vertical-pod-autoscaler/e2e/autoscaling_utils.go
View File

@ -412,9 +412,9 @@ func (rc *ResourceConsumer) CleanUp() {
// Wait some time to ensure all child goroutines are finished. // Wait some time to ensure all child goroutines are finished.
time.Sleep(10 * time.Second) time.Sleep(10 * time.Second)
kind := rc.kind.GroupKind() kind := rc.kind.GroupKind()
framework.ExpectNoError(framework.DeleteResourceAndPods(rc.clientSet, rc.internalClientset, kind, rc.nsName, rc.name)) framework.ExpectNoError(framework.DeleteResourceAndWaitForGC(rc.clientSet, kind, rc.nsName, rc.name))
framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(rc.name, nil)) framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(rc.name, nil))
framework.ExpectNoError(framework.DeleteResourceAndPods(rc.clientSet, rc.internalClientset, api.Kind("ReplicationController"), rc.nsName, rc.controllerName)) framework.ExpectNoError(framework.DeleteResourceAndWaitForGC(rc.clientSet, api.Kind("ReplicationController"), rc.nsName, rc.controllerName))
framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(rc.controllerName, nil)) framework.ExpectNoError(rc.clientSet.CoreV1().Services(rc.nsName).Delete(rc.controllerName, nil))
} }

8
vertical-pod-autoscaler/e2e/common.go
View File

@ -22,8 +22,8 @@ import (
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"github.com/onsi/gomega" "github.com/onsi/gomega"
appsv1 "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/poc.autoscaling.k8s.io/v1alpha1" vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/poc.autoscaling.k8s.io/v1alpha1"
@ -65,15 +65,15 @@ func actuationSuiteE2eDescribe(name string, body func()) bool {
return e2eDescribe(actuationSuite, name, body) return e2eDescribe(actuationSuite, name, body)
} }
func newHamsterDeployment(f *framework.Framework) *extensions.Deployment { func newHamsterDeployment(f *framework.Framework) *appsv1.Deployment {
d := framework.NewDeployment("hamster-deployment", 3, map[string]string{"app": "hamster"}, "hamster", "k8s.gcr.io/ubuntu-slim:0.1", extensions.RollingUpdateDeploymentStrategyType) d := framework.NewDeployment("hamster-deployment", 3, map[string]string{"app": "hamster"}, "hamster", "k8s.gcr.io/ubuntu-slim:0.1", appsv1.RollingUpdateDeploymentStrategyType)
d.ObjectMeta.Namespace = f.Namespace.Name d.ObjectMeta.Namespace = f.Namespace.Name
d.Spec.Template.Spec.Containers[0].Command = []string{"/bin/sh"} d.Spec.Template.Spec.Containers[0].Command = []string{"/bin/sh"}
d.Spec.Template.Spec.Containers[0].Args = []string{"-c", "/usr/bin/yes >/dev/null"} d.Spec.Template.Spec.Containers[0].Args = []string{"-c", "/usr/bin/yes >/dev/null"}
return d return d
} }
func newHamsterDeploymentWithResources(f *framework.Framework, cpuQuantity, memoryQuantity resource.Quantity) *extensions.Deployment { func newHamsterDeploymentWithResources(f *framework.Framework, cpuQuantity, memoryQuantity resource.Quantity) *appsv1.Deployment {
d := newHamsterDeployment(f) d := newHamsterDeployment(f)
d.Spec.Template.Spec.Containers[0].Resources.Requests = v1.ResourceList{ d.Spec.Template.Spec.Containers[0].Resources.Requests = v1.ResourceList{
v1.ResourceCPU: cpuQuantity, v1.ResourceCPU: cpuQuantity,

2
vertical-pod-autoscaler/e2e/recommender.go
View File

@ -162,7 +162,7 @@ var _ = recommenderE2eDescribe("VPA CRD object", func() {
memoryQuantity := parseQuantityOrDie("100Mi") memoryQuantity := parseQuantityOrDie("100Mi")
d := newHamsterDeploymentWithResources(f, cpuQuantity, memoryQuantity) d := newHamsterDeploymentWithResources(f, cpuQuantity, memoryQuantity)
_, err := c.ExtensionsV1beta1().Deployments(ns).Create(d) _, err := c.AppsV1().Deployments(ns).Create(d)
gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
err = framework.WaitForDeploymentComplete(c, d) err = framework.WaitForDeploymentComplete(c, d)
gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())

6
vertical-pod-autoscaler/e2e/updater.go
View File

@ -20,8 +20,8 @@ import (
"fmt" "fmt"
"reflect" "reflect"
appsv1 "k8s.io/api/apps/v1"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
@ -47,7 +47,7 @@ var _ = updaterE2eDescribe("Updater", func() {
memoryQuantity := parseQuantityOrDie("100Mi") memoryQuantity := parseQuantityOrDie("100Mi")
d := newHamsterDeploymentWithResources(f, cpuQuantity, memoryQuantity) d := newHamsterDeploymentWithResources(f, cpuQuantity, memoryQuantity)
d, err := c.ExtensionsV1beta1().Deployments(ns).Create(d) d, err := c.AppsV1().Deployments(ns).Create(d)
gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
err = framework.WaitForDeploymentComplete(c, d) err = framework.WaitForDeploymentComplete(c, d)
gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(err).NotTo(gomega.HaveOccurred())
@ -100,7 +100,7 @@ func makePodSet(pods *apiv1.PodList) map[string]bool {
return result return result
} }
func waitForPodSetChangedInDeployment(c clientset.Interface, deployment *extensions.Deployment, podList *apiv1.PodList) error { func waitForPodSetChangedInDeployment(c clientset.Interface, deployment *appsv1.Deployment, podList *apiv1.PodList) error {
initialPodSet := makePodSet(podList) initialPodSet := makePodSet(podList)
err := wait.PollImmediate(pollInterval, pollTimeout, func() (bool, error) { err := wait.PollImmediate(pollInterval, pollTimeout, func() (bool, error) {

8442
vertical-pod-autoscaler/vendor/k8s.io/kubernetes/test/e2e/generated/bindata.go generated vendored Normal file
View File

File diff suppressed because one or more lines are too long