diff --git a/test/e2e/framework/statefulset_utils.go b/test/e2e/framework/statefulset_utils.go index dcc37da3146..25357d03b45 100644 --- a/test/e2e/framework/statefulset_utils.go +++ b/test/e2e/framework/statefulset_utils.go @@ -79,7 +79,7 @@ func NewStatefulSetTester(c clientset.Interface) *StatefulSetTester { // GetStatefulSet gets the StatefulSet named name in namespace. func (s *StatefulSetTester) GetStatefulSet(namespace, name string) *apps.StatefulSet { - ss, err := s.c.Apps().StatefulSets(namespace).Get(name, metav1.GetOptions{}) + ss, err := s.c.AppsV1beta1().StatefulSets(namespace).Get(name, metav1.GetOptions{}) if err != nil { Failf("Failed to get StatefulSet %s/%s: %v", namespace, name, err) } @@ -234,12 +234,12 @@ func (s *StatefulSetTester) Restart(ss *apps.StatefulSet) { func (s *StatefulSetTester) update(ns, name string, update func(ss *apps.StatefulSet)) { for i := 0; i < 3; i++ { - ss, err := s.c.Apps().StatefulSets(ns).Get(name, metav1.GetOptions{}) + ss, err := s.c.AppsV1beta1().StatefulSets(ns).Get(name, metav1.GetOptions{}) if err != nil { Failf("failed to get statefulset %q: %v", name, err) } update(ss) - ss, err = s.c.Apps().StatefulSets(ns).Update(ss) + ss, err = s.c.AppsV1beta1().StatefulSets(ns).Update(ss) if err == nil { return } @@ -312,7 +312,7 @@ func (s *StatefulSetTester) waitForRunning(numStatefulPods int32, ss *apps.State func (s *StatefulSetTester) WaitForState(ss *apps.StatefulSet, until func(*apps.StatefulSet, *v1.PodList) (bool, error)) { pollErr := wait.PollImmediate(StatefulSetPoll, StatefulSetTimeout, func() (bool, error) { - ssGet, err := s.c.Apps().StatefulSets(ss.Namespace).Get(ss.Name, metav1.GetOptions{}) + ssGet, err := s.c.AppsV1beta1().StatefulSets(ss.Namespace).Get(ss.Name, metav1.GetOptions{}) if err != nil { return false, err } @@ -550,7 +550,7 @@ func (s *StatefulSetTester) WaitForStatusReadyReplicas(ss *apps.StatefulSet, exp ns, name := ss.Namespace, ss.Name pollErr := wait.PollImmediate(StatefulSetPoll, StatefulSetTimeout, func() (bool, error) { - ssGet, err := s.c.Apps().StatefulSets(ns).Get(name, metav1.GetOptions{}) + ssGet, err := s.c.AppsV1beta1().StatefulSets(ns).Get(name, metav1.GetOptions{}) if err != nil { return false, err } @@ -575,7 +575,7 @@ func (s *StatefulSetTester) WaitForStatusReplicas(ss *apps.StatefulSet, expected ns, name := ss.Namespace, ss.Name pollErr := wait.PollImmediate(StatefulSetPoll, StatefulSetTimeout, func() (bool, error) { - ssGet, err := s.c.Apps().StatefulSets(ns).Get(name, metav1.GetOptions{}) + ssGet, err := s.c.AppsV1beta1().StatefulSets(ns).Get(name, metav1.GetOptions{}) if err != nil { return false, err } @@ -613,7 +613,7 @@ func (s *StatefulSetTester) SortStatefulPods(pods *v1.PodList) { // DeleteAllStatefulSets deletes all StatefulSet API Objects in Namespace ns. func DeleteAllStatefulSets(c clientset.Interface, ns string) { sst := &StatefulSetTester{c: c} - ssList, err := c.Apps().StatefulSets(ns).List(metav1.ListOptions{LabelSelector: labels.Everything().String()}) + ssList, err := c.AppsV1beta1().StatefulSets(ns).List(metav1.ListOptions{LabelSelector: labels.Everything().String()}) ExpectNoError(err) // Scale down each statefulset, then delete it completely. @@ -628,7 +628,7 @@ func DeleteAllStatefulSets(c clientset.Interface, ns string) { Logf("Deleting statefulset %v", ss.Name) // Use OrphanDependents=false so it's deleted synchronously. // We already made sure the Pods are gone inside Scale(). - if err := c.Apps().StatefulSets(ss.Namespace).Delete(ss.Name, &metav1.DeleteOptions{OrphanDependents: new(bool)}); err != nil { + if err := c.AppsV1beta1().StatefulSets(ss.Namespace).Delete(ss.Name, &metav1.DeleteOptions{OrphanDependents: new(bool)}); err != nil { errList = append(errList, fmt.Sprintf("%v", err)) } } @@ -812,7 +812,7 @@ func (sp statefulPodsByOrdinal) Less(i, j int) bool { type updateStatefulSetFunc func(*apps.StatefulSet) func UpdateStatefulSetWithRetries(c clientset.Interface, namespace, name string, applyUpdate updateStatefulSetFunc) (statefulSet *apps.StatefulSet, err error) { - statefulSets := c.Apps().StatefulSets(namespace) + statefulSets := c.AppsV1beta1().StatefulSets(namespace) var updateErr error pollErr := wait.Poll(10*time.Millisecond, 1*time.Minute, func() (bool, error) { if statefulSet, err = statefulSets.Get(name, metav1.GetOptions{}); err != nil { diff --git a/test/e2e/instrumentation/monitoring/influxdb.go b/test/e2e/instrumentation/monitoring/influxdb.go index 1b663163b80..348dde9d6ca 100644 --- a/test/e2e/instrumentation/monitoring/influxdb.go +++ b/test/e2e/instrumentation/monitoring/influxdb.go @@ -142,7 +142,7 @@ func verifyExpectedRcsExistAndGetExpectedPods(c clientset.Interface) ([]string, if err != nil { return nil, err } - psList, err := c.Apps().StatefulSets(metav1.NamespaceSystem).List(options) + psList, err := c.AppsV1beta1().StatefulSets(metav1.NamespaceSystem).List(options) if err != nil { return nil, err } diff --git a/test/e2e/network_partition.go b/test/e2e/network_partition.go index f2fac73f375..30f3b5f2514 100644 --- a/test/e2e/network_partition.go +++ b/test/e2e/network_partition.go @@ -369,7 +369,7 @@ var _ = framework.KubeDescribe("[sig-apps] Network Partition [Disruptive] [Slow] petMounts := []v1.VolumeMount{{Name: "datadir", MountPath: "/data/"}} podMounts := []v1.VolumeMount{{Name: "home", MountPath: "/home"}} ps := framework.NewStatefulSet(psName, ns, headlessSvcName, 3, petMounts, podMounts, labels) - _, err := c.Apps().StatefulSets(ns).Create(ps) + _, err := c.AppsV1beta1().StatefulSets(ns).Create(ps) Expect(err).NotTo(HaveOccurred()) pst := framework.NewStatefulSetTester(c) @@ -385,7 +385,7 @@ var _ = framework.KubeDescribe("[sig-apps] Network Partition [Disruptive] [Slow] It("should not reschedule stateful pods if there is a network partition [Slow] [Disruptive]", func() { ps := framework.NewStatefulSet(psName, ns, headlessSvcName, 3, []v1.VolumeMount{}, []v1.VolumeMount{}, labels) - _, err := c.Apps().StatefulSets(ns).Create(ps) + _, err := c.AppsV1beta1().StatefulSets(ns).Create(ps) Expect(err).NotTo(HaveOccurred()) pst := framework.NewStatefulSetTester(c) diff --git a/test/e2e/upgrades/apps/statefulset.go b/test/e2e/upgrades/apps/statefulset.go index 4fa3133f108..59c893f415a 100644 --- a/test/e2e/upgrades/apps/statefulset.go +++ b/test/e2e/upgrades/apps/statefulset.go @@ -71,7 +71,7 @@ func (t *StatefulSetUpgradeTest) Setup(f *framework.Framework) { By("Creating statefulset " + ssName + " in namespace " + ns) *(t.set.Spec.Replicas) = 3 - _, err = f.ClientSet.Apps().StatefulSets(ns).Create(t.set) + _, err = f.ClientSet.AppsV1beta1().StatefulSets(ns).Create(t.set) Expect(err).NotTo(HaveOccurred()) By("Saturating stateful set " + t.set.Name) diff --git a/test/e2e/workload/daemon_set.go b/test/e2e/workload/daemon_set.go index a0bb3638ddc..38c278eebac 100644 --- a/test/e2e/workload/daemon_set.go +++ b/test/e2e/workload/daemon_set.go @@ -870,7 +870,7 @@ func checkDaemonSetPodsLabels(podList *v1.PodList, hash, templateGeneration stri func listDaemonHistories(c clientset.Interface, ns string, label map[string]string) *apps.ControllerRevisionList { selector := labels.Set(label).AsSelector() options := metav1.ListOptions{LabelSelector: selector.String()} - historyList, err := c.Apps().ControllerRevisions(ns).List(options) + historyList, err := c.AppsV1beta1().ControllerRevisions(ns).List(options) Expect(err).NotTo(HaveOccurred()) Expect(len(historyList.Items)).To(BeNumerically(">", 0)) return historyList diff --git a/test/e2e/workload/statefulset.go b/test/e2e/workload/statefulset.go index 2c18abb89f3..4a5755a7627 100644 --- a/test/e2e/workload/statefulset.go +++ b/test/e2e/workload/statefulset.go @@ -94,7 +94,7 @@ var _ = SIGDescribe("StatefulSet", func() { *(ss.Spec.Replicas) = 3 framework.SetStatefulSetInitializedAnnotation(ss, "false") - _, err := c.Apps().StatefulSets(ns).Create(ss) + _, err := c.AppsV1beta1().StatefulSets(ns).Create(ss) Expect(err).NotTo(HaveOccurred()) sst := framework.NewStatefulSetTester(c) @@ -135,7 +135,7 @@ var _ = SIGDescribe("StatefulSet", func() { // Replace ss with the one returned from Create() so it has the UID. // Save Kind since it won't be populated in the returned ss. kind := ss.Kind - ss, err := c.Apps().StatefulSets(ns).Create(ss) + ss, err := c.AppsV1beta1().StatefulSets(ns).Create(ss) Expect(err).NotTo(HaveOccurred()) ss.Kind = kind @@ -216,7 +216,7 @@ var _ = SIGDescribe("StatefulSet", func() { *(ss.Spec.Replicas) = 2 framework.SetStatefulSetInitializedAnnotation(ss, "false") - _, err := c.Apps().StatefulSets(ns).Create(ss) + _, err := c.AppsV1beta1().StatefulSets(ns).Create(ss) Expect(err).NotTo(HaveOccurred()) sst := framework.NewStatefulSetTester(c) @@ -253,7 +253,7 @@ var _ = SIGDescribe("StatefulSet", func() { Port: intstr.IntOrString{IntVal: 80}}}} ss := framework.NewStatefulSet("ss2", ns, headlessSvcName, 3, nil, nil, labels) ss.Spec.Template.Spec.Containers[0].ReadinessProbe = testProbe - ss, err := c.Apps().StatefulSets(ns).Create(ss) + ss, err := c.AppsV1beta1().StatefulSets(ns).Create(ss) Expect(err).NotTo(HaveOccurred()) sst := framework.NewStatefulSetTester(c) sst.WaitForRunningAndReady(*ss.Spec.Replicas, ss) @@ -381,7 +381,7 @@ var _ = SIGDescribe("StatefulSet", func() { }()} }(), } - ss, err := c.Apps().StatefulSets(ns).Create(ss) + ss, err := c.AppsV1beta1().StatefulSets(ns).Create(ss) Expect(err).NotTo(HaveOccurred()) sst := framework.NewStatefulSetTester(c) sst.WaitForRunningAndReady(*ss.Spec.Replicas, ss) @@ -586,7 +586,7 @@ var _ = SIGDescribe("StatefulSet", func() { ss.Spec.UpdateStrategy = apps.StatefulSetUpdateStrategy{ Type: apps.OnDeleteStatefulSetStrategyType, } - ss, err := c.Apps().StatefulSets(ns).Create(ss) + ss, err := c.AppsV1beta1().StatefulSets(ns).Create(ss) Expect(err).NotTo(HaveOccurred()) sst := framework.NewStatefulSetTester(c) sst.WaitForRunningAndReady(*ss.Spec.Replicas, ss) @@ -673,7 +673,7 @@ var _ = SIGDescribe("StatefulSet", func() { Port: intstr.IntOrString{IntVal: 80}}}} ss := framework.NewStatefulSet(ssName, ns, headlessSvcName, 1, nil, nil, psLabels) ss.Spec.Template.Spec.Containers[0].ReadinessProbe = testProbe - ss, err = c.Apps().StatefulSets(ns).Create(ss) + ss, err = c.AppsV1beta1().StatefulSets(ns).Create(ss) Expect(err).NotTo(HaveOccurred()) By("Waiting until all stateful set " + ssName + " replicas will be running in namespace " + ns) @@ -748,7 +748,7 @@ var _ = SIGDescribe("StatefulSet", func() { ss := framework.NewStatefulSet(ssName, ns, headlessSvcName, 1, nil, nil, psLabels) ss.Spec.PodManagementPolicy = apps.ParallelPodManagement ss.Spec.Template.Spec.Containers[0].ReadinessProbe = testProbe - ss, err := c.Apps().StatefulSets(ns).Create(ss) + ss, err := c.AppsV1beta1().StatefulSets(ns).Create(ss) Expect(err).NotTo(HaveOccurred()) By("Waiting until all stateful set " + ssName + " replicas will be running in namespace " + ns) @@ -811,7 +811,7 @@ var _ = SIGDescribe("StatefulSet", func() { statefulPodContainer := &ss.Spec.Template.Spec.Containers[0] statefulPodContainer.Ports = append(statefulPodContainer.Ports, conflictingPort) ss.Spec.Template.Spec.NodeName = node.Name - _, err = f.ClientSet.Apps().StatefulSets(f.Namespace.Name).Create(ss) + _, err = f.ClientSet.AppsV1beta1().StatefulSets(f.Namespace.Name).Create(ss) framework.ExpectNoError(err) By("Waiting until pod " + podName + " will start running in namespace " + f.Namespace.Name)