From 72e889be0d87bec3b545689dc59e2443e558a3af Mon Sep 17 00:00:00 2001 From: ntishchauhan0022 Date: Tue, 4 Jul 2023 10:08:55 +0530 Subject: [PATCH] resolving linting error and some check for updatedavailabel replica Signed-off-by: ntishchauhan0022 --- .../clientset/versioned/fake/register.go | 14 ++++++------- .../clientset/versioned/scheme/register.go | 14 ++++++------- .../statefulset/stateful_set_control_test.go | 21 +++++++++++++++++++ 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index d085403bf6..c6c8eb7dcd 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -40,14 +40,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index fa73f87425..c8ba11f600 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -40,14 +40,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/controller/statefulset/stateful_set_control_test.go b/pkg/controller/statefulset/stateful_set_control_test.go index cdc866a8e0..3f88787212 100644 --- a/pkg/controller/statefulset/stateful_set_control_test.go +++ b/pkg/controller/statefulset/stateful_set_control_test.go @@ -225,6 +225,9 @@ func CreatesPods(t *testing.T, set *appsv1beta1.StatefulSet, invariants invarian if set.Status.UpdatedReplicas != 3 { t.Error("Failed to set UpdatedReplicas correctly") } + if set.Status.UpdatedAvailableReplicas != 3 { + t.Error("Failed to set UpdatedAvailbleReplicas correctly") + } } func ScalesUp(t *testing.T, set *appsv1beta1.StatefulSet, invariants invariantFunc) { @@ -257,6 +260,9 @@ func ScalesUp(t *testing.T, set *appsv1beta1.StatefulSet, invariants invariantFu if set.Status.UpdatedReplicas != 4 { t.Error("Failed to set updatedReplicas correctly") } + if set.Status.UpdatedAvailableReplicas != 4 { + t.Error("Failed to set updatedAvailableReplicas correctly") + } } func ScalesDown(t *testing.T, set *appsv1beta1.StatefulSet, invariants invariantFunc) { @@ -295,6 +301,9 @@ func ScalesDown(t *testing.T, set *appsv1beta1.StatefulSet, invariants invariant if set.Status.UpdatedReplicas != 0 { t.Error("Failed to set updatedReplicas correctly") } + if set.Status.UpdatedAvailableReplicas != 0 { + t.Error("Failed to set updatedAvailableReplicas correctly") + } } func ReplacesPods(t *testing.T, set *appsv1beta1.StatefulSet, invariants invariantFunc) { @@ -459,6 +468,9 @@ func CreatePodFailure(t *testing.T, set *appsv1beta1.StatefulSet, invariants inv if set.Status.UpdatedReplicas != 3 { t.Error("Failed to updatedReplicas correctly") } + if set.Status.UpdatedAvailableReplicas != 4 { + t.Error("Failed to set updatedAvailableReplicas correctly") + } } func UpdatePodFailure(t *testing.T, set *appsv1beta1.StatefulSet, invariants invariantFunc) { @@ -489,6 +501,9 @@ func UpdatePodFailure(t *testing.T, set *appsv1beta1.StatefulSet, invariants inv if set.Status.UpdatedReplicas != 3 { t.Error("Failed to set updatedReplicas correctly") } + if set.Status.UpdatedAvailableReplicas != 3 { + t.Error("Failed to set updatedAvailableReplicas correctly") + } // now mutate a pod's identity pods, err := om.podsLister.List(labels.Everything()) @@ -543,6 +558,9 @@ func UpdateSetStatusFailure(t *testing.T, set *appsv1beta1.StatefulSet, invarian if set.Status.UpdatedReplicas != 3 { t.Error("Failed to set updatedReplicas to 3") } + if set.Status.UpdatedAvailableReplicas != 4 { + t.Error("Failed to set updatedAvailableReplicas correctly") + } } func PodRecreateDeleteFailure(t *testing.T, set *appsv1beta1.StatefulSet, invariants invariantFunc) { @@ -637,6 +655,9 @@ func TestStatefulSetControlScaleDownDeleteError(t *testing.T) { if set.Status.UpdatedReplicas != 0 { t.Error("Failed to set updatedReplicas to 0") } + if set.Status.UpdatedAvailableReplicas != 0 { + t.Error("Failed to set updatedAvailableReplicas to 0") + } }) }