From 231624fc1aca6f99db3720c3a321522a1ef20ca5 Mon Sep 17 00:00:00 2001 From: Tam Mach Date: Sun, 20 Aug 2023 21:14:51 +1000 Subject: [PATCH] conformance-profile: Remove experimental build tag This is to make it easier for some implementation that imports the conformance test framework and run tests in the same codebase. Understand that cleaning up of similar/duplicated code is required to have a clean conformance test framework, however, such work might delay v1.0.0 GA release, hence, I only remove the build tag to remove the soft blocker in this PR. Subsequent cleanup/optimization can be done later. Relates: #2242 Signed-off-by: Tam Mach --- conformance/apis/v1alpha1/conformancereport.go | 5 +---- conformance/apis/v1alpha1/doc.go | 7 +++---- conformance/apis/v1alpha1/profilereport.go | 3 --- conformance/apis/v1alpha1/result.go | 3 --- conformance/apis/v1alpha1/statistics.go | 3 --- conformance/experimental_conformance_test.go | 3 --- conformance/utils/flags/experimental_flags.go | 3 --- conformance/utils/suite/experimental_profiles.go | 3 --- conformance/utils/suite/experimental_reports.go | 4 +--- conformance/utils/suite/experimental_suite.go | 4 +--- 10 files changed, 6 insertions(+), 32 deletions(-) diff --git a/conformance/apis/v1alpha1/conformancereport.go b/conformance/apis/v1alpha1/conformancereport.go index d3cb97b425..044a107340 100644 --- a/conformance/apis/v1alpha1/conformancereport.go +++ b/conformance/apis/v1alpha1/conformancereport.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. @@ -71,7 +68,7 @@ type Implementation struct { // addresses. // Rather than Github usernames or email addresses you can provide a URL to the relevant // support pages for the project. Ideally this would be something like the issue creation page - // on a repository, but for projects without a publicly exposed repository a general support + // on a repository, but for projects without a publicly exposed repository a general support // page URL can be provided. Contact []string `json:"contact"` } diff --git a/conformance/apis/v1alpha1/doc.go b/conformance/apis/v1alpha1/doc.go index d9581574ae..ac749a25e8 100644 --- a/conformance/apis/v1alpha1/doc.go +++ b/conformance/apis/v1alpha1/doc.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. @@ -23,6 +20,8 @@ limitations under the License. // are written in Golang and execute the conformance test suite as a Golang // library. // +// $ go test ./conformance/... -args ${CONFORMANCE_ARGS} +// // Note that currently all sub-packages are considered "experimental" in that // they aren't intended for general use or to be distributed as part of a // release so there is no way to use them by default when using the Golang @@ -30,7 +29,7 @@ limitations under the License. // features, then you should not use them. If you would like to opt into these // unreleased features use Go build tags to enable them, e.g.: // -// $ GOFLAGS='-tags=experimental' go test ./conformance/... -args ${CONFORMANCE_ARGS} +// $ go test ./conformance/... -args ${CONFORMANCE_ARGS} // // Please note that everything here is considered experimental and subject to // change. Expect breaking changes and/or complete removals if you start using diff --git a/conformance/apis/v1alpha1/profilereport.go b/conformance/apis/v1alpha1/profilereport.go index f321435eac..865a9d4aba 100644 --- a/conformance/apis/v1alpha1/profilereport.go +++ b/conformance/apis/v1alpha1/profilereport.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. diff --git a/conformance/apis/v1alpha1/result.go b/conformance/apis/v1alpha1/result.go index 8f47272af9..ec7ed44445 100644 --- a/conformance/apis/v1alpha1/result.go +++ b/conformance/apis/v1alpha1/result.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. diff --git a/conformance/apis/v1alpha1/statistics.go b/conformance/apis/v1alpha1/statistics.go index e64451a674..cc20d3a5e0 100644 --- a/conformance/apis/v1alpha1/statistics.go +++ b/conformance/apis/v1alpha1/statistics.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. diff --git a/conformance/experimental_conformance_test.go b/conformance/experimental_conformance_test.go index cabf8d7784..517b4ec5f8 100644 --- a/conformance/experimental_conformance_test.go +++ b/conformance/experimental_conformance_test.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. diff --git a/conformance/utils/flags/experimental_flags.go b/conformance/utils/flags/experimental_flags.go index a53350ddf2..10fe5b77ad 100644 --- a/conformance/utils/flags/experimental_flags.go +++ b/conformance/utils/flags/experimental_flags.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. diff --git a/conformance/utils/suite/experimental_profiles.go b/conformance/utils/suite/experimental_profiles.go index 1efd054dc6..bc64a1c4a1 100644 --- a/conformance/utils/suite/experimental_profiles.go +++ b/conformance/utils/suite/experimental_profiles.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. diff --git a/conformance/utils/suite/experimental_reports.go b/conformance/utils/suite/experimental_reports.go index f5efba1dca..f5d9c8c512 100644 --- a/conformance/utils/suite/experimental_reports.go +++ b/conformance/utils/suite/experimental_reports.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. @@ -21,6 +18,7 @@ package suite import ( "k8s.io/apimachinery/pkg/util/sets" + confv1a1 "sigs.k8s.io/gateway-api/conformance/apis/v1alpha1" ) diff --git a/conformance/utils/suite/experimental_suite.go b/conformance/utils/suite/experimental_suite.go index 560f65cb9b..7b65cab163 100644 --- a/conformance/utils/suite/experimental_suite.go +++ b/conformance/utils/suite/experimental_suite.go @@ -1,6 +1,3 @@ -//go:build experimental -// +build experimental - /* Copyright 2023 The Kubernetes Authors. @@ -29,6 +26,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" + "sigs.k8s.io/gateway-api/conformance" confv1a1 "sigs.k8s.io/gateway-api/conformance/apis/v1alpha1" "sigs.k8s.io/gateway-api/conformance/utils/config"