Change Deployment api to apps/v1 in cleaner

- Deployment.extensions/v1beta1 depricated from k82 1.16
- Remove activeDeadlineSeconds from migration jobs
- The generic timeout from will be applied

Issue: #2752

charts/catalog/templates/cleaner-job.yaml

@@ -78,7 +78,6 @@ metadata:
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
 spec:
   backoffLimit: 3
-  activeDeadlineSeconds: 100
   template:
     metadata:
       labels:

charts/catalog/templates/migration-job.yaml

@@ -103,7 +103,6 @@ metadata:
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
 spec:
   backoffLimit: 1
-  activeDeadlineSeconds: 140
   template:
     metadata:
       labels:

charts/catalog/templates/pre-migration-job.yaml

@@ -110,7 +110,6 @@ metadata:
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
 spec:
   backoffLimit: 1
-  activeDeadlineSeconds: 120
   template:
     metadata:
       labels:

pkg/cleaner/cleaner.go

@@ -87,7 +87,7 @@ func (c *Cleaner) RemoveCRDs(releaseNamespace, controllerManagerName string, web
 
 func (c *Cleaner) scaleDownController(namespace, controllerName string) error {
 	klog.V(4).Infof("Fetching deployment %s/%s", namespace, controllerName)
-	deployment, err := c.client.AppsV1beta1().Deployments(namespace).Get(controllerName, v1.GetOptions{})
+	deployment, err := c.client.AppsV1().Deployments(namespace).Get(controllerName, v1.GetOptions{})
 	if err != nil {
 		return fmt.Errorf("cannot get deployment %s/%s: %s", namespace, controllerName, err)
 	}
@@ -96,14 +96,14 @@ func (c *Cleaner) scaleDownController(namespace, controllerName string) error {
 	replicas := int32(0)
 	deploymentCopy := deployment.DeepCopy()
 	deploymentCopy.Spec.Replicas = &replicas
-	_, err = c.client.AppsV1beta1().Deployments(deploymentCopy.Namespace).Update(deploymentCopy)
+	_, err = c.client.AppsV1().Deployments(deploymentCopy.Namespace).Update(deploymentCopy)
 	if err != nil {
 		return fmt.Errorf("failed to update deployment %s/%s: %v", namespace, controllerName, err)
 	}
 
 	err = wait.Poll(3*time.Second, 120*time.Second, func() (done bool, err error) {
 		klog.V(4).Info("Waiting for deployment scales down...")
-		deployment, err := c.client.AppsV1beta1().Deployments(namespace).Get(controllerName, v1.GetOptions{})
+		deployment, err := c.client.AppsV1().Deployments(namespace).Get(controllerName, v1.GetOptions{})
 		if err != nil {
 			return false, err
 		}

pkg/cleaner/cleaner_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/kubernetes-sigs/service-catalog/pkg/probe"
 	"github.com/stretchr/testify/assert"
 	admv1beta1 "k8s.io/api/admissionregistration/v1beta1"
-	"k8s.io/api/apps/v1beta1"
+	appsv1 "k8s.io/api/apps/v1"
 	extv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	apiextfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -55,7 +55,7 @@ func TestCleaner_RemoveCRDs(t *testing.T) {
 	assert.Len(t, list.Items, 1)
 	assert.Equal(t, "NotServiceCatalogCRD", list.Items[0].Name)
 
-	deployment, err := fakeClik8s.AppsV1beta1().Deployments(cmNamespace).Get(cmName, v1.GetOptions{})
+	deployment, err := fakeClik8s.AppsV1().Deployments(cmNamespace).Get(cmName, v1.GetOptions{})
 	assert.NoError(t, err)
 	assert.Equal(t, int32(0), deployment.Status.Replicas)
 
@@ -69,14 +69,14 @@ func TestCleaner_RemoveCRDs(t *testing.T) {
 	assert.Len(t, vwcList.Items, 1)
 }
 
-func newTestDeployment() *v1beta1.Deployment {
+func newTestDeployment() *appsv1.Deployment {
 	var rep int32 = 1
-	return &v1beta1.Deployment{
+	return &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      cmName,
 			Namespace: cmNamespace,
 		},
-		Spec: v1beta1.DeploymentSpec{
+		Spec: appsv1.DeploymentSpec{
 			Replicas: &rep,
 		},
 	}

test/upgrade/examiner/internal/readiness/readiness.go

@@ -83,7 +83,7 @@ func (r *readiness) assertServiceCatalogIsReady() error {
 
 func (r *readiness) assertServiceCatalogAPIServerIsUp() error {
 	return wait.Poll(waitInterval, timeoutInterval, func() (done bool, err error) {
-		deployment, err := r.client.AppsV1beta1().Deployments(r.cfg.ServiceCatalogNamespace).Get(r.cfg.ServiceCatalogAPIServerName, v1.GetOptions{})
+		deployment, err := r.client.AppsV1().Deployments(r.cfg.ServiceCatalogNamespace).Get(r.cfg.ServiceCatalogAPIServerName, v1.GetOptions{})
 		if err != nil {
 			return false, err
 		}
@@ -98,7 +98,7 @@ func (r *readiness) assertServiceCatalogAPIServerIsUp() error {
 
 func (r *readiness) assertServiceCatalogControllerIsUp() error {
 	return wait.Poll(waitInterval, timeoutInterval, func() (done bool, err error) {
-		deployment, err := r.client.AppsV1beta1().Deployments(r.cfg.ServiceCatalogNamespace).Get(r.cfg.ServiceCatalogControllerServerName, v1.GetOptions{})
+		deployment, err := r.client.AppsV1().Deployments(r.cfg.ServiceCatalogNamespace).Get(r.cfg.ServiceCatalogControllerServerName, v1.GetOptions{})
 		if err != nil {
 			return false, err
 		}
@@ -123,7 +123,7 @@ func (r *readiness) assertTestBrokerIsReady() error {
 
 func (r *readiness) assertTestBrokerIsUp() error {
 	return wait.Poll(waitInterval, timeoutInterval, func() (done bool, err error) {
-		deployment, err := r.client.AppsV1beta1().Deployments(r.cfg.TestBrokerNamespace).Get(r.cfg.TestBrokerName, v1.GetOptions{})
+		deployment, err := r.client.AppsV1().Deployments(r.cfg.TestBrokerNamespace).Get(r.cfg.TestBrokerName, v1.GetOptions{})
 		if err != nil {
 			return false, err
 		}