Skip to content
Snippets Groups Projects
Commit 7e3695c3 authored by Michał Bień's avatar Michał Bień
Browse files

Nonexistent namespace is now created when createorreplace called

parent 0c71d680
No related branches found
No related tags found
No related merge requests found
...@@ -194,8 +194,13 @@ func (s *configServiceServer) CreateOrReplace(ctx context.Context, req *v1.Insta ...@@ -194,8 +194,13 @@ func (s *configServiceServer) CreateOrReplace(ctx context.Context, req *v1.Insta
//check if given k8s namespace exists //check if given k8s namespace exists
_, err = s.kubeAPI.CoreV1().Namespaces().Get(depl.Namespace, metav1.GetOptions{}) _, err = s.kubeAPI.CoreV1().Namespaces().Get(depl.Namespace, metav1.GetOptions{})
if err != nil { if err != nil{
return prepareResponse(v1.Status_FAILED, namespaceNotFound), err ns := apiv1.Namespace{}
ns.Name = depl.Namespace
_, err = s.kubeAPI.CoreV1().Namespaces().Create(&ns)
if err != nil {
return prepareResponse(v1.Status_FAILED, namespaceNotFound), err
}
} }
//check if configmap already exists //check if configmap already exists
...@@ -318,8 +323,13 @@ func (s *basicAuthServiceServer) CreateOrReplace(ctx context.Context, req *v1.In ...@@ -318,8 +323,13 @@ func (s *basicAuthServiceServer) CreateOrReplace(ctx context.Context, req *v1.In
//check if given k8s namespace exists //check if given k8s namespace exists
_, err := s.kubeAPI.CoreV1().Namespaces().Get(depl.Namespace, metav1.GetOptions{}) _, err := s.kubeAPI.CoreV1().Namespaces().Get(depl.Namespace, metav1.GetOptions{})
if err != nil { if err != nil{
return prepareResponse(v1.Status_FAILED, namespaceNotFound), err ns := apiv1.Namespace{}
ns.Name = depl.Namespace
_, err = s.kubeAPI.CoreV1().Namespaces().Create(&ns)
if err != nil {
return prepareResponse(v1.Status_FAILED, namespaceNotFound), err
}
} }
secretName := getAuthSecretName(depl.Uid) secretName := getAuthSecretName(depl.Uid)
......
...@@ -170,18 +170,6 @@ func TestBasicAuthServiceServer_CreateOrReplace(t *testing.T) { ...@@ -170,18 +170,6 @@ func TestBasicAuthServiceServer_CreateOrReplace(t *testing.T) {
t.Fail() t.Fail()
} }
//Fail on namespace check
freq := v1.InstanceCredentialsRequest{Api:apiVersion, Instance:&fake_ns_inst, Credentials: &creds}
res, err = server.CreateOrReplace(context.Background(), &freq)
if err == nil || res.Status != v1.Status_FAILED {
t.Fail()
}
//create mock namespace
ns := corev1.Namespace{}
ns.Name = "test-namespace"
_, _ = client.CoreV1().Namespaces().Create(&ns)
//Should create new secret //Should create new secret
req := v1.InstanceCredentialsRequest{Api:apiVersion, Instance:&inst, Credentials: &creds} req := v1.InstanceCredentialsRequest{Api:apiVersion, Instance:&inst, Credentials: &creds}
res, err = server.CreateOrReplace(context.Background(), &req) res, err = server.CreateOrReplace(context.Background(), &req)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment