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

Jump to bottom

Add pod name and namespace to pod related events. #578

Merged
merged 3 commits into from
May 20, 2021
Merged

Add pod name and namespace to pod related events. #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
526552c
Add pod name and namespace to pod related events.
jankaspar May 20, 2021
01f8444
Add generated .net client with new event properties.
jankaspar May 20, 2021
6714e67
Merge branch 'master' into pod-info-in-events
jankaspar May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 48 additions & 0 deletions client/DotNet/Armada.Client/ClientGenerated.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,12 @@ public partial class ApiJobFailedEvent
[Newtonsoft.Json.JsonProperty("nodeName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string NodeName { get; set; }

[Newtonsoft.Json.JsonProperty("podName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodName { get; set; }

[Newtonsoft.Json.JsonProperty("podNamespace", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodNamespace { get; set; }

[Newtonsoft.Json.JsonProperty("podNumber", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public int? PodNumber { get; set; }

Expand Down Expand Up @@ -882,6 +888,12 @@ public partial class ApiJobIngressInfoEvent
[Newtonsoft.Json.JsonProperty("nodeName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string NodeName { get; set; }

[Newtonsoft.Json.JsonProperty("podName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodName { get; set; }

[Newtonsoft.Json.JsonProperty("podNamespace", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodNamespace { get; set; }

[Newtonsoft.Json.JsonProperty("podNumber", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public int? PodNumber { get; set; }

Expand Down Expand Up @@ -972,6 +984,12 @@ public partial class ApiJobPendingEvent
[Newtonsoft.Json.JsonProperty("kubernetesId", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string KubernetesId { get; set; }

[Newtonsoft.Json.JsonProperty("podName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodName { get; set; }

[Newtonsoft.Json.JsonProperty("podNamespace", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodNamespace { get; set; }

[Newtonsoft.Json.JsonProperty("podNumber", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public int? PodNumber { get; set; }

Expand Down Expand Up @@ -1038,6 +1056,12 @@ public partial class ApiJobRunningEvent
[Newtonsoft.Json.JsonProperty("nodeName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string NodeName { get; set; }

[Newtonsoft.Json.JsonProperty("podName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodName { get; set; }

[Newtonsoft.Json.JsonProperty("podNamespace", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodNamespace { get; set; }

[Newtonsoft.Json.JsonProperty("podNumber", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public int? PodNumber { get; set; }

Expand Down Expand Up @@ -1191,6 +1215,12 @@ public partial class ApiJobSucceededEvent
[Newtonsoft.Json.JsonProperty("nodeName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string NodeName { get; set; }

[Newtonsoft.Json.JsonProperty("podName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodName { get; set; }

[Newtonsoft.Json.JsonProperty("podNamespace", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodNamespace { get; set; }

[Newtonsoft.Json.JsonProperty("podNumber", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public int? PodNumber { get; set; }

Expand Down Expand Up @@ -1218,6 +1248,12 @@ public partial class ApiJobTerminatedEvent
[Newtonsoft.Json.JsonProperty("kubernetesId", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string KubernetesId { get; set; }

[Newtonsoft.Json.JsonProperty("podName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodName { get; set; }

[Newtonsoft.Json.JsonProperty("podNamespace", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodNamespace { get; set; }

[Newtonsoft.Json.JsonProperty("podNumber", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public int? PodNumber { get; set; }

Expand Down Expand Up @@ -1251,6 +1287,12 @@ public partial class ApiJobUnableToScheduleEvent
[Newtonsoft.Json.JsonProperty("nodeName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string NodeName { get; set; }

[Newtonsoft.Json.JsonProperty("podName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodName { get; set; }

[Newtonsoft.Json.JsonProperty("podNamespace", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodNamespace { get; set; }

[Newtonsoft.Json.JsonProperty("podNumber", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public int? PodNumber { get; set; }

Expand Down Expand Up @@ -1287,6 +1329,12 @@ public partial class ApiJobUtilisationEvent
[Newtonsoft.Json.JsonProperty("nodeName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string NodeName { get; set; }

[Newtonsoft.Json.JsonProperty("podName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodName { get; set; }

[Newtonsoft.Json.JsonProperty("podNamespace", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public string PodNamespace { get; set; }

[Newtonsoft.Json.JsonProperty("podNumber", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
public int? PodNumber { get; set; }

Expand Down
16 changes: 16 additions & 0 deletions internal/executor/reporter/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ func CreateEventForCurrentState(pod *v1.Pod, clusterId string) (api.Event, error
ClusterId: clusterId,
KubernetesId: string(pod.ObjectMeta.UID),
PodNumber: getPodNumber(pod),
PodName: pod.Name,
PodNamespace: pod.Namespace,
}, nil
case v1.PodRunning:
return &api.JobRunningEvent{
Expand All @@ -37,6 +39,8 @@ func CreateEventForCurrentState(pod *v1.Pod, clusterId string) (api.Event, error
ClusterId: clusterId,
KubernetesId: string(pod.ObjectMeta.UID),
PodNumber: getPodNumber(pod),
PodName: pod.Name,
PodNamespace: pod.Namespace,
NodeName: pod.Spec.NodeName,
}, nil
case v1.PodFailed:
Expand All @@ -56,6 +60,8 @@ func CreateEventForCurrentState(pod *v1.Pod, clusterId string) (api.Event, error
ClusterId: clusterId,
KubernetesId: string(pod.ObjectMeta.UID),
PodNumber: getPodNumber(pod),
PodName: pod.Name,
PodNamespace: pod.Namespace,
NodeName: pod.Spec.NodeName,
}, nil
default:
Expand All @@ -82,6 +88,8 @@ func CreateJobUnableToScheduleEvent(pod *v1.Pod, reason string, clusterId string
Reason: reason,
KubernetesId: string(pod.ObjectMeta.UID),
PodNumber: getPodNumber(pod),
PodName: pod.Name,
PodNamespace: pod.Namespace,
NodeName: pod.Spec.NodeName,
}
}
Expand Down Expand Up @@ -118,6 +126,8 @@ func CreateJobIngressInfoEvent(pod *v1.Pod, clusterId string, associatedService
ClusterId: clusterId,
KubernetesId: string(pod.ObjectMeta.UID),
PodNumber: getPodNumber(pod),
PodName: pod.Name,
PodNamespace: pod.Namespace,
NodeName: pod.Spec.NodeName,
IngressAddresses: containerPortMapping,
}, nil
Expand All @@ -139,6 +149,8 @@ func CreateJobFailedEvent(pod *v1.Pod, reason string, cause api.Cause, container
ExitCodes: exitCodes,
KubernetesId: string(pod.ObjectMeta.UID),
PodNumber: getPodNumber(pod),
PodName: pod.Name,
PodNamespace: pod.Namespace,
NodeName: pod.Spec.NodeName,
ContainerStatuses: containerStatuses,
Cause: cause,
Expand All @@ -155,6 +167,8 @@ func CreateJobUtilisationEvent(pod *v1.Pod, maxResources common.ComputeResources
MaxResourcesForPeriod: maxResources,
KubernetesId: string(pod.ObjectMeta.UID),
PodNumber: getPodNumber(pod),
PodName: pod.Name,
PodNamespace: pod.Namespace,
NodeName: pod.Spec.NodeName,
}
}
Expand All @@ -168,6 +182,8 @@ func CreateJobTerminatedEvent(pod *v1.Pod, reason string, clusterId string) api.
ClusterId: clusterId,
KubernetesId: string(pod.ObjectMeta.UID),
PodNumber: getPodNumber(pod),
PodName: pod.Name,
PodNamespace: pod.Namespace,
Reason: reason,
}
}
48 changes: 48 additions & 0 deletions pkg/api/api.swagger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,12 @@ func SwaggerJsonTemplate() string {
" \"nodeName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNamespace\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNumber\": {\n" +
" \"type\": \"integer\",\n" +
" \"format\": \"int32\"\n" +
Expand Down Expand Up @@ -581,6 +587,12 @@ func SwaggerJsonTemplate() string {
" \"nodeName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNamespace\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNumber\": {\n" +
" \"type\": \"integer\",\n" +
" \"format\": \"int32\"\n" +
Expand Down Expand Up @@ -672,6 +684,12 @@ func SwaggerJsonTemplate() string {
" \"kubernetesId\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNamespace\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNumber\": {\n" +
" \"type\": \"integer\",\n" +
" \"format\": \"int32\"\n" +
Expand Down Expand Up @@ -739,6 +757,12 @@ func SwaggerJsonTemplate() string {
" \"nodeName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNamespace\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNumber\": {\n" +
" \"type\": \"integer\",\n" +
" \"format\": \"int32\"\n" +
Expand Down Expand Up @@ -914,6 +938,12 @@ func SwaggerJsonTemplate() string {
" \"nodeName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNamespace\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNumber\": {\n" +
" \"type\": \"integer\",\n" +
" \"format\": \"int32\"\n" +
Expand Down Expand Up @@ -942,6 +972,12 @@ func SwaggerJsonTemplate() string {
" \"kubernetesId\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNamespace\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNumber\": {\n" +
" \"type\": \"integer\",\n" +
" \"format\": \"int32\"\n" +
Expand Down Expand Up @@ -976,6 +1012,12 @@ func SwaggerJsonTemplate() string {
" \"nodeName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNamespace\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNumber\": {\n" +
" \"type\": \"integer\",\n" +
" \"format\": \"int32\"\n" +
Expand Down Expand Up @@ -1016,6 +1058,12 @@ func SwaggerJsonTemplate() string {
" \"nodeName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podName\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNamespace\": {\n" +
" \"type\": \"string\"\n" +
" },\n" +
" \"podNumber\": {\n" +
" \"type\": \"integer\",\n" +
" \"format\": \"int32\"\n" +
Expand Down
48 changes: 48 additions & 0 deletions pkg/api/api.swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,12 @@
"nodeName": {
"type": "string"
},
"podName": {
"type": "string"
},
"podNamespace": {
"type": "string"
},
"podNumber": {
"type": "integer",
"format": "int32"
Expand Down Expand Up @@ -570,6 +576,12 @@
"nodeName": {
"type": "string"
},
"podName": {
"type": "string"
},
"podNamespace": {
"type": "string"
},
"podNumber": {
"type": "integer",
"format": "int32"
Expand Down Expand Up @@ -661,6 +673,12 @@
"kubernetesId": {
"type": "string"
},
"podName": {
"type": "string"
},
"podNamespace": {
"type": "string"
},
"podNumber": {
"type": "integer",
"format": "int32"
Expand Down Expand Up @@ -728,6 +746,12 @@
"nodeName": {
"type": "string"
},
"podName": {
"type": "string"
},
"podNamespace": {
"type": "string"
},
"podNumber": {
"type": "integer",
"format": "int32"
Expand Down Expand Up @@ -903,6 +927,12 @@
"nodeName": {
"type": "string"
},
"podName": {
"type": "string"
},
"podNamespace": {
"type": "string"
},
"podNumber": {
"type": "integer",
"format": "int32"
Expand Down Expand Up @@ -931,6 +961,12 @@
"kubernetesId": {
"type": "string"
},
"podName": {
"type": "string"
},
"podNamespace": {
"type": "string"
},
"podNumber": {
"type": "integer",
"format": "int32"
Expand Down Expand Up @@ -965,6 +1001,12 @@
"nodeName": {
"type": "string"
},
"podName": {
"type": "string"
},
"podNamespace": {
"type": "string"
},
"podNumber": {
"type": "integer",
"format": "int32"
Expand Down Expand Up @@ -1005,6 +1047,12 @@
"nodeName": {
"type": "string"
},
"podName": {
"type": "string"
},
"podNamespace": {
"type": "string"
},
"podNumber": {
"type": "integer",
"format": "int32"
Expand Down