mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
move sig-apps upgrade tests to its directory
This commit is contained in:
parent
74f1943774
commit
3b75093e0a
@ -132,6 +132,7 @@ go_library(
|
|||||||
"//test/e2e/manifest:go_default_library",
|
"//test/e2e/manifest:go_default_library",
|
||||||
"//test/e2e/metrics:go_default_library",
|
"//test/e2e/metrics:go_default_library",
|
||||||
"//test/e2e/upgrades:go_default_library",
|
"//test/e2e/upgrades:go_default_library",
|
||||||
|
"//test/e2e/upgrades/apps:go_default_library",
|
||||||
"//test/e2e/workload:go_default_library",
|
"//test/e2e/workload:go_default_library",
|
||||||
"//test/e2e_federation:go_default_library",
|
"//test/e2e_federation:go_default_library",
|
||||||
"//test/images/net/nat:go_default_library",
|
"//test/images/net/nat:go_default_library",
|
||||||
|
@ -30,6 +30,7 @@ import (
|
|||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
"k8s.io/kubernetes/test/e2e/framework/ginkgowrapper"
|
"k8s.io/kubernetes/test/e2e/framework/ginkgowrapper"
|
||||||
"k8s.io/kubernetes/test/e2e/upgrades"
|
"k8s.io/kubernetes/test/e2e/upgrades"
|
||||||
|
apps "k8s.io/kubernetes/test/e2e/upgrades/apps"
|
||||||
"k8s.io/kubernetes/test/utils/junit"
|
"k8s.io/kubernetes/test/utils/junit"
|
||||||
|
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
@ -38,13 +39,13 @@ import (
|
|||||||
var upgradeTests = []upgrades.Test{
|
var upgradeTests = []upgrades.Test{
|
||||||
&upgrades.ServiceUpgradeTest{},
|
&upgrades.ServiceUpgradeTest{},
|
||||||
&upgrades.SecretUpgradeTest{},
|
&upgrades.SecretUpgradeTest{},
|
||||||
&upgrades.StatefulSetUpgradeTest{},
|
&apps.StatefulSetUpgradeTest{},
|
||||||
&upgrades.DeploymentUpgradeTest{},
|
&apps.DeploymentUpgradeTest{},
|
||||||
&upgrades.JobUpgradeTest{},
|
&apps.JobUpgradeTest{},
|
||||||
&upgrades.ConfigMapUpgradeTest{},
|
&upgrades.ConfigMapUpgradeTest{},
|
||||||
&upgrades.HPAUpgradeTest{},
|
&upgrades.HPAUpgradeTest{},
|
||||||
&upgrades.PersistentVolumeUpgradeTest{},
|
&upgrades.PersistentVolumeUpgradeTest{},
|
||||||
&upgrades.DaemonSetUpgradeTest{},
|
&apps.DaemonSetUpgradeTest{},
|
||||||
&upgrades.IngressUpgradeTest{},
|
&upgrades.IngressUpgradeTest{},
|
||||||
&upgrades.AppArmorUpgradeTest{},
|
&upgrades.AppArmorUpgradeTest{},
|
||||||
}
|
}
|
||||||
|
@ -12,25 +12,19 @@ go_library(
|
|||||||
srcs = [
|
srcs = [
|
||||||
"apparmor.go",
|
"apparmor.go",
|
||||||
"configmaps.go",
|
"configmaps.go",
|
||||||
"daemonsets.go",
|
|
||||||
"deployments.go",
|
|
||||||
"etcd.go",
|
"etcd.go",
|
||||||
"horizontal_pod_autoscalers.go",
|
"horizontal_pod_autoscalers.go",
|
||||||
"ingress.go",
|
"ingress.go",
|
||||||
"job.go",
|
|
||||||
"mysql.go",
|
"mysql.go",
|
||||||
"persistent_volumes.go",
|
"persistent_volumes.go",
|
||||||
"secrets.go",
|
"secrets.go",
|
||||||
"services.go",
|
"services.go",
|
||||||
"statefulset.go",
|
|
||||||
"sysctl.go",
|
"sysctl.go",
|
||||||
"upgrade.go",
|
"upgrade.go",
|
||||||
],
|
],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
deps = [
|
deps = [
|
||||||
"//pkg/api/v1/helper:go_default_library",
|
"//pkg/api/v1/helper:go_default_library",
|
||||||
"//pkg/controller:go_default_library",
|
|
||||||
"//pkg/controller/deployment/util:go_default_library",
|
|
||||||
"//pkg/kubelet/sysctl:go_default_library",
|
"//pkg/kubelet/sysctl:go_default_library",
|
||||||
"//pkg/util/version:go_default_library",
|
"//pkg/util/version:go_default_library",
|
||||||
"//test/e2e/common:go_default_library",
|
"//test/e2e/common:go_default_library",
|
||||||
@ -38,14 +32,10 @@ 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/github.com/onsi/gomega/gstruct:go_default_library",
|
"//vendor/github.com/onsi/gomega/gstruct:go_default_library",
|
||||||
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
|
|
||||||
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
|
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
|
||||||
"//vendor/k8s.io/api/batch/v1:go_default_library",
|
|
||||||
"//vendor/k8s.io/api/core/v1:go_default_library",
|
"//vendor/k8s.io/api/core/v1:go_default_library",
|
||||||
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
|
|
||||||
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
|
|
||||||
"//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
|
||||||
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
|
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
|
||||||
@ -61,6 +51,9 @@ filegroup(
|
|||||||
|
|
||||||
filegroup(
|
filegroup(
|
||||||
name = "all-srcs",
|
name = "all-srcs",
|
||||||
srcs = [":package-srcs"],
|
srcs = [
|
||||||
|
":package-srcs",
|
||||||
|
"//test/e2e/upgrades/apps:all-srcs",
|
||||||
|
],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
)
|
)
|
||||||
|
48
test/e2e/upgrades/apps/BUILD
Normal file
48
test/e2e/upgrades/apps/BUILD
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
|
licenses(["notice"])
|
||||||
|
|
||||||
|
load(
|
||||||
|
"@io_bazel_rules_go//go:def.bzl",
|
||||||
|
"go_library",
|
||||||
|
)
|
||||||
|
|
||||||
|
go_library(
|
||||||
|
name = "go_default_library",
|
||||||
|
srcs = [
|
||||||
|
"daemonsets.go",
|
||||||
|
"deployments.go",
|
||||||
|
"job.go",
|
||||||
|
"statefulset.go",
|
||||||
|
],
|
||||||
|
tags = ["automanaged"],
|
||||||
|
deps = [
|
||||||
|
"//pkg/controller:go_default_library",
|
||||||
|
"//pkg/controller/deployment/util:go_default_library",
|
||||||
|
"//pkg/util/version:go_default_library",
|
||||||
|
"//test/e2e/framework:go_default_library",
|
||||||
|
"//test/e2e/upgrades:go_default_library",
|
||||||
|
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
||||||
|
"//vendor/github.com/onsi/gomega:go_default_library",
|
||||||
|
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
|
||||||
|
"//vendor/k8s.io/api/batch/v1:go_default_library",
|
||||||
|
"//vendor/k8s.io/api/core/v1:go_default_library",
|
||||||
|
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
|
||||||
|
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||||
|
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
|
||||||
|
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
filegroup(
|
||||||
|
name = "package-srcs",
|
||||||
|
srcs = glob(["**"]),
|
||||||
|
tags = ["automanaged"],
|
||||||
|
visibility = ["//visibility:private"],
|
||||||
|
)
|
||||||
|
|
||||||
|
filegroup(
|
||||||
|
name = "all-srcs",
|
||||||
|
srcs = [":package-srcs"],
|
||||||
|
tags = ["automanaged"],
|
||||||
|
)
|
@ -26,6 +26,7 @@ import (
|
|||||||
extensions "k8s.io/api/extensions/v1beta1"
|
extensions "k8s.io/api/extensions/v1beta1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
"k8s.io/kubernetes/test/e2e/upgrades"
|
||||||
|
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
)
|
)
|
||||||
@ -87,7 +88,7 @@ func (t *DaemonSetUpgradeTest) Setup(f *framework.Framework) {
|
|||||||
|
|
||||||
// Test waits until the upgrade has completed and then verifies that the DaemonSet
|
// Test waits until the upgrade has completed and then verifies that the DaemonSet
|
||||||
// is still running
|
// is still running
|
||||||
func (t *DaemonSetUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) {
|
func (t *DaemonSetUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade upgrades.UpgradeType) {
|
||||||
By("Waiting for upgradet to complete before re-validating DaemonSet")
|
By("Waiting for upgradet to complete before re-validating DaemonSet")
|
||||||
<-done
|
<-done
|
||||||
|
|
@ -24,6 +24,7 @@ import (
|
|||||||
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
|
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
|
||||||
"k8s.io/kubernetes/pkg/util/version"
|
"k8s.io/kubernetes/pkg/util/version"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
"k8s.io/kubernetes/test/e2e/upgrades"
|
||||||
|
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
)
|
)
|
||||||
@ -42,7 +43,7 @@ type DeploymentUpgradeTest struct {
|
|||||||
|
|
||||||
func (DeploymentUpgradeTest) Name() string { return "[sig-apps] deployment-upgrade" }
|
func (DeploymentUpgradeTest) Name() string { return "[sig-apps] deployment-upgrade" }
|
||||||
|
|
||||||
func (DeploymentUpgradeTest) Skip(upgCtx UpgradeContext) bool {
|
func (DeploymentUpgradeTest) Skip(upgCtx upgrades.UpgradeContext) bool {
|
||||||
// The Deployment upgrade test currently relies on implementation details to probe the
|
// The Deployment upgrade test currently relies on implementation details to probe the
|
||||||
// ReplicaSets belonging to a Deployment. As of 1.7, the client code we call into no
|
// ReplicaSets belonging to a Deployment. As of 1.7, the client code we call into no
|
||||||
// longer supports talking to a server <1.6. (see #47685)
|
// longer supports talking to a server <1.6. (see #47685)
|
||||||
@ -56,7 +57,7 @@ func (DeploymentUpgradeTest) Skip(upgCtx UpgradeContext) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ Skippable = DeploymentUpgradeTest{}
|
var _ upgrades.Skippable = DeploymentUpgradeTest{}
|
||||||
|
|
||||||
// Setup creates a deployment and makes sure it has a new and an old replica set running.
|
// Setup creates a deployment and makes sure it has a new and an old replica set running.
|
||||||
// This calls in to client code and should not be expected to work against a cluster more than one minor version away from the current version.
|
// This calls in to client code and should not be expected to work against a cluster more than one minor version away from the current version.
|
||||||
@ -125,7 +126,7 @@ func (t *DeploymentUpgradeTest) Setup(f *framework.Framework) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Test checks whether the replica sets for a deployment are the same after an upgrade.
|
// Test checks whether the replica sets for a deployment are the same after an upgrade.
|
||||||
func (t *DeploymentUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) {
|
func (t *DeploymentUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade upgrades.UpgradeType) {
|
||||||
// Block until upgrade is done
|
// Block until upgrade is done
|
||||||
By(fmt.Sprintf("Waiting for upgrade to finish before checking replica sets for deployment %q", t.oldD.Name))
|
By(fmt.Sprintf("Waiting for upgrade to finish before checking replica sets for deployment %q", t.oldD.Name))
|
||||||
<-done
|
<-done
|
@ -20,6 +20,7 @@ import (
|
|||||||
batch "k8s.io/api/batch/v1"
|
batch "k8s.io/api/batch/v1"
|
||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
"k8s.io/kubernetes/test/e2e/upgrades"
|
||||||
|
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
. "github.com/onsi/gomega"
|
. "github.com/onsi/gomega"
|
||||||
@ -49,7 +50,7 @@ func (t *JobUpgradeTest) Setup(f *framework.Framework) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Test verifies that the Jobs Pods are running after the an upgrade
|
// Test verifies that the Jobs Pods are running after the an upgrade
|
||||||
func (t *JobUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) {
|
func (t *JobUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade upgrades.UpgradeType) {
|
||||||
<-done
|
<-done
|
||||||
By("Ensuring active pods == parallelism")
|
By("Ensuring active pods == parallelism")
|
||||||
running, err := framework.CheckForAllJobPodsRunning(f.ClientSet, t.namespace, t.job.Name, 2)
|
running, err := framework.CheckForAllJobPodsRunning(f.ClientSet, t.namespace, t.job.Name, 2)
|
@ -25,6 +25,7 @@ import (
|
|||||||
"k8s.io/kubernetes/pkg/util/version"
|
"k8s.io/kubernetes/pkg/util/version"
|
||||||
|
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
"k8s.io/kubernetes/test/e2e/upgrades"
|
||||||
)
|
)
|
||||||
|
|
||||||
// StatefulSetUpgradeTest implements an upgrade test harness for StatefulSet upgrade testing.
|
// StatefulSetUpgradeTest implements an upgrade test harness for StatefulSet upgrade testing.
|
||||||
@ -36,7 +37,7 @@ type StatefulSetUpgradeTest struct {
|
|||||||
|
|
||||||
func (StatefulSetUpgradeTest) Name() string { return "[sig-apps] statefulset-upgrade" }
|
func (StatefulSetUpgradeTest) Name() string { return "[sig-apps] statefulset-upgrade" }
|
||||||
|
|
||||||
func (StatefulSetUpgradeTest) Skip(upgCtx UpgradeContext) bool {
|
func (StatefulSetUpgradeTest) Skip(upgCtx upgrades.UpgradeContext) bool {
|
||||||
minVersion := version.MustParseSemantic("1.5.0")
|
minVersion := version.MustParseSemantic("1.5.0")
|
||||||
|
|
||||||
for _, vCtx := range upgCtx.Versions {
|
for _, vCtx := range upgCtx.Versions {
|
||||||
@ -81,7 +82,7 @@ func (t *StatefulSetUpgradeTest) Setup(f *framework.Framework) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Waits for the upgrade to complete and verifies the StatefulSet basic functionality
|
// Waits for the upgrade to complete and verifies the StatefulSet basic functionality
|
||||||
func (t *StatefulSetUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) {
|
func (t *StatefulSetUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade upgrades.UpgradeType) {
|
||||||
<-done
|
<-done
|
||||||
t.verify()
|
t.verify()
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user