From 09b1a12cc8ca8daf12b4d48f9a5834c7c75f07a3 Mon Sep 17 00:00:00 2001 From: Ricardo Maraschini Date: Tue, 29 Oct 2019 10:31:12 +0100 Subject: [PATCH] Remove references to extensions/v1beta1. This is deprecated and we should be using apps/v1 instead. --- pkg/template/controller/readiness.go | 27 +++++----------- pkg/template/controller/readiness_test.go | 38 ----------------------- 2 files changed, 7 insertions(+), 58 deletions(-) diff --git a/pkg/template/controller/readiness.go b/pkg/template/controller/readiness.go index 475187500..ebcfec33f 100644 --- a/pkg/template/controller/readiness.go +++ b/pkg/template/controller/readiness.go @@ -9,7 +9,6 @@ import ( kappsv1beta2 "k8s.io/api/apps/v1beta2" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" - kextensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" @@ -31,7 +30,6 @@ func init() { kappsv1.AddToScheme(readinessScheme) kappsv1beta1.AddToScheme(readinessScheme) kappsv1beta2.AddToScheme(readinessScheme) - kextensionsv1beta1.AddToScheme(readinessScheme) batchv1.AddToScheme(readinessScheme) corev1.AddToScheme(readinessScheme) appsv1.Install(readinessScheme) @@ -127,16 +125,6 @@ func checkDeploymentReadiness(obj runtime.Object) (bool, bool, error) { available = newDeploymentCondition(condition.Status, condition.Reason) } } - case *kextensionsv1beta1.Deployment: - isSynced = d.Status.ObservedGeneration == d.Generation - for _, condition := range d.Status.Conditions { - switch condition.Type { - case kextensionsv1beta1.DeploymentProgressing: - progressing = newDeploymentCondition(condition.Status, condition.Reason) - case kextensionsv1beta1.DeploymentAvailable: - available = newDeploymentCondition(condition.Status, condition.Reason) - } - } default: return false, false, fmt.Errorf("unsupported deployment version: %T", d) } @@ -260,14 +248,13 @@ var readinessCheckers = map[schema.GroupVersionKind]func(runtime.Object) (bool, {Group: "", Version: "v1", Kind: "Route"}: checkRouteReadiness, // Kubernetes kinds: - groupVersionKind(kappsv1.SchemeGroupVersion, "Deployment"): checkDeploymentReadiness, - groupVersionKind(kappsv1beta1.SchemeGroupVersion, "Deployment"): checkDeploymentReadiness, - groupVersionKind(kappsv1beta2.SchemeGroupVersion, "Deployment"): checkDeploymentReadiness, - groupVersionKind(kextensionsv1beta1.SchemeGroupVersion, "Deployment"): checkDeploymentReadiness, - groupVersionKind(kappsv1.SchemeGroupVersion, "StatefulSet"): checkStatefulSetReadiness, - groupVersionKind(kappsv1beta1.SchemeGroupVersion, "StatefulSet"): checkStatefulSetReadiness, - groupVersionKind(kappsv1beta2.SchemeGroupVersion, "StatefulSet"): checkStatefulSetReadiness, - groupVersionKind(batchv1.SchemeGroupVersion, "Job"): checkJobReadiness, + groupVersionKind(kappsv1.SchemeGroupVersion, "Deployment"): checkDeploymentReadiness, + groupVersionKind(kappsv1beta1.SchemeGroupVersion, "Deployment"): checkDeploymentReadiness, + groupVersionKind(kappsv1beta2.SchemeGroupVersion, "Deployment"): checkDeploymentReadiness, + groupVersionKind(kappsv1.SchemeGroupVersion, "StatefulSet"): checkStatefulSetReadiness, + groupVersionKind(kappsv1beta1.SchemeGroupVersion, "StatefulSet"): checkStatefulSetReadiness, + groupVersionKind(kappsv1beta2.SchemeGroupVersion, "StatefulSet"): checkStatefulSetReadiness, + groupVersionKind(batchv1.SchemeGroupVersion, "Job"): checkJobReadiness, } // CanCheckReadiness indicates whether a readiness check exists for a GK. diff --git a/pkg/template/controller/readiness_test.go b/pkg/template/controller/readiness_test.go index 9e1ff49c5..6715b7053 100644 --- a/pkg/template/controller/readiness_test.go +++ b/pkg/template/controller/readiness_test.go @@ -8,7 +8,6 @@ import ( kappsv1beta1 "k8s.io/api/apps/v1beta1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" - kextensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" @@ -149,43 +148,6 @@ func TestCheckReadiness(t *testing.T) { }, expectedFailed: true, }, - { - groupVersionKind: groupVersionKind(kextensionsv1beta1.SchemeGroupVersion, "Deployment"), - object: &kextensionsv1beta1.Deployment{}, - }, - { - groupVersionKind: groupVersionKind(kextensionsv1beta1.SchemeGroupVersion, "Deployment"), - object: &kextensionsv1beta1.Deployment{ - Status: kextensionsv1beta1.DeploymentStatus{ - Conditions: []kextensionsv1beta1.DeploymentCondition{ - { - Type: kextensionsv1beta1.DeploymentProgressing, - Status: corev1.ConditionTrue, - Reason: deploymentutil.NewRSAvailableReason, - }, - { - Type: kextensionsv1beta1.DeploymentAvailable, - Status: corev1.ConditionTrue, - }, - }, - }, - }, - expectedReady: true, - }, - { - groupVersionKind: groupVersionKind(kextensionsv1beta1.SchemeGroupVersion, "Deployment"), - object: &kextensionsv1beta1.Deployment{ - Status: kextensionsv1beta1.DeploymentStatus{ - Conditions: []kextensionsv1beta1.DeploymentCondition{ - { - Type: kextensionsv1beta1.DeploymentProgressing, - Status: corev1.ConditionFalse, - }, - }, - }, - }, - expectedFailed: true, - }, // DeploymentConfig {