servala/servala-portal
3
0
Fork 0
Code Issues 23 Pull requests 1 Projects 1 Releases Packages 2 Activity Actions

Improve display of kubernetes errors
All checks were successful
Tests / test (push) Successful in 23s
Details

Browse source
This commit is contained in:
Tobias Kunze 2025-04-03 18:01:15 +02:00
parent fb5a6e9a42
commit 4d13d71953
2 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/servala/core/models/service.py
View file

@ -1,3 +1,5 @@
import json
import kubernetes import kubernetes
import urlman import urlman
from django.conf import settings from django.conf import settings
@ -506,32 +508,45 @@ class ServiceInstance(ServalaModelMixin, models.Model):
) )
) )
group = context.service_definition.api_definition["group"] try:
version = context.service_definition.api_definition["version"] group = context.service_definition.api_definition["group"]
kind = context.service_definition.api_definition["kind"] version = context.service_definition.api_definition["version"]
create_data = { kind = context.service_definition.api_definition["kind"]
"apiVersion": f"{group}/{version}", create_data = {
"kind": kind, "apiVersion": f"{group}/{version}",
"metadata": { "kind": kind,
"name": name, "metadata": {
"namespace": organization.namespace, "name": name,
}, "namespace": organization.namespace,
"spec": spec_data or {}, },
} "spec": spec_data or {},
if label := context.control_plane.required_label: }
create_data["metadata"]["labels"] = {settings.DEFAULT_LABEL_KEY: label} if label := context.control_plane.required_label:
api_instance = client.CustomObjectsApi( create_data["metadata"]["labels"] = [
context.control_plane.get_kubernetes_client() {settings.DEFAULT_LABEL_KEY: label}
) ]
plural = kind.lower() api_instance = client.CustomObjectsApi(
if not plural.endswith("s"): context.control_plane.get_kubernetes_client()
plural = f"{plural}s" )
plural = kind.lower()
if not plural.endswith("s"):
plural = f"{plural}s"
api_instance.create_namespaced_custom_object( api_instance.create_namespaced_custom_object(
group=group, group=group,
version=version, version=version,
namespace=organization.namespace, namespace=organization.namespace,
plural=plural, plural=plural,
body=create_data, body=create_data,
) )
except Exception as e:
instance.delete()
if isinstance(e, ApiException):
try:
error_body = json.loads(e.body)
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 return instance

6
src/servala/frontend/views/service.py
View file

@ -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,9 +135,10 @@ 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:
error_message = getattr(e, "message", None) or str(e) messages.error(self.request, str(e))
messages.error(self.request, error_message)
# If the form is not valid or if the service creation failed, we render it again # If the form is not valid or if the service creation failed, we render it again
context["service_form"] = form context["service_form"] = form