mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #52667 from shashidharatd/fed-e2e-move
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. federation: Move k/test/e2e_federation package to k/federation/test/e2e No functional change. Just move federation e2e tests inside k/federation directory, so that it is easy to move federation out of core. Issue ref: #52992 **Release note**: ```release-note NONE ``` /cc @kubernetes/sig-federation-pr-reviews @irfanurrehman @madhusudancs
This commit is contained in:
commit
0f21ecc0f3
@ -29,6 +29,8 @@ filegroup(
|
||||
"//federation/pkg/kubefed:all-srcs",
|
||||
"//federation/plugin/pkg/admission/schedulingpolicy:all-srcs",
|
||||
"//federation/registry/cluster:all-srcs",
|
||||
"//federation/test/e2e:all-srcs",
|
||||
"//federation/test/integration:all-srcs",
|
||||
],
|
||||
tags = ["automanaged"],
|
||||
)
|
||||
|
@ -27,14 +27,14 @@ go_library(
|
||||
"//federation/client/clientset_generated/federation_clientset/typed/core/v1:go_default_library",
|
||||
"//federation/pkg/federatedtypes:go_default_library",
|
||||
"//federation/pkg/federation-controller/util:go_default_library",
|
||||
"//federation/test/e2e/framework:go_default_library",
|
||||
"//federation/test/e2e/upgrades:go_default_library",
|
||||
"//pkg/api:go_default_library",
|
||||
"//pkg/api/v1:go_default_library",
|
||||
"//pkg/cloudprovider:go_default_library",
|
||||
"//test/e2e/chaosmonkey:go_default_library",
|
||||
"//test/e2e/common:go_default_library",
|
||||
"//test/e2e/framework:go_default_library",
|
||||
"//test/e2e_federation/framework:go_default_library",
|
||||
"//test/e2e_federation/upgrades:go_default_library",
|
||||
"//test/utils/image:go_default_library",
|
||||
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
||||
"//vendor/github.com/onsi/gomega:go_default_library",
|
||||
@ -64,8 +64,8 @@ filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//test/e2e_federation/framework:all-srcs",
|
||||
"//test/e2e_federation/upgrades:all-srcs",
|
||||
"//federation/test/e2e/framework:all-srcs",
|
||||
"//federation/test/e2e/upgrades:all-srcs",
|
||||
],
|
||||
tags = ["automanaged"],
|
||||
)
|
1
federation/test/e2e/README.md
Normal file
1
federation/test/e2e/README.md
Normal file
@ -0,0 +1 @@
|
||||
See [e2e-tests](https://git.k8s.io/community/contributors/devel/e2e-tests.md#federation-e2e-tests)
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -23,8 +23,8 @@ import (
|
||||
. "github.com/onsi/gomega"
|
||||
"k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
)
|
||||
|
||||
// Create/delete cluster api objects
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -22,8 +22,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/api/errors"
|
||||
"k8s.io/client-go/tools/clientcmd"
|
||||
"k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
||||
. "github.com/onsi/gomega"
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -23,8 +23,8 @@ import (
|
||||
|
||||
kubeclientset "k8s.io/client-go/kubernetes"
|
||||
"k8s.io/kubernetes/federation/pkg/federatedtypes"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
)
|
||||
|
||||
var _ = framework.KubeDescribe("Federated types [Feature:Federation][Experimental] ", func() {
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -23,8 +23,8 @@ import (
|
||||
"k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
|
||||
. "github.com/onsi/gomega"
|
||||
)
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
@ -37,8 +37,8 @@ import (
|
||||
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
|
||||
"k8s.io/kubernetes/federation/pkg/federation-controller/util"
|
||||
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
||||
. "github.com/onsi/gomega"
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -27,8 +27,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
|
||||
fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -27,9 +27,9 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
||||
)
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@ -28,8 +28,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
|
||||
fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
||||
. "github.com/onsi/gomega"
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -29,8 +29,8 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
||||
)
|
@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/federation/test/e2e/upgrades"
|
||||
"k8s.io/kubernetes/test/e2e/chaosmonkey"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
"k8s.io/kubernetes/test/e2e_federation/upgrades"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
||||
)
|
@ -14,7 +14,7 @@ go_library(
|
||||
deps = [
|
||||
"//federation/pkg/federatedtypes:go_default_library",
|
||||
"//federation/pkg/federatedtypes/crudtester:go_default_library",
|
||||
"//test/e2e_federation/framework:go_default_library",
|
||||
"//federation/test/e2e/framework:go_default_library",
|
||||
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
|
||||
],
|
@ -22,7 +22,7 @@ import (
|
||||
pkgruntime "k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/kubernetes/federation/pkg/federatedtypes"
|
||||
crudtester "k8s.io/kubernetes/federation/pkg/federatedtypes/crudtester"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
||||
)
|
@ -18,7 +18,7 @@ limitations under the License.
|
||||
// features before, during, and after different types of upgrades.
|
||||
package upgrades
|
||||
|
||||
import fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
import fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
|
||||
// FederationUpgradeType represents different types of federation upgrades.
|
||||
type FederationUpgradeType int
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package e2e_federation
|
||||
package e2e
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -29,10 +29,10 @@ import (
|
||||
kubeclientset "k8s.io/client-go/kubernetes"
|
||||
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
|
||||
fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
|
||||
fedframework "k8s.io/kubernetes/federation/test/e2e/framework"
|
||||
"k8s.io/kubernetes/pkg/cloudprovider"
|
||||
"k8s.io/kubernetes/test/e2e/common"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
fedframework "k8s.io/kubernetes/test/e2e_federation/framework"
|
||||
|
||||
. "github.com/onsi/ginkgo"
|
||||
. "github.com/onsi/gomega"
|
@ -18,7 +18,7 @@ go_test(
|
||||
"//federation/apis/federation/v1beta1:go_default_library",
|
||||
"//federation/pkg/federatedtypes:go_default_library",
|
||||
"//federation/pkg/federatedtypes/crudtester:go_default_library",
|
||||
"//test/integration/federation/framework:go_default_library",
|
||||
"//federation/test/integration/framework:go_default_library",
|
||||
"//test/integration/framework:go_default_library",
|
||||
"//vendor/github.com/pborman/uuid:go_default_library",
|
||||
"//vendor/github.com/stretchr/testify/assert:go_default_library",
|
||||
@ -43,7 +43,7 @@ filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//test/integration/federation/framework:all-srcs",
|
||||
"//federation/test/integration/framework:all-srcs",
|
||||
],
|
||||
tags = ["automanaged"],
|
||||
)
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package federation
|
||||
package integration
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
@ -32,7 +32,7 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
fed_v1b1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
|
||||
"k8s.io/kubernetes/test/integration/federation/framework"
|
||||
"k8s.io/kubernetes/federation/test/integration/framework"
|
||||
)
|
||||
|
||||
// List of group versions that are enabled by default.
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package federation
|
||||
package integration
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
@ -26,7 +26,7 @@ import (
|
||||
federationapi "k8s.io/kubernetes/federation/apis/federation/v1beta1"
|
||||
"k8s.io/kubernetes/federation/pkg/federatedtypes"
|
||||
"k8s.io/kubernetes/federation/pkg/federatedtypes/crudtester"
|
||||
"k8s.io/kubernetes/test/integration/federation/framework"
|
||||
"k8s.io/kubernetes/federation/test/integration/framework"
|
||||
)
|
||||
|
||||
// TestFederationCRUD validates create/read/update/delete operations for federated resource types.
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package federation
|
||||
package integration
|
||||
|
||||
import (
|
||||
"testing"
|
@ -59,6 +59,10 @@ federation/pkg/kubefed/testing
|
||||
federation/pkg/kubefed/util
|
||||
federation/registry/cluster
|
||||
federation/registry/cluster/etcd
|
||||
federation/test/e2e
|
||||
federation/test/e2e/framework
|
||||
federation/test/e2e/upgrades
|
||||
federation/test/integration/framework
|
||||
pkg/api/endpoints
|
||||
pkg/api/helper
|
||||
pkg/api/helper/qos
|
||||
@ -791,9 +795,6 @@ test/e2e/storage
|
||||
test/e2e/upgrades
|
||||
test/e2e/upgrades/apps
|
||||
test/e2e/upgrades/storage
|
||||
test/e2e_federation
|
||||
test/e2e_federation/framework
|
||||
test/e2e_federation/upgrades
|
||||
test/e2e_node
|
||||
test/e2e_node/builder
|
||||
test/e2e_node/environment
|
||||
@ -812,7 +813,6 @@ test/images/resource-consumer/controller
|
||||
test/integration
|
||||
test/integration/auth
|
||||
test/integration/evictions
|
||||
test/integration/federation/framework
|
||||
test/integration/framework
|
||||
test/integration/master
|
||||
test/integration/replicaset
|
||||
|
@ -49,6 +49,9 @@ kube::test::find_integration_test_dirs() {
|
||||
find vendor/k8s.io/apiextensions-apiserver/test/integration/ -name '*_test.go' -print0 \
|
||||
| xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \
|
||||
| LC_ALL=C sort -u
|
||||
find federation/test/integration/ -name '*_test.go' -print0 \
|
||||
| xargs -0n1 dirname | sed "s|^|${KUBE_GO_PACKAGE}/|" \
|
||||
| LC_ALL=C sort -u
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -61,6 +61,7 @@ kube::test::find_dirs() {
|
||||
-o -path './third_party/*' \
|
||||
-o -path './staging/*' \
|
||||
-o -path './vendor/*' \
|
||||
-o -path './federation/test/*' \
|
||||
\) -prune \
|
||||
\) -name '*_test.go' -print0 | xargs -0n1 dirname | sed "s|^\./|${KUBE_GO_PACKAGE}/|" | LC_ALL=C sort -u
|
||||
|
||||
|
@ -12,7 +12,6 @@ filegroup(
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//test/e2e:all-srcs",
|
||||
"//test/e2e_federation:all-srcs",
|
||||
"//test/e2e_node:all-srcs",
|
||||
"//test/fixtures:all-srcs",
|
||||
"//test/images:all-srcs",
|
||||
|
@ -51,6 +51,7 @@ go_library(
|
||||
"ubernetes_lite.go",
|
||||
],
|
||||
deps = [
|
||||
"//federation/test/e2e:go_default_library",
|
||||
"//pkg/api:go_default_library",
|
||||
"//pkg/api/testapi:go_default_library",
|
||||
"//pkg/api/v1/pod:go_default_library",
|
||||
@ -66,7 +67,6 @@ go_library(
|
||||
"//test/e2e/framework/metrics:go_default_library",
|
||||
"//test/e2e/generated:go_default_library",
|
||||
"//test/e2e/manifest:go_default_library",
|
||||
"//test/e2e_federation:go_default_library",
|
||||
"//test/utils:go_default_library",
|
||||
"//test/utils/image:go_default_library",
|
||||
"//vendor/github.com/golang/glog:go_default_library",
|
||||
|
@ -34,6 +34,7 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
runtimeutils "k8s.io/apimachinery/pkg/util/runtime"
|
||||
clientset "k8s.io/client-go/kubernetes"
|
||||
federationtest "k8s.io/kubernetes/federation/test/e2e"
|
||||
"k8s.io/kubernetes/pkg/cloudprovider/providers/azure"
|
||||
gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
|
||||
"k8s.io/kubernetes/pkg/kubectl/util/logs"
|
||||
@ -42,7 +43,6 @@ import (
|
||||
"k8s.io/kubernetes/test/e2e/framework/ginkgowrapper"
|
||||
"k8s.io/kubernetes/test/e2e/framework/metrics"
|
||||
"k8s.io/kubernetes/test/e2e/manifest"
|
||||
federationtest "k8s.io/kubernetes/test/e2e_federation"
|
||||
testutils "k8s.io/kubernetes/test/utils"
|
||||
)
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
See [e2e-tests](https://git.k8s.io/community/contributors/devel/e2e-tests.md#federation-e2e-tests)
|
||||
|
||||
[]()
|
@ -40,7 +40,6 @@ filegroup(
|
||||
"//test/integration/etcd:all-srcs",
|
||||
"//test/integration/evictions:all-srcs",
|
||||
"//test/integration/examples:all-srcs",
|
||||
"//test/integration/federation:all-srcs",
|
||||
"//test/integration/framework:all-srcs",
|
||||
"//test/integration/garbagecollector:all-srcs",
|
||||
"//test/integration/kubectl:all-srcs",
|
||||
|
Loading…
Reference in New Issue
Block a user