From a698d4b0ec71fcf567452a053ead5a83456c236c Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Tue, 9 Dec 2025 15:53:16 +0100
Subject: [PATCH] Show k8s event on instance page

---
 src/servala/core/models/service.py            | 45 +++++++++++++++++++
 .../service_instance_detail.html              | 45 +++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/src/servala/core/models/service.py b/src/servala/core/models/service.py
index c2fedad..31527c5 100644
--- a/src/servala/core/models/service.py
+++ b/src/servala/core/models/service.py
@@ -1202,5 +1202,50 @@ class ServiceInstance(ServalaModelMixin, models.Model):
         except (AttributeError, KeyError, IndexError):
             return None
 
+    @cached_property
+    def kubernetes_events(self) -> dict:
+        """
+        Returns a list of event dictionaries sorted by last timestamp (newest first).
+        """
+        if not self.kubernetes_object:
+            return []
+
+        try:
+            v1 = kubernetes.client.CoreV1Api(
+                self.context.control_plane.get_kubernetes_client()
+            )
+            events = v1.list_namespaced_event(
+                namespace=self.organization.namespace,
+                field_selector=f"involvedObject.name={self.name},involvedObject.kind={self.context.kind}",
+            )
+            event_list = []
+            for event in events.items:
+                event_dict = {
+                    "type": event.type,  # Normal or Warning
+                    "reason": event.reason,
+                    "message": event.message,
+                    "count": event.count or 1,
+                    "first_timestamp": (
+                        event.first_timestamp.isoformat()
+                        if event.first_timestamp
+                        else None
+                    ),
+                    "last_timestamp": (
+                        event.last_timestamp.isoformat()
+                        if event.last_timestamp
+                        else None
+                    ),
+                    "source": event.source.component if event.source else None,
+                }
+                event_list.append(event_dict)
+
+            event_list.sort(key=lambda x: x.get("last_timestamp") or "", reverse=True)
+
+            return event_list
+        except ApiException:
+            return []
+        except Exception:
+            return []
+
 
 auditlog.register(ServiceInstance, exclude_fields=["updated_at"], serialize_data=True)
diff --git a/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html b/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html
index 06ef5df..dc6f1e3 100644
--- a/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html
+++ b/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html
@@ -148,6 +148,51 @@
                         </div>
                     </div>
                 {% endif %}
+                {% if instance.kubernetes_events %}
+                    <div class="card">
+                        <div class="card-header">
+                            <h4>{% translate "Events" %}</h4>
+                        </div>
+                        <div class="card-body">
+                            <div class="row">
+                                <div class="table-responsive">
+                                    <table class="table table-bordered table-sm">
+                                        <thead>
+                                            <tr>
+                                                <th style="width: 80px;">{% translate "Type" %}</th>
+                                                <th style="width: 150px;">{% translate "Reason" %}</th>
+                                                <th>{% translate "Message" %}</th>
+                                                <th style="width: 60px;">{% translate "Count" %}</th>
+                                                <th style="width: 180px;">{% translate "Last Seen" %}</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            {% for event in instance.kubernetes_events %}
+                                                <tr>
+                                                    <td>
+                                                        {% if event.type == "Warning" %}
+                                                            <span class="badge text-bg-warning">{{ event.type }}</span>
+                                                        {% elif event.type == "Normal" %}
+                                                            <span class="badge text-bg-success">{{ event.type }}</span>
+                                                        {% else %}
+                                                            <span class="badge text-bg-secondary">{{ event.type }}</span>
+                                                        {% endif %}
+                                                    </td>
+                                                    <td>{{ event.reason|default:"-" }}</td>
+                                                    <td>
+                                                        <span class="text-break">{{ event.message|default:"-"|truncatewords:50 }}</span>
+                                                    </td>
+                                                    <td class="text-center">{{ event.count }}</td>
+                                                    <td>{{ event.last_timestamp|localtime_tag }}</td>
+                                                </tr>
+                                            {% endfor %}
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
             </div>
             {% if instance.spec and spec_fieldsets %}
                 <div class="col-12">