Skip to content

Commit

Permalink
fix UnitedDeployment flaky ut (#208)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wu8685 @Fei-Guo
wu8685 authored and Fei-Guo committed Jan 7, 2020
1 parent bb23eda commit f3cec38
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 43 deletions.
90 changes: 47 additions & 43 deletions pkg/controller/uniteddeployment/uniteddeployment_controller_statefulset_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand All @@ -39,10 +38,6 @@ import (

var c client.Client

var expectedRequest = reconcile.Request{NamespacedName: types.NamespacedName{Name: "foo", Namespace: "default"}}

//var deploy = client.ObjectKey{Namespace: "default", Name: "foo"}

const timeout = time.Second * 2

var (
Expand All @@ -59,30 +54,31 @@ func TestStsReconcile(t *testing.T) {
mgrStopped.Wait()
}()

caseName := "sts-reconcile"
instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: caseName,
Namespace: "default",
},
Spec: appsv1alpha1.UnitedDeploymentSpec{
Replicas: &one,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Template: appsv1alpha1.SubsetTemplate{
StatefulSetTemplate: &appsv1alpha1.StatefulSetTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: appsv1.StatefulSetSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -139,30 +135,31 @@ func TestStsSubsetProvision(t *testing.T) {
mgrStopped.Wait()
}()

caseName := "test-sts-subset-provision"
instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: caseName,
Namespace: "default",
},
Spec: appsv1alpha1.UnitedDeploymentSpec{
Replicas: &one,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Template: appsv1alpha1.SubsetTemplate{
StatefulSetTemplate: &appsv1alpha1.StatefulSetTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: appsv1.StatefulSetSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -283,7 +280,7 @@ func TestStsSubsetProvision(t *testing.T) {
{
Key: "region",
Operator: corev1.NodeSelectorOpIn,
Values: []string{"foo"},
Values: []string{caseName},
},
},
})
Expand Down Expand Up @@ -312,7 +309,7 @@ func TestStsSubsetProvision(t *testing.T) {
g.Expect(sts.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchExpressions[1].Key).Should(gomega.BeEquivalentTo("region"))
g.Expect(sts.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchExpressions[1].Operator).Should(gomega.BeEquivalentTo(corev1.NodeSelectorOpIn))
g.Expect(len(sts.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchExpressions[1].Values)).Should(gomega.BeEquivalentTo(1))
g.Expect(sts.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchExpressions[1].Values[0]).Should(gomega.BeEquivalentTo("foo"))
g.Expect(sts.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchExpressions[1].Values[0]).Should(gomega.BeEquivalentTo(caseName))
g.Expect(sts.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchExpressions[2].Key).Should(gomega.BeEquivalentTo("node-name"))
g.Expect(sts.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchExpressions[2].Operator).Should(gomega.BeEquivalentTo(corev1.NodeSelectorOpIn))
g.Expect(len(sts.Spec.Template.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchExpressions[2].Values)).Should(gomega.BeEquivalentTo(1))
Expand All @@ -336,30 +333,31 @@ func TestStsDupSubset(t *testing.T) {
mgrStopped.Wait()
}()

caseName := "test-sts-dup-subset"
instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: caseName,
Namespace: "default",
},
Spec: appsv1alpha1.UnitedDeploymentSpec{
Replicas: &one,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Template: appsv1alpha1.SubsetTemplate{
StatefulSetTemplate: &appsv1alpha1.StatefulSetTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: appsv1.StatefulSetSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -425,30 +423,31 @@ func TestStsScale(t *testing.T) {
mgrStopped.Wait()
}()

caseName := "test-sts-scale"
instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: caseName,
Namespace: "default",
},
Spec: appsv1alpha1.UnitedDeploymentSpec{
Replicas: &one,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Template: appsv1alpha1.SubsetTemplate{
StatefulSetTemplate: &appsv1alpha1.StatefulSetTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: appsv1.StatefulSetSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -567,30 +566,31 @@ func TestStsUpdate(t *testing.T) {
mgrStopped.Wait()
}()

caseName := "test-sts-update"
instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: caseName,
Namespace: "default",
},
Spec: appsv1alpha1.UnitedDeploymentSpec{
Replicas: &two,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Template: appsv1alpha1.SubsetTemplate{
StatefulSetTemplate: &appsv1alpha1.StatefulSetTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: appsv1.StatefulSetSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -685,30 +685,31 @@ func TestStsRollingUpdatePartition(t *testing.T) {
mgrStopped.Wait()
}()

caseName := "test-sts-rolling-update-partition"
instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: caseName,
Namespace: "default",
},
Spec: appsv1alpha1.UnitedDeploymentSpec{
Replicas: &ten,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Template: appsv1alpha1.SubsetTemplate{
StatefulSetTemplate: &appsv1alpha1.StatefulSetTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: appsv1.StatefulSetSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -866,30 +867,31 @@ func TestStsRollingUpdateDeleteStuckPod(t *testing.T) {
mgrStopped.Wait()
}()

caseName := "test-sts-rolling-update-delete-stuck-pod"
instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: caseName,
Namespace: "default",
},
Spec: appsv1alpha1.UnitedDeploymentSpec{
Replicas: &ten,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Template: appsv1alpha1.SubsetTemplate{
StatefulSetTemplate: &appsv1alpha1.StatefulSetTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: appsv1.StatefulSetSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -996,30 +998,31 @@ func TestStsOnDelete(t *testing.T) {
mgrStopped.Wait()
}()

caseName := "test-sts-on-delete"
instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: caseName,
Namespace: "default",
},
Spec: appsv1alpha1.UnitedDeploymentSpec{
Replicas: &ten,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Template: appsv1alpha1.SubsetTemplate{
StatefulSetTemplate: &appsv1alpha1.StatefulSetTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: appsv1.StatefulSetSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: corev1.PodSpec{
Expand Down Expand Up @@ -1146,30 +1149,31 @@ func TestStsSubsetCount(t *testing.T) {
mgrStopped.Wait()
}()

caseName := "test-sts-subset-count"
instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Name: caseName,
Namespace: "default",
},
Spec: appsv1alpha1.UnitedDeploymentSpec{
Replicas: &ten,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Template: appsv1alpha1.SubsetTemplate{
StatefulSetTemplate: &appsv1alpha1.StatefulSetTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: appsv1.StatefulSetSpec{
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "foo",
"name": caseName,
},
},
Spec: corev1.PodSpec{
Expand Down
6 changes: 6 additions & 0 deletions pkg/controller/uniteddeployment/uniteddeployment_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,16 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"

appsv1alpha1 "github.com/openkruise/kruise/pkg/apis/apps/v1alpha1"
"k8s.io/apimachinery/pkg/types"

"sigs.k8s.io/controller-runtime/pkg/reconcile"
)

var expectedRequest = reconcile.Request{NamespacedName: types.NamespacedName{Name: "foo", Namespace: "default"}}

func TestReconcile(t *testing.T) {
g := gomega.NewGomegaWithT(t)

instance := &appsv1alpha1.UnitedDeployment{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Expand Down

0 comments on commit f3cec38

Please sign in to comment.