Skip to content

K
k3s
Commit 71b477bd authored by crimsonfaith91's avatar crimsonfaith91
Browse files
Options

Change API version of statefulset scale subresource e2e test to v1beta2

parent 5e5b586e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
test/e2e/apps/BUILD
View file @ 71b477bd
...@@ -43,6 +43,7 @@ go_library( ...@@ -43,6 +43,7 @@ go_library(
"//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/api/apps/v1beta1:go_default_library", "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
"//vendor/k8s.io/api/apps/v1beta2:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library", "//vendor/k8s.io/api/batch/v1:go_default_library",
"//vendor/k8s.io/api/batch/v2alpha1:go_default_library", "//vendor/k8s.io/api/batch/v2alpha1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
......
test/e2e/apps/statefulset.go
View file @ 71b477bd
...@@ -24,6 +24,7 @@ import ( ...@@ -24,6 +24,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
apps "k8s.io/api/apps/v1beta1" apps "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
klabels "k8s.io/apimachinery/pkg/labels" klabels "k8s.io/apimachinery/pkg/labels"
...@@ -855,8 +856,8 @@ var _ = SIGDescribe("StatefulSet", func() { ...@@ -855,8 +856,8 @@ var _ = SIGDescribe("StatefulSet", func() {
By("getting scale subresource") By("getting scale subresource")
scale := framework.NewStatefulSetScale(ss) scale := framework.NewStatefulSetScale(ss)
scaleResult := &apps.Scale{} scaleResult := &appsv1beta2.Scale{}
err = c.AppsV1beta1().RESTClient().Get().AbsPath("/apis/apps/v1beta1").Namespace(ns).Resource("statefulsets").Name(ssName).SubResource("scale").Do().Into(scale) err = c.AppsV1beta2().RESTClient().Get().AbsPath("/apis/apps/v1beta2").Namespace(ns).Resource("statefulsets").Name(ssName).SubResource("scale").Do().Into(scale)
if err != nil { if err != nil {
framework.Failf("Failed to get scale subresource: %v", err) framework.Failf("Failed to get scale subresource: %v", err)
} }
...@@ -866,7 +867,7 @@ var _ = SIGDescribe("StatefulSet", func() { ...@@ -866,7 +867,7 @@ var _ = SIGDescribe("StatefulSet", func() {
By("updating a scale subresource") By("updating a scale subresource")
scale.ResourceVersion = "" //unconditionally update to 2 replicas scale.ResourceVersion = "" //unconditionally update to 2 replicas
scale.Spec.Replicas = 2 scale.Spec.Replicas = 2
err = c.AppsV1beta1().RESTClient().Put().AbsPath("/apis/apps/v1beta1").Namespace(ns).Resource("statefulsets").Name(ssName).SubResource("scale").Body(scale).Do().Into(scaleResult) err = c.AppsV1beta2().RESTClient().Put().AbsPath("/apis/apps/v1beta2").Namespace(ns).Resource("statefulsets").Name(ssName).SubResource("scale").Body(scale).Do().Into(scaleResult)
if err != nil { if err != nil {
framework.Failf("Failed to put scale subresource: %v", err) framework.Failf("Failed to put scale subresource: %v", err)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment