From f100a762bc5ba5648ecb4e2568b14b22cdbc5e5b Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 29 Jan 2019 09:57:12 -0500 Subject: [PATCH] Stop using apps/v1beta1 in tests --- pkg/controller/controller_utils.go | 2 +- pkg/controller/daemon/update.go | 4 ++-- pkg/controller/daemon/util/BUILD | 1 - .../daemon/util/daemonset_util_test.go | 3 +-- test/e2e/apps/daemon_set.go | 2 +- test/e2e/apps/statefulset.go | 8 ++++---- test/integration/master/BUILD | 1 - .../integration/master/kube_apiserver_test.go | 14 +++++++------ test/integration/scale/BUILD | 2 +- test/integration/scale/scale_test.go | 20 +++++++++---------- 10 files changed, 28 insertions(+), 29 deletions(-) diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 06624341021..f0419b7aa09 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -432,7 +432,7 @@ type RealControllerRevisionControl struct { var _ ControllerRevisionControlInterface = &RealControllerRevisionControl{} func (r RealControllerRevisionControl) PatchControllerRevision(namespace, name string, data []byte) error { - _, err := r.KubeClient.AppsV1beta1().ControllerRevisions(namespace).Patch(name, types.StrategicMergePatchType, data) + _, err := r.KubeClient.AppsV1().ControllerRevisions(namespace).Patch(name, types.StrategicMergePatchType, data) return err } diff --git a/pkg/controller/daemon/update.go b/pkg/controller/daemon/update.go index 600e430ceb5..6f1967d6e31 100644 --- a/pkg/controller/daemon/update.go +++ b/pkg/controller/daemon/update.go @@ -178,7 +178,7 @@ func (dsc *DaemonSetsController) cleanupHistory(ds *apps.DaemonSet, old []*apps. continue } // Clean up - err := dsc.kubeClient.AppsV1beta1().ControllerRevisions(ds.Namespace).Delete(history.Name, nil) + err := dsc.kubeClient.AppsV1().ControllerRevisions(ds.Namespace).Delete(history.Name, nil) if err != nil { return err } @@ -234,7 +234,7 @@ func (dsc *DaemonSetsController) dedupCurHistories(ds *apps.DaemonSet, curHistor } } // Remove duplicates - err = dsc.kubeClient.AppsV1beta1().ControllerRevisions(ds.Namespace).Delete(cur.Name, nil) + err = dsc.kubeClient.AppsV1().ControllerRevisions(ds.Namespace).Delete(cur.Name, nil) if err != nil { return nil, err } diff --git a/pkg/controller/daemon/util/BUILD b/pkg/controller/daemon/util/BUILD index 650f26f94b7..5d703265edb 100644 --- a/pkg/controller/daemon/util/BUILD +++ b/pkg/controller/daemon/util/BUILD @@ -39,7 +39,6 @@ go_test( srcs = ["daemonset_util_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/api/testapi:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/scheduler/api:go_default_library", diff --git a/pkg/controller/daemon/util/daemonset_util_test.go b/pkg/controller/daemon/util/daemonset_util_test.go index be0e45f04a8..1ed864849c5 100644 --- a/pkg/controller/daemon/util/daemonset_util_test.go +++ b/pkg/controller/daemon/util/daemonset_util_test.go @@ -26,7 +26,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing" - "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" @@ -34,7 +33,7 @@ import ( func newPod(podName string, nodeName string, label map[string]string) *v1.Pod { pod := &v1.Pod{ - TypeMeta: metav1.TypeMeta{APIVersion: testapi.Extensions.GroupVersion().String()}, + TypeMeta: metav1.TypeMeta{APIVersion: "v1"}, ObjectMeta: metav1.ObjectMeta{ Labels: label, Namespace: metav1.NamespaceDefault, diff --git a/test/e2e/apps/daemon_set.go b/test/e2e/apps/daemon_set.go index 174d236cfbc..0bf968061fb 100644 --- a/test/e2e/apps/daemon_set.go +++ b/test/e2e/apps/daemon_set.go @@ -719,7 +719,7 @@ func waitForHistoryCreated(c clientset.Interface, ns string, label map[string]st listHistoryFn := func() (bool, error) { selector := labels.Set(label).AsSelector() options := metav1.ListOptions{LabelSelector: selector.String()} - historyList, err := c.AppsV1beta1().ControllerRevisions(ns).List(options) + historyList, err := c.AppsV1().ControllerRevisions(ns).List(options) if err != nil { return false, err } diff --git a/test/e2e/apps/statefulset.go b/test/e2e/apps/statefulset.go index a3428985611..b35b9dc7736 100644 --- a/test/e2e/apps/statefulset.go +++ b/test/e2e/apps/statefulset.go @@ -789,7 +789,7 @@ var _ = SIGDescribe("StatefulSet", func() { ss := framework.NewStatefulSet(ssName, ns, headlessSvcName, 1, nil, nil, labels) sst := framework.NewStatefulSetTester(c) sst.SetHttpProbe(ss) - ss, err := c.AppsV1beta1().StatefulSets(ns).Create(ss) + ss, err := c.AppsV1().StatefulSets(ns).Create(ss) Expect(err).NotTo(HaveOccurred()) sst.WaitForRunningAndReady(*ss.Spec.Replicas, ss) ss = sst.WaitForStatus(ss) @@ -798,7 +798,7 @@ var _ = SIGDescribe("StatefulSet", func() { scale := framework.NewStatefulSetScale(ss) scaleResult := &appsv1beta2.Scale{} - err = c.AppsV1beta2().RESTClient().Get().AbsPath("/apis/apps/v1beta2").Namespace(ns).Resource("statefulsets").Name(ssName).SubResource("scale").Do().Into(scale) + err = c.AppsV1().RESTClient().Get().AbsPath("/apis/apps/v1").Namespace(ns).Resource("statefulsets").Name(ssName).SubResource("scale").Do().Into(scale) if err != nil { framework.Failf("Failed to get scale subresource: %v", err) } @@ -808,14 +808,14 @@ var _ = SIGDescribe("StatefulSet", func() { By("updating a scale subresource") scale.ResourceVersion = "" //unconditionally update to 2 replicas scale.Spec.Replicas = 2 - err = c.AppsV1beta2().RESTClient().Put().AbsPath("/apis/apps/v1beta2").Namespace(ns).Resource("statefulsets").Name(ssName).SubResource("scale").Body(scale).Do().Into(scaleResult) + err = c.AppsV1().RESTClient().Put().AbsPath("/apis/apps/v1").Namespace(ns).Resource("statefulsets").Name(ssName).SubResource("scale").Body(scale).Do().Into(scaleResult) if err != nil { framework.Failf("Failed to put scale subresource: %v", err) } Expect(scaleResult.Spec.Replicas).To(Equal(int32(2))) By("verifying the statefulset Spec.Replicas was modified") - ss, err = c.AppsV1beta1().StatefulSets(ns).Get(ssName, metav1.GetOptions{}) + ss, err = c.AppsV1().StatefulSets(ns).Get(ssName, metav1.GetOptions{}) if err != nil { framework.Failf("Failed to get statefulset resource: %v", err) } diff --git a/test/integration/master/BUILD b/test/integration/master/BUILD index f1d2c0f6259..b59ce9479a3 100644 --- a/test/integration/master/BUILD +++ b/test/integration/master/BUILD @@ -29,7 +29,6 @@ go_test( "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/master:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", - "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/networking/v1:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions:go_default_library", diff --git a/test/integration/master/kube_apiserver_test.go b/test/integration/master/kube_apiserver_test.go index 5b31317d93d..741b338575c 100644 --- a/test/integration/master/kube_apiserver_test.go +++ b/test/integration/master/kube_apiserver_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - appsv1beta1 "k8s.io/api/apps/v1beta1" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -49,20 +49,22 @@ func TestRun(t *testing.T) { // test whether the server is really healthy after /healthz told us so t.Logf("Creating Deployment directly after being healthy") var replicas int32 = 1 - _, err = client.AppsV1beta1().Deployments("default").Create(&appsv1beta1.Deployment{ + _, err = client.AppsV1().Deployments("default").Create(&appsv1.Deployment{ TypeMeta: metav1.TypeMeta{ Kind: "Deployment", - APIVersion: "apps/v1beta1", + APIVersion: "apps/v1", }, ObjectMeta: metav1.ObjectMeta{ Namespace: "default", Name: "test", + Labels: map[string]string{"foo": "bar"}, }, - Spec: appsv1beta1.DeploymentSpec{ + Spec: appsv1.DeploymentSpec{ Replicas: &replicas, - Strategy: appsv1beta1.DeploymentStrategy{ - Type: appsv1beta1.RollingUpdateDeploymentStrategyType, + Strategy: appsv1.DeploymentStrategy{ + Type: appsv1.RollingUpdateDeploymentStrategyType, }, + Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"foo": "bar"}}, Template: corev1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{"foo": "bar"}, diff --git a/test/integration/scale/BUILD b/test/integration/scale/BUILD index 4446b2bdc60..f58a8b494da 100644 --- a/test/integration/scale/BUILD +++ b/test/integration/scale/BUILD @@ -12,7 +12,7 @@ go_test( tags = ["integration"], deps = [ "//cmd/kube-apiserver/app/testing:go_default_library", - "//staging/src/k8s.io/api/apps/v1beta2:go_default_library", + "//staging/src/k8s.io/api/apps/v1:go_default_library", "//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/apis/meta/v1/unstructured:go_default_library", diff --git a/test/integration/scale/scale_test.go b/test/integration/scale/scale_test.go index 1b30bc950f6..a463ca8c539 100644 --- a/test/integration/scale/scale_test.go +++ b/test/integration/scale/scale_test.go @@ -25,7 +25,7 @@ import ( _ "github.com/coreos/etcd/etcdserver/api/v3rpc" // Force package logger init. "github.com/coreos/pkg/capnslog" - appsv1beta2 "k8s.io/api/apps/v1beta2" + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -141,13 +141,13 @@ func TestScaleSubresources(t *testing.T) { if _, err := clientSet.CoreV1().ReplicationControllers("default").Create(rcStub); err != nil { t.Fatal(err) } - if _, err := clientSet.AppsV1beta2().ReplicaSets("default").Create(rsStub); err != nil { + if _, err := clientSet.AppsV1().ReplicaSets("default").Create(rsStub); err != nil { t.Fatal(err) } - if _, err := clientSet.AppsV1beta2().Deployments("default").Create(deploymentStub); err != nil { + if _, err := clientSet.AppsV1().Deployments("default").Create(deploymentStub); err != nil { t.Fatal(err) } - if _, err := clientSet.AppsV1beta2().StatefulSets("default").Create(ssStub); err != nil { + if _, err := clientSet.AppsV1().StatefulSets("default").Create(ssStub); err != nil { t.Fatal(err) } @@ -203,19 +203,19 @@ var ( Spec: corev1.ReplicationControllerSpec{Selector: podStub.Labels, Replicas: &replicas, Template: &podStub}, } - rsStub = &appsv1beta2.ReplicaSet{ + rsStub = &appsv1.ReplicaSet{ ObjectMeta: metav1.ObjectMeta{Name: "test"}, - Spec: appsv1beta2.ReplicaSetSpec{Selector: &metav1.LabelSelector{MatchLabels: podStub.Labels}, Replicas: &replicas, Template: podStub}, + Spec: appsv1.ReplicaSetSpec{Selector: &metav1.LabelSelector{MatchLabels: podStub.Labels}, Replicas: &replicas, Template: podStub}, } - deploymentStub = &appsv1beta2.Deployment{ + deploymentStub = &appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{Name: "test"}, - Spec: appsv1beta2.DeploymentSpec{Selector: &metav1.LabelSelector{MatchLabels: podStub.Labels}, Replicas: &replicas, Template: podStub}, + Spec: appsv1.DeploymentSpec{Selector: &metav1.LabelSelector{MatchLabels: podStub.Labels}, Replicas: &replicas, Template: podStub}, } - ssStub = &appsv1beta2.StatefulSet{ + ssStub = &appsv1.StatefulSet{ ObjectMeta: metav1.ObjectMeta{Name: "test"}, - Spec: appsv1beta2.StatefulSetSpec{Selector: &metav1.LabelSelector{MatchLabels: podStub.Labels}, Replicas: &replicas, Template: podStub}, + Spec: appsv1.StatefulSetSpec{Selector: &metav1.LabelSelector{MatchLabels: podStub.Labels}, Replicas: &replicas, Template: podStub}, } )