Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复 k8s event 可能缺少字段导致获取 event 报错 #1414

Merged
merged 5 commits into from
Jun 20, 2024
Merged

fix: 修复 k8s event 可能缺少字段导致获取 event 报错 #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66b681c
fix: 修复 k8s event 无 count 字段报错
SheepSheepChen Jun 19, 2024
3f6f415
fix: 修复 k8s event 无 count 字段报错
SheepSheepChen Jun 20, 2024
441565c
fix: 修复 k8s event 无 count 字段报错
SheepSheepChen Jun 20, 2024
6985ea9
Merge remote-tracking branch 'upstream/main' into event_fix
SheepSheepChen Jun 20, 2024
139aba8
fix: 修复 k8s event 可能缺少字段导致获取 event 报错
SheepSheepChen Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apiserver/paasng/paas_wl/bk_app/processes/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ class InstanceListSLZ(serializers.Serializer):


class EventSerializer(serializers.Serializer):
reason = serializers.CharField(help_text="事件发生的原因")
reason = serializers.CharField(help_text="事件发生的原因", required=False, allow_null=True)
count = serializers.IntegerField(help_text="事件发生的次数")
type = serializers.CharField(help_text="事件的类型")
message = serializers.CharField(help_text="事件内容")
first_timestamp = serializers.CharField()
last_timestamp = serializers.CharField()
type = serializers.CharField(help_text="事件的类型", required=False, allow_null=True)
message = serializers.CharField(help_text="事件内容", required=False, allow_null=True)
first_timestamp = serializers.CharField(required=False, allow_null=True)
last_timestamp = serializers.CharField(required=False, allow_null=True)


class ListWatcherRespSLZ(serializers.Serializer):
Expand Down
26 changes: 13 additions & 13 deletions apiserver/paasng/paas_wl/workloads/event/kres_slzs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,26 @@

class EventDeserializer(AppEntityDeserializer["Event"]):
def deserialize(self, app: WlApp, kube_data: ResourceInstance) -> "Event":
involved_object = kube_data.involvedObject
involved_object = kube_data.get("involvedObject", {})
return self.entity_type(
app=app,
name=kube_data.metadata.name,
type=kube_data.type,
message=kube_data.message,
reason=kube_data.reason,
name=kube_data.get("metadata", {}).get("name", None),
type=kube_data.get("type", None),
message=kube_data.get("message", None),
reason=kube_data.get("reason", None),
# k8s 产生事件时，不写入 count 字段是否代表事件发生一次，待验证
count=kube_data.get("count", 1),
first_timestamp=kube_data.firstTimestamp,
last_timestamp=kube_data.lastTimestamp,
first_timestamp=kube_data.get("firstTimestamp", None),
last_timestamp=kube_data.get("lastTimestamp", None),
involved_object=InvolvedObject(
kind=involved_object.kind,
name=involved_object.name,
namespace=getattr(involved_object, "namespace", None),
api_version=involved_object.apiVersion,
kind=involved_object.get("kind", None),
name=involved_object.get("name", None),
namespace=involved_object.get("namespace", None),
api_version=involved_object.get("apiVersion", None),
),
source=Source(
component=kube_data.source.component,
host=getattr(kube_data.source, "host", None),
component=kube_data.get("source", {}).get("component", None),
host=kube_data.get("source", {}).get("host", None),
),
)

Expand Down