Skip to content
Snippets Groups Projects
Commit 6ef8a973 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Adapted to newer K8s api version

parent 02c6ea50
No related branches found
No related tags found
No related merge requests found
...@@ -483,7 +483,7 @@ func (s *readinessServiceServer) CheckIfReady(ctx context.Context, req *v1.Insta ...@@ -483,7 +483,7 @@ func (s *readinessServiceServer) CheckIfReady(ctx context.Context, req *v1.Insta
} }
log.Print("looking for deployment and checking its status") 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 { if err != nil {
log.Print("deployment not found, looking for statefulset and checking its status") 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{}) sts, err2 := s.kubeAPI.AppsV1().StatefulSets(depl.Namespace).Get(depl.Uid, metav1.GetOptions{})
......
...@@ -4,7 +4,6 @@ import ( ...@@ -4,7 +4,6 @@ import (
"code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/api/v1" "code.geant.net/stash/scm/nmaas/nmaas-janitor/pkg/api/v1"
"context" "context"
"github.com/xanzy/go-gitlab" "github.com/xanzy/go-gitlab"
extension "k8s.io/api/extensions/v1beta1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
...@@ -62,12 +61,12 @@ func TestReadinessServiceServer_CheckIfReady(t *testing.T) { ...@@ -62,12 +61,12 @@ func TestReadinessServiceServer_CheckIfReady(t *testing.T) {
} }
//create mock deployment that is fully deployed //create mock deployment that is fully deployed
depl := extension.Deployment{} depl := appsv1.Deployment{}
depl.Name = "test-uid" depl.Name = "test-uid"
q := int32(5) q := int32(5)
depl.Spec.Replicas = &q depl.Spec.Replicas = &q
depl.Status.ReadyReplicas = 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) res, err = server.CheckIfReady(context.Background(), &req)
if err != nil || res.Status != v1.Status_OK { if err != nil || res.Status != v1.Status_OK {
...@@ -77,7 +76,7 @@ func TestReadinessServiceServer_CheckIfReady(t *testing.T) { ...@@ -77,7 +76,7 @@ func TestReadinessServiceServer_CheckIfReady(t *testing.T) {
//modify mock deployment to be partially deployed //modify mock deployment to be partially deployed
p := int32(3) p := int32(3)
depl.Status.ReadyReplicas = p 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) res, err = server.CheckIfReady(context.Background(), &req)
if err != nil || res.Status != v1.Status_PENDING { if err != nil || res.Status != v1.Status_PENDING {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment