diff --git a/pkg/service/v1/config-service.go b/pkg/service/v1/config-service.go index adc71d39f2b82c2f0b312d278b34d6026cf11964..d4030bde2d765f889ffb86cac65b4fa26d3878a0 100644 --- a/pkg/service/v1/config-service.go +++ b/pkg/service/v1/config-service.go @@ -483,7 +483,7 @@ func (s *readinessServiceServer) CheckIfReady(ctx context.Context, req *v1.Insta } log.Print("looking for deployment and checking its status") - dep, err := s.kubeAPI.ExtensionsV1beta1().Deployments(depl.Namespace).Get(depl.Uid, metav1.GetOptions{}) + dep, err := s.kubeAPI.AppsV1().Deployments(depl.Namespace).Get(depl.Uid, metav1.GetOptions{}) if err != nil { log.Print("deployment not found, looking for statefulset and checking its status") sts, err2 := s.kubeAPI.AppsV1().StatefulSets(depl.Namespace).Get(depl.Uid, metav1.GetOptions{}) diff --git a/pkg/service/v1/config-service_test.go b/pkg/service/v1/config-service_test.go index 48aa0cfb3eb08dffbc460668472e922d7fed1005..1d1a6414e53928bc897f923ee56d02e87803a7e4 100644 --- a/pkg/service/v1/config-service_test.go +++ b/pkg/service/v1/config-service_test.go @@ -4,7 +4,6 @@ import ( "code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/api/v1" "context" "github.com/xanzy/go-gitlab" - extension "k8s.io/api/extensions/v1beta1" corev1 "k8s.io/api/core/v1" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -62,12 +61,12 @@ func TestReadinessServiceServer_CheckIfReady(t *testing.T) { } //create mock deployment that is fully deployed - depl := extension.Deployment{} + depl := appsv1.Deployment{} depl.Name = "test-uid" q := int32(5) depl.Spec.Replicas = &q depl.Status.ReadyReplicas = q - _, _ = client.ExtensionsV1beta1().Deployments("test-namespace").Create(&depl) + _, _ = client.AppsV1().Deployments("test-namespace").Create(&depl) res, err = server.CheckIfReady(context.Background(), &req) if err != nil || res.Status != v1.Status_OK { @@ -77,7 +76,7 @@ func TestReadinessServiceServer_CheckIfReady(t *testing.T) { //modify mock deployment to be partially deployed p := int32(3) depl.Status.ReadyReplicas = p - _, _ = client.ExtensionsV1beta1().Deployments("test-namespace").Update(&depl) + _, _ = client.AppsV1().Deployments("test-namespace").Update(&depl) res, err = server.CheckIfReady(context.Background(), &req) if err != nil || res.Status != v1.Status_PENDING {