From 2eabf97a58cdb9c3f22e08693dd6d5db95155802 Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Fri, 26 Jun 2020 00:01:35 +0000 Subject: [PATCH 1/6] Ensure request returns current server version --- test/e2e/apimachinery/BUILD | 1 + test/e2e/apimachinery/get_code_version.go | 44 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 test/e2e/apimachinery/get_code_version.go diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD index 08bdaeaf01c..604aabc9d08 100644 --- a/test/e2e/apimachinery/BUILD +++ b/test/e2e/apimachinery/BUILD @@ -21,6 +21,7 @@ go_library( "framework.go", "garbage_collector.go", "generated_clientset.go", + "get_code_version.go", "namespace.go", "protocol.go", "resource_quota.go", diff --git a/test/e2e/apimachinery/get_code_version.go b/test/e2e/apimachinery/get_code_version.go new file mode 100644 index 00000000000..286395ef3a6 --- /dev/null +++ b/test/e2e/apimachinery/get_code_version.go @@ -0,0 +1,44 @@ +/* +Copyright 2019 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package apimachinery + +import ( + "k8s.io/apimachinery/pkg/version" + "k8s.io/kubernetes/test/e2e/framework" + + "github.com/onsi/ginkgo" +) + +var _ = SIGDescribe("get-code-version", func() { + f := framework.NewDefaultFramework("get-code-version") + ginkgo.It("should find the server version", func() { + + ginkgo.By("Request ServerVersion") + + var version *version.Info + version, err := f.ClientSet.Discovery().ServerVersion() + framework.ExpectNoError(err, "Fail to access ServerVersion") + + ginkgo.By("Confirm major version") + framework.ExpectEqual(version.Major, "1", "unable to find major version") + framework.Logf("Major version: %v", version.Major) + + ginkgo.By("Confirm minor version") + framework.ExpectEqual(version.Minor, "19+", "unable to find minor version") + framework.Logf("Minor version: %v", version.Minor) + }) +}) From 878bc969a4c91a0eef7cc6fd6b674e63aa6f7e0f Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Fri, 26 Jun 2020 02:35:17 +0000 Subject: [PATCH 2/6] Include dependency for pkg/version --- test/e2e/apimachinery/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD index 604aabc9d08..07c7b4aee2d 100644 --- a/test/e2e/apimachinery/BUILD +++ b/test/e2e/apimachinery/BUILD @@ -65,6 +65,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/apiserver/pkg/endpoints/discovery:go_default_library", "//staging/src/k8s.io/apiserver/pkg/features:go_default_library", From 469e22a09ea98d0296d1bb8ca26ae6fe4e8b08a0 Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Tue, 30 Jun 2020 01:16:16 +0000 Subject: [PATCH 3/6] Use regexp to check server version --- test/e2e/apimachinery/get_code_version.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/e2e/apimachinery/get_code_version.go b/test/e2e/apimachinery/get_code_version.go index 286395ef3a6..4b454cf86d6 100644 --- a/test/e2e/apimachinery/get_code_version.go +++ b/test/e2e/apimachinery/get_code_version.go @@ -19,6 +19,7 @@ package apimachinery import ( "k8s.io/apimachinery/pkg/version" "k8s.io/kubernetes/test/e2e/framework" + "regexp" "github.com/onsi/ginkgo" ) @@ -34,11 +35,18 @@ var _ = SIGDescribe("get-code-version", func() { framework.ExpectNoError(err, "Fail to access ServerVersion") ginkgo.By("Confirm major version") - framework.ExpectEqual(version.Major, "1", "unable to find major version") + re := regexp.MustCompile("[1-9]") + framework.ExpectEqual(re.FindString(version.Major), version.Major, "unable to find major version") framework.Logf("Major version: %v", version.Major) ginkgo.By("Confirm minor version") - framework.ExpectEqual(version.Minor, "19+", "unable to find minor version") + + re = regexp.MustCompile("[^0-9]+") + cleanMinorVersion := re.ReplaceAllString(version.Minor, "") + framework.Logf("cleanMinorVersion: %v", cleanMinorVersion) + + re = regexp.MustCompile("[0-9]+") + framework.ExpectEqual(re.FindString(version.Minor), cleanMinorVersion, "unable to find minor version") framework.Logf("Minor version: %v", version.Minor) }) }) From c4e10c29ba8244057e188ea303dd3be28e53a12b Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Wed, 1 Jul 2020 00:04:39 +0000 Subject: [PATCH 4/6] Rename get-code-version references to get-server-version --- test/e2e/apimachinery/BUILD | 2 +- .../{get_code_version.go => get_server_version.go} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename test/e2e/apimachinery/{get_code_version.go => get_server_version.go} (91%) diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD index 07c7b4aee2d..c58ba71e08d 100644 --- a/test/e2e/apimachinery/BUILD +++ b/test/e2e/apimachinery/BUILD @@ -21,7 +21,7 @@ go_library( "framework.go", "garbage_collector.go", "generated_clientset.go", - "get_code_version.go", + "get_server_version.go", "namespace.go", "protocol.go", "resource_quota.go", diff --git a/test/e2e/apimachinery/get_code_version.go b/test/e2e/apimachinery/get_server_version.go similarity index 91% rename from test/e2e/apimachinery/get_code_version.go rename to test/e2e/apimachinery/get_server_version.go index 4b454cf86d6..0a8a1842142 100644 --- a/test/e2e/apimachinery/get_code_version.go +++ b/test/e2e/apimachinery/get_server_version.go @@ -1,5 +1,5 @@ /* -Copyright 2019 The Kubernetes Authors. +Copyright 2020 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import ( "github.com/onsi/ginkgo" ) -var _ = SIGDescribe("get-code-version", func() { - f := framework.NewDefaultFramework("get-code-version") +var _ = SIGDescribe("get-server-version", func() { + f := framework.NewDefaultFramework("get-server-version") ginkgo.It("should find the server version", func() { ginkgo.By("Request ServerVersion") From 4069194aea66099e7ccb28fddf96d6bb31abb49e Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Wed, 1 Jul 2020 02:16:38 +0000 Subject: [PATCH 5/6] Fix naming for server version --- test/e2e/apimachinery/BUILD | 2 +- .../apimachinery/{get_server_version.go => server_version.go} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename test/e2e/apimachinery/{get_server_version.go => server_version.go} (93%) diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD index c58ba71e08d..f57debecae8 100644 --- a/test/e2e/apimachinery/BUILD +++ b/test/e2e/apimachinery/BUILD @@ -21,10 +21,10 @@ go_library( "framework.go", "garbage_collector.go", "generated_clientset.go", - "get_server_version.go", "namespace.go", "protocol.go", "resource_quota.go", + "server_version.go", "table_conversion.go", "watch.go", "webhook.go", diff --git a/test/e2e/apimachinery/get_server_version.go b/test/e2e/apimachinery/server_version.go similarity index 93% rename from test/e2e/apimachinery/get_server_version.go rename to test/e2e/apimachinery/server_version.go index 0a8a1842142..6a671b9ba48 100644 --- a/test/e2e/apimachinery/get_server_version.go +++ b/test/e2e/apimachinery/server_version.go @@ -24,8 +24,8 @@ import ( "github.com/onsi/ginkgo" ) -var _ = SIGDescribe("get-server-version", func() { - f := framework.NewDefaultFramework("get-server-version") +var _ = SIGDescribe("server version", func() { + f := framework.NewDefaultFramework("server version") ginkgo.It("should find the server version", func() { ginkgo.By("Request ServerVersion") From e7f603c29a29b0d45c8c792b0a653548dc5bbc61 Mon Sep 17 00:00:00 2001 From: Stephen Heywood Date: Wed, 1 Jul 2020 05:58:17 +0000 Subject: [PATCH 6/6] Correct BaseName for NewDefaultFramework --- test/e2e/apimachinery/server_version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/apimachinery/server_version.go b/test/e2e/apimachinery/server_version.go index 6a671b9ba48..8327b564619 100644 --- a/test/e2e/apimachinery/server_version.go +++ b/test/e2e/apimachinery/server_version.go @@ -25,7 +25,7 @@ import ( ) var _ = SIGDescribe("server version", func() { - f := framework.NewDefaultFramework("server version") + f := framework.NewDefaultFramework("server-version") ginkgo.It("should find the server version", func() { ginkgo.By("Request ServerVersion")