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

Rewrite disruption e2e test to use versioned client.

Browse Source
This commit is contained in:
Matt Liggett 2016-08-26 14:44:59 -07:00
parent 1919fe3a59
commit 44b2c862ef
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/update-codegen.sh
View File

@ -39,7 +39,7 @@ setgen=$(kube::util::find-binary "set-gen")
# update- and verify- scripts. # update- and verify- scripts.
${clientgen} "$@" ${clientgen} "$@"
${clientgen} -t "$@" ${clientgen} -t "$@"
${clientgen} --clientset-name="release_1_4" --input="api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1" ${clientgen} --clientset-name="release_1_4" --input="api/v1,authorization/v1beta1,autoscaling/v1,batch/v1,extensions/v1beta1,policy/v1alpha1"
# Clientgen for federation clientset. # Clientgen for federation clientset.
${clientgen} --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/","api/","extensions/" --included-types-overrides="api/Service,api/Namespace,extensions/ReplicaSet,api/Secret,extensions/Ingress,api/Event" "$@" ${clientgen} --clientset-name=federation_internalclientset --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/","api/","extensions/" --included-types-overrides="api/Service,api/Namespace,extensions/ReplicaSet,api/Secret,extensions/Ingress,api/Event" "$@"
${clientgen} --clientset-name=federation_release_1_4 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1beta1","api/v1","extensions/v1beta1" --included-types-overrides="api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event" "$@" ${clientgen} --clientset-name=federation_release_1_4 --clientset-path=k8s.io/kubernetes/federation/client/clientset_generated --input="../../federation/apis/federation/v1beta1","api/v1","extensions/v1beta1" --included-types-overrides="api/v1/Service,api/v1/Namespace,extensions/v1beta1/ReplicaSet,api/v1/Secret,extensions/v1beta1/Ingress,api/v1/Event" "$@"

1
pkg/apis/policy/v1alpha1/types.go
View File

@ -50,7 +50,6 @@ type PodDisruptionBudgetStatus struct {
} }
// +genclient=true // +genclient=true
// +noMethods=true
// PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods
type PodDisruptionBudget struct { type PodDisruptionBudget struct {

1
pkg/client/clientset_generated/release_1_4/import_known_versions.go
View File

@ -26,6 +26,7 @@ import (
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install" _ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
_ "k8s.io/kubernetes/pkg/apis/batch/install" _ "k8s.io/kubernetes/pkg/apis/batch/install"
_ "k8s.io/kubernetes/pkg/apis/extensions/install" _ "k8s.io/kubernetes/pkg/apis/extensions/install"
_ "k8s.io/kubernetes/pkg/apis/policy/install"
) )
func init() { func init() {

22
test/e2e/disruption.go
View File

@ -22,11 +22,11 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"k8s.io/kubernetes/pkg/api" release_1_4 "k8s.io/client-go/1.4/kubernetes"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/client-go/1.4/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/apis/policy" api "k8s.io/client-go/1.4/pkg/api/v1"
client "k8s.io/kubernetes/pkg/client/unversioned" policy "k8s.io/client-go/1.4/pkg/apis/policy/v1alpha1"
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/client-go/1.4/pkg/util/intstr"
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
) )
@ -34,10 +34,10 @@ import (
var _ = framework.KubeDescribe("DisruptionController [Feature:PodDisruptionbudget]", func() { var _ = framework.KubeDescribe("DisruptionController [Feature:PodDisruptionbudget]", func() {
f := framework.NewDefaultFramework("disruption") f := framework.NewDefaultFramework("disruption")
var ns string var ns string
var c *client.Client var cs *release_1_4.Clientset
BeforeEach(func() { BeforeEach(func() {
c = f.Client cs = f.StagingClient
ns = f.Namespace.Name ns = f.Namespace.Name
}) })
@ -52,7 +52,7 @@ var _ = framework.KubeDescribe("DisruptionController [Feature:PodDisruptionbudge
MinAvailable: intstr.FromString("1%"), MinAvailable: intstr.FromString("1%"),
}, },
} }
_, err := c.Policy().PodDisruptionBudgets(ns).Create(&pdb) _, err := cs.Policy().PodDisruptionBudgets(ns).Create(&pdb)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })
@ -67,7 +67,7 @@ var _ = framework.KubeDescribe("DisruptionController [Feature:PodDisruptionbudge
MinAvailable: intstr.FromInt(2), MinAvailable: intstr.FromInt(2),
}, },
} }
_, err := c.Policy().PodDisruptionBudgets(ns).Create(&pdb) _, err := cs.Policy().PodDisruptionBudgets(ns).Create(&pdb)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
pod := &api.Pod{ pod := &api.Pod{
@ -87,11 +87,11 @@ var _ = framework.KubeDescribe("DisruptionController [Feature:PodDisruptionbudge
}, },
} }
_, err := c.Pods(ns).Create(pod) _, err := cs.Pods(ns).Create(pod)
framework.ExpectNoError(err, "Creating pod %q in namespace %q", pod.Name, ns) framework.ExpectNoError(err, "Creating pod %q in namespace %q", pod.Name, ns)
} }
err = wait.PollImmediate(framework.Poll, 60*time.Second, func() (bool, error) { err = wait.PollImmediate(framework.Poll, 60*time.Second, func() (bool, error) {
pdb, err := c.Policy().PodDisruptionBudgets(ns).Get("foo") pdb, err := cs.Policy().PodDisruptionBudgets(ns).Get("foo")
if err != nil { if err != nil {
return false, err return false, err
} }