Compare commits
2 commits
a2ac202f26
...
4d13d71953
Author | SHA1 | Date | |
---|---|---|---|
4d13d71953 | |||
fb5a6e9a42 |
2 changed files with 60 additions and 35 deletions
|
@ -1,9 +1,11 @@
|
||||||
|
import json
|
||||||
|
|
||||||
import kubernetes
|
import kubernetes
|
||||||
import urlman
|
import urlman
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.cache import cache
|
from django.core.cache import cache
|
||||||
from django.core.exceptions import ValidationError
|
from django.core.exceptions import ValidationError
|
||||||
from django.db import models
|
from django.db import IntegrityError, models
|
||||||
from django.utils.functional import cached_property
|
from django.utils.functional import cached_property
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from encrypted_fields.fields import EncryptedJSONField
|
from encrypted_fields.fields import EncryptedJSONField
|
||||||
|
@ -492,7 +494,21 @@ class ServiceInstance(ServalaModelMixin, models.Model):
|
||||||
def create_instance(cls, name, organization, context, created_by, spec_data):
|
def create_instance(cls, name, organization, context, created_by, spec_data):
|
||||||
# Ensure the namespace exists
|
# Ensure the namespace exists
|
||||||
context.control_plane.get_or_create_namespace(organization.namespace)
|
context.control_plane.get_or_create_namespace(organization.namespace)
|
||||||
|
try:
|
||||||
|
instance = cls.objects.create(
|
||||||
|
name=name,
|
||||||
|
organization=organization,
|
||||||
|
created_by=created_by,
|
||||||
|
context=context,
|
||||||
|
)
|
||||||
|
except IntegrityError:
|
||||||
|
raise ValidationError(
|
||||||
|
_(
|
||||||
|
"An instance with this name already exists in this organization. Please choose a different name."
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
group = context.service_definition.api_definition["group"]
|
group = context.service_definition.api_definition["group"]
|
||||||
version = context.service_definition.api_definition["version"]
|
version = context.service_definition.api_definition["version"]
|
||||||
kind = context.service_definition.api_definition["kind"]
|
kind = context.service_definition.api_definition["kind"]
|
||||||
|
@ -506,7 +522,9 @@ class ServiceInstance(ServalaModelMixin, models.Model):
|
||||||
"spec": spec_data or {},
|
"spec": spec_data or {},
|
||||||
}
|
}
|
||||||
if label := context.control_plane.required_label:
|
if label := context.control_plane.required_label:
|
||||||
create_data["metadata"]["labels"] = {settings.DEFAULT_LABEL_KEY: label}
|
create_data["metadata"]["labels"] = [
|
||||||
|
{settings.DEFAULT_LABEL_KEY: label}
|
||||||
|
]
|
||||||
api_instance = client.CustomObjectsApi(
|
api_instance = client.CustomObjectsApi(
|
||||||
context.control_plane.get_kubernetes_client()
|
context.control_plane.get_kubernetes_client()
|
||||||
)
|
)
|
||||||
|
@ -521,10 +539,14 @@ class ServiceInstance(ServalaModelMixin, models.Model):
|
||||||
plural=plural,
|
plural=plural,
|
||||||
body=create_data,
|
body=create_data,
|
||||||
)
|
)
|
||||||
|
except Exception as e:
|
||||||
return cls.objects.create(
|
instance.delete()
|
||||||
name=name,
|
if isinstance(e, ApiException):
|
||||||
organization=organization,
|
try:
|
||||||
created_by=created_by,
|
error_body = json.loads(e.body)
|
||||||
context=context,
|
reason = error_body.get("message", str(e))
|
||||||
)
|
raise ValidationError(_("Kubernetes API error: {}").format(reason))
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
raise ValidationError(_("Kubernetes API error: {}").format(str(e)))
|
||||||
|
raise ValidationError(_("Error creating instance: {}").format(str(e)))
|
||||||
|
return instance
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
|
from django.core.exceptions import ValidationError
|
||||||
from django.shortcuts import redirect
|
from django.shortcuts import redirect
|
||||||
from django.utils.functional import cached_property
|
from django.utils.functional import cached_property
|
||||||
from django.views.generic import DetailView, ListView
|
from django.views.generic import DetailView, ListView
|
||||||
|
@ -134,6 +135,8 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView
|
||||||
spec_data=form.get_nested_data().get("spec"),
|
spec_data=form.get_nested_data().get("spec"),
|
||||||
)
|
)
|
||||||
return redirect(service_instance.urls.base)
|
return redirect(service_instance.urls.base)
|
||||||
|
except ValidationError as e:
|
||||||
|
messages.error(self.request, e.message or str(e))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
messages.error(self.request, str(e))
|
messages.error(self.request, str(e))
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue