From 761f2ad4329fcb8ef86797997f2a8b5fe5368e70 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Thu, 24 Oct 2019 08:47:34 -0400 Subject: [PATCH] Add container ready count before total count This emulates the output of kubectl get pods. Change-Id: I491c6f1c988dcd1d261f3760b9b2635ede160935 Signed-off-by: Lott, Christopher (cl778h) --- docs/release-notes.rst | 3 +- .../test/resources/caas-ingress-ricplt-pods.json | 888 +++++++++++++++------ .../app/caas-ingress/caas-ingress.component.html | 2 +- .../app/caas-ingress/caas-ingress.datasource.ts | 6 +- 4 files changed, 653 insertions(+), 246 deletions(-) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index e4898f84..19a9e55b 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -19,7 +19,7 @@ RIC Dashboard Release Notes =========================== -Version 1.2.4, 23 Oct 2019 +Version 1.2.4, 24 Oct 2019 -------------------------- * Revise a1-med-client to use API spec in new submodule ric-plt/a1; removed cached copy @@ -34,6 +34,7 @@ Version 1.2.4, 23 Oct 2019 * Make constructor robust to missing caasingress.insecure property * Repair bug that omitted slashes in CAAS-Ingress URL builder * Improve the dark mode +* Show container ready count with total count Version 1.2.3, 4 Oct 2019 ------------------------- diff --git a/webapp-backend/src/test/resources/caas-ingress-ricplt-pods.json b/webapp-backend/src/test/resources/caas-ingress-ricplt-pods.json index 4591f540..cf9c1a03 100644 --- a/webapp-backend/src/test/resources/caas-ingress-ricplt-pods.json +++ b/webapp-backend/src/test/resources/caas-ingress-ricplt-pods.json @@ -3,21 +3,22 @@ "apiVersion": "v1", "metadata": { "selfLink": "/api/v1/namespaces/ricplt/pods", - "resourceVersion": "2736817" + "resourceVersion": "3189380" }, "items": [ { "metadata": { - "name": "deployment-ricplt-a1mediator-784c66f6cf-r624q", - "generateName": "deployment-ricplt-a1mediator-784c66f6cf-", + "name": "deployment-ricplt-a1mediator-74d9fc4c8c-77vtp", + "generateName": "deployment-ricplt-a1mediator-74d9fc4c8c-", "namespace": "ricplt", - "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-a1mediator-784c66f6cf-r624q", - "uid": "60e5f2c5-283b-4559-9b42-ff380332d649", - "resourceVersion": "211336", - "creationTimestamp": "2019-10-01T18:54:51Z", + "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-a1mediator-74d9fc4c8c-77vtp", + "uid": "487c582d-36d6-406a-92a3-bfbce04b83de", + "resourceVersion": "2945631", + "creationTimestamp": "2019-10-18T16:15:04Z", "labels": { "app": "ricplt-a1mediator", - "pod-template-hash": "784c66f6cf", + "group": "nagios", + "pod-template-hash": "74d9fc4c8c", "release": "r1-a1mediator" }, "annotations": { @@ -27,8 +28,8 @@ { "apiVersion": "apps/v1", "kind": "ReplicaSet", - "name": "deployment-ricplt-a1mediator-784c66f6cf", - "uid": "608fcde7-871f-4689-852d-b272419bca8e", + "name": "deployment-ricplt-a1mediator-74d9fc4c8c", + "uid": "84ef8695-3eb2-4dcd-b214-9d00ab5fb6b3", "controller": true, "blockOwnerDeletion": true } @@ -44,9 +45,9 @@ } }, { - "name": "default-token-l8tqd", + "name": "default-token-5j24g", "secret": { - "secretName": "default-token-l8tqd", + "secretName": "default-token-5j24g", "defaultMode": 420 } } @@ -99,7 +100,7 @@ "subPath": "local.rt" }, { - "name": "default-token-l8tqd", + "name": "default-token-5j24g", "readOnly": true, "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" } @@ -136,7 +137,7 @@ "dnsPolicy": "ClusterFirst", "serviceAccountName": "default", "serviceAccount": "default", - "nodeName": "192.168.1.201", + "nodeName": "172.29.16.202", "securityContext": { }, @@ -156,36 +157,41 @@ "type": "Initialized", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:51Z" + "lastTransitionTime": "2019-10-18T16:15:04Z" }, { "type": "Ready", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:55:01Z" + "lastTransitionTime": "2019-10-18T16:15:09Z" }, { "type": "ContainersReady", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:55:01Z" + "lastTransitionTime": "2019-10-18T16:15:09Z" }, { "type": "PodScheduled", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:51Z" + "lastTransitionTime": "2019-10-18T16:15:04Z" } ], - "hostIP": "192.168.1.201", - "podIP": "10.0.0.27", - "startTime": "2019-10-01T18:54:51Z", + "hostIP": "172.29.16.202", + "podIP": "10.244.4.71", + "podIPs": [ + { + "ip": "10.244.4.71" + } + ], + "startTime": "2019-10-18T16:15:04Z", "containerStatuses": [ { "name": "container-ricplt-a1mediator", "state": { "running": { - "startedAt": "2019-10-01T18:54:53Z" + "startedAt": "2019-10-18T16:15:05Z" } }, "lastState": { @@ -193,9 +199,10 @@ }, "ready": true, "restartCount": 0, - "image": "ranco-dev-tools.o-ran-sc.org:10001/ric-plt-a1:0.10.3", + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-a1:0.10.3", "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-a1@sha256:64a61ed84d4d05dfa1690bb45949da333d7b088e2e12dbba0ce60c06445f52cb", - "containerID": "docker://dc2998415a45cd65192601ba32b0c51ed29280431524812541abb70d016d49c4" + "containerID": "docker://07ceed10ee2a4413c167951e458b59a505a073cce82ac543146e58b698489d59", + "started": true } ], "qosClass": "BestEffort" @@ -203,16 +210,17 @@ }, { "metadata": { - "name": "deployment-ricplt-appmgr-64c8b955b4-d7mbb", - "generateName": "deployment-ricplt-appmgr-64c8b955b4-", + "name": "deployment-ricplt-appmgr-6ccf55b98b-kbkt4", + "generateName": "deployment-ricplt-appmgr-6ccf55b98b-", "namespace": "ricplt", - "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-appmgr-64c8b955b4-d7mbb", - "uid": "7f7e14de-7ded-42d1-bac5-94a7b455c777", - "resourceVersion": "211158", - "creationTimestamp": "2019-10-01T18:54:48Z", + "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-appmgr-6ccf55b98b-kbkt4", + "uid": "4e084e8a-eb0a-4ea2-9cc1-7f812cd6bb28", + "resourceVersion": "2945633", + "creationTimestamp": "2019-10-18T16:15:01Z", "labels": { "app": "ricplt-appmgr", - "pod-template-hash": "64c8b955b4", + "group": "nagios", + "pod-template-hash": "6ccf55b98b", "release": "r1-appmgr" }, "annotations": { @@ -222,8 +230,8 @@ { "apiVersion": "apps/v1", "kind": "ReplicaSet", - "name": "deployment-ricplt-appmgr-64c8b955b4", - "uid": "b88c3af6-03aa-4d6b-8470-a72361117b46", + "name": "deployment-ricplt-appmgr-6ccf55b98b", + "uid": "a169ebc4-9b7c-4b8d-81ed-6364e07df24e", "controller": true, "blockOwnerDeletion": true } @@ -266,9 +274,9 @@ } }, { - "name": "svcacct-ricplt-appmgr-token-cjw9h", + "name": "svcacct-ricplt-appmgr-token-kclzw", "secret": { - "secretName": "svcacct-ricplt-appmgr-token-cjw9h", + "secretName": "svcacct-ricplt-appmgr-token-kclzw", "defaultMode": 420 } } @@ -332,7 +340,7 @@ "subPath": "appmgr-tiller-secret-copier.sh" }, { - "name": "svcacct-ricplt-appmgr-token-cjw9h", + "name": "svcacct-ricplt-appmgr-token-kclzw", "readOnly": true, "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" } @@ -398,7 +406,7 @@ "subPath": "helm_repo_password" }, { - "name": "svcacct-ricplt-appmgr-token-cjw9h", + "name": "svcacct-ricplt-appmgr-token-kclzw", "readOnly": true, "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" } @@ -413,7 +421,7 @@ "dnsPolicy": "ClusterFirst", "serviceAccountName": "svcacct-ricplt-appmgr", "serviceAccount": "svcacct-ricplt-appmgr", - "nodeName": "192.168.1.201", + "nodeName": "172.29.16.203", "securityContext": { }, @@ -433,30 +441,35 @@ "type": "Initialized", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:50Z" + "lastTransitionTime": "2019-10-18T16:15:03Z" }, { "type": "Ready", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:51Z" + "lastTransitionTime": "2019-10-18T16:15:04Z" }, { "type": "ContainersReady", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:51Z" + "lastTransitionTime": "2019-10-18T16:15:04Z" }, { "type": "PodScheduled", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:48Z" + "lastTransitionTime": "2019-10-18T16:15:01Z" + } + ], + "hostIP": "172.29.16.203", + "podIP": "10.244.3.252", + "podIPs": [ + { + "ip": "10.244.3.252" } ], - "hostIP": "192.168.1.201", - "podIP": "10.0.0.26", - "startTime": "2019-10-01T18:54:48Z", + "startTime": "2019-10-18T16:15:01Z", "initContainerStatuses": [ { "name": "container-ricplt-appmgr-copy-tiller-secret", @@ -464,9 +477,9 @@ "terminated": { "exitCode": 0, "reason": "Completed", - "startedAt": "2019-10-01T18:54:49Z", - "finishedAt": "2019-10-01T18:54:49Z", - "containerID": "docker://d806f7bf7d66a0b3d9cdbcba1f777c9928ae0751783b06450b5f72e383adf3aa" + "startedAt": "2019-10-18T16:15:02Z", + "finishedAt": "2019-10-18T16:15:02Z", + "containerID": "docker://130db0adfad526204726bf11fe24741d94f11f39f97f0d826b066ec852e5a452" } }, "lastState": { @@ -474,9 +487,9 @@ }, "ready": true, "restartCount": 0, - "image": "ranco-dev-tools.o-ran-sc.org:10001/it-dep-init:0.0.1", + "image": "registry.kube-system.svc.rec.io:5555/ric/it-dep-init:0.0.1", "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/it-dep-init@sha256:d3a2c02660a0b5da5a7e38626c49018ca7f5e3bc39106b0728ff72245cd20be5", - "containerID": "docker://d806f7bf7d66a0b3d9cdbcba1f777c9928ae0751783b06450b5f72e383adf3aa" + "containerID": "docker://130db0adfad526204726bf11fe24741d94f11f39f97f0d826b066ec852e5a452" } ], "containerStatuses": [ @@ -484,7 +497,7 @@ "name": "container-ricplt-appmgr", "state": { "running": { - "startedAt": "2019-10-01T18:54:50Z" + "startedAt": "2019-10-18T16:15:03Z" } }, "lastState": { @@ -492,9 +505,10 @@ }, "ready": true, "restartCount": 0, - "image": "ranco-dev-tools.o-ran-sc.org:10001/ric-plt-appmgr:0.1.9", + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-appmgr:0.1.9", "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-appmgr@sha256:5c076f702d570b385d10200cda8d504475ce44eb1bcbb131b1d50e00eabae4d7", - "containerID": "docker://8196d695481d8cacf25f68480ec47a368f9d61917d83a29d6886276606df384f" + "containerID": "docker://791f455c1974a100aaa09ab0a290e438d75aa1c3aadcb717c42d53e02cdedb83", + "started": true } ], "qosClass": "BestEffort" @@ -502,16 +516,17 @@ }, { "metadata": { - "name": "deployment-ricplt-dbaas-9f976d6bb-wwkvq", - "generateName": "deployment-ricplt-dbaas-9f976d6bb-", + "name": "deployment-ricplt-dbaas-d4c9f7b88-7wgb9", + "generateName": "deployment-ricplt-dbaas-d4c9f7b88-", "namespace": "ricplt", - "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-dbaas-9f976d6bb-wwkvq", - "uid": "4ab2084c-317f-4cef-bb83-24c13f225b62", - "resourceVersion": "211288", - "creationTimestamp": "2019-10-01T18:54:48Z", + "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-dbaas-d4c9f7b88-7wgb9", + "uid": "e54e51fc-c4bd-4308-805e-16c2d588dacd", + "resourceVersion": "2945634", + "creationTimestamp": "2019-10-18T16:15:01Z", "labels": { "app": "ricplt-dbaas", - "pod-template-hash": "9f976d6bb", + "group": "nagios", + "pod-template-hash": "d4c9f7b88", "release": "r1-dbaas" }, "annotations": { @@ -521,8 +536,8 @@ { "apiVersion": "apps/v1", "kind": "ReplicaSet", - "name": "deployment-ricplt-dbaas-9f976d6bb", - "uid": "d151adbb-612c-4044-a6f3-647346a7bc56", + "name": "deployment-ricplt-dbaas-d4c9f7b88", + "uid": "7e8d5d34-efa9-41fe-b92f-d9b71bc40360", "controller": true, "blockOwnerDeletion": true } @@ -531,9 +546,9 @@ "spec": { "volumes": [ { - "name": "default-token-l8tqd", + "name": "default-token-5j24g", "secret": { - "secretName": "default-token-l8tqd", + "secretName": "default-token-5j24g", "defaultMode": 420 } } @@ -554,7 +569,7 @@ }, "volumeMounts": [ { - "name": "default-token-l8tqd", + "name": "default-token-5j24g", "readOnly": true, "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" } @@ -569,7 +584,7 @@ "dnsPolicy": "ClusterFirst", "serviceAccountName": "default", "serviceAccount": "default", - "nodeName": "192.168.1.202", + "nodeName": "172.29.16.202", "securityContext": { }, @@ -588,36 +603,41 @@ "type": "Initialized", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:48Z" + "lastTransitionTime": "2019-10-18T16:15:01Z" }, { "type": "Ready", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:55Z" + "lastTransitionTime": "2019-10-18T16:15:03Z" }, { "type": "ContainersReady", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:55Z" + "lastTransitionTime": "2019-10-18T16:15:03Z" }, { "type": "PodScheduled", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:48Z" + "lastTransitionTime": "2019-10-18T16:15:01Z" } ], - "hostIP": "192.168.1.202", - "podIP": "10.0.0.5", - "startTime": "2019-10-01T18:54:48Z", + "hostIP": "172.29.16.202", + "podIP": "10.244.4.70", + "podIPs": [ + { + "ip": "10.244.4.70" + } + ], + "startTime": "2019-10-18T16:15:01Z", "containerStatuses": [ { "name": "container-ricplt-dbaas", "state": { "running": { - "startedAt": "2019-10-01T18:54:55Z" + "startedAt": "2019-10-18T16:15:02Z" } }, "lastState": { @@ -627,7 +647,8 @@ "restartCount": 0, "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-dbaas:0.1.0", "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-dbaas@sha256:f63cfa353f355155ec6455a68d18c631900a2602bf7cc2ba35d6210971736b76", - "containerID": "docker://dff3e2bec343655c6b2b89e2181c6996c30378084b648e3b786a390b3c45dcf2" + "containerID": "docker://8972d8b61d5c3ff56b50814575647d70fb3307602506cda3e34b6734c28a3f36", + "started": true } ], "qosClass": "BestEffort" @@ -635,16 +656,17 @@ }, { "metadata": { - "name": "deployment-ricplt-e2mgr-585b8c84b6-bst98", - "generateName": "deployment-ricplt-e2mgr-585b8c84b6-", + "name": "deployment-ricplt-e2mgr-86c76477c5-mf5t5", + "generateName": "deployment-ricplt-e2mgr-86c76477c5-", "namespace": "ricplt", - "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-e2mgr-585b8c84b6-bst98", - "uid": "2ea1fbea-9c01-4070-9050-721bcf946f59", - "resourceVersion": "2736606", - "creationTimestamp": "2019-10-01T18:54:49Z", + "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-e2mgr-86c76477c5-mf5t5", + "uid": "5f2231ea-bec0-46fc-a8f8-09b0b80e982f", + "resourceVersion": "2945636", + "creationTimestamp": "2019-10-18T16:15:02Z", "labels": { "app": "ricplt-e2mgr", - "pod-template-hash": "585b8c84b6", + "group": "nagios", + "pod-template-hash": "86c76477c5", "release": "r1-e2mgr" }, "annotations": { @@ -654,8 +676,8 @@ { "apiVersion": "apps/v1", "kind": "ReplicaSet", - "name": "deployment-ricplt-e2mgr-585b8c84b6", - "uid": "62912fb5-b72e-4911-9be7-6ef3010ae73f", + "name": "deployment-ricplt-e2mgr-86c76477c5", + "uid": "f7dfd4a3-4eb3-4c46-a6c8-adc4ae37ef57", "controller": true, "blockOwnerDeletion": true } @@ -671,9 +693,16 @@ } }, { - "name": "default-token-l8tqd", + "name": "local-configuration-file", + "configMap": { + "name": "configmap-ricplt-e2mgr-configuration-configmap", + "defaultMode": 420 + } + }, + { + "name": "default-token-5j24g", "secret": { - "secretName": "default-token-l8tqd", + "secretName": "default-token-5j24g", "defaultMode": 420 } } @@ -681,7 +710,7 @@ "containers": [ { "name": "container-ricplt-e2mgr", - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2mgr:2.0.6.1", + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2mgr:2.0.7", "ports": [ { "name": "http", @@ -716,7 +745,12 @@ "subPath": "router.txt" }, { - "name": "default-token-l8tqd", + "name": "local-configuration-file", + "mountPath": "/opt/E2Manager/resources/configuration.yaml", + "subPath": "configuration.yaml" + }, + { + "name": "default-token-5j24g", "readOnly": true, "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" } @@ -736,7 +770,7 @@ "dnsPolicy": "ClusterFirst", "serviceAccountName": "default", "serviceAccount": "default", - "nodeName": "192.168.1.203", + "nodeName": "172.29.16.204", "securityContext": { }, @@ -750,56 +784,58 @@ "enableServiceLinks": true }, "status": { - "phase": "Pending", + "phase": "Running", "conditions": [ { "type": "Initialized", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:49Z" + "lastTransitionTime": "2019-10-18T16:15:02Z" }, { "type": "Ready", - "status": "False", + "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:49Z", - "reason": "ContainersNotReady", - "message": "containers with unready status: [container-ricplt-e2mgr]" + "lastTransitionTime": "2019-10-18T16:15:05Z" }, { "type": "ContainersReady", - "status": "False", + "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:49Z", - "reason": "ContainersNotReady", - "message": "containers with unready status: [container-ricplt-e2mgr]" + "lastTransitionTime": "2019-10-18T16:15:05Z" }, { "type": "PodScheduled", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:49Z" + "lastTransitionTime": "2019-10-18T16:15:02Z" + } + ], + "hostIP": "172.29.16.204", + "podIP": "10.244.2.100", + "podIPs": [ + { + "ip": "10.244.2.100" } ], - "hostIP": "192.168.1.203", - "podIP": "10.0.0.28", - "startTime": "2019-10-01T18:54:49Z", + "startTime": "2019-10-18T16:15:02Z", "containerStatuses": [ { "name": "container-ricplt-e2mgr", "state": { - "waiting": { - "reason": "ImagePullBackOff", - "message": "Back-off pulling image \"registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2mgr:2.0.6.1\"" + "running": { + "startedAt": "2019-10-18T16:15:04Z" } }, "lastState": { }, - "ready": false, + "ready": true, "restartCount": 0, - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2mgr:2.0.6.1", - "imageID": "" + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2mgr:2.0.7", + "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2mgr@sha256:87fa19a934215bdec71a355ef08eec9e273c992bab80af727f4f1b7a74ebacfa", + "containerID": "docker://ff3a2fcfc72b00e3c317899f2b620da2f65e3de260623daed7825f6a74dbcb5c", + "started": true } ], "qosClass": "BestEffort" @@ -807,16 +843,17 @@ }, { "metadata": { - "name": "deployment-ricplt-e2term-7b9b7bb954-4b9mj", - "generateName": "deployment-ricplt-e2term-7b9b7bb954-", + "name": "deployment-ricplt-e2term-5dcf8b54b-5mkxl", + "generateName": "deployment-ricplt-e2term-5dcf8b54b-", "namespace": "ricplt", - "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-e2term-7b9b7bb954-4b9mj", - "uid": "3afd0a40-d688-42cc-bb64-684aac1a190f", - "resourceVersion": "2736127", - "creationTimestamp": "2019-10-01T18:54:50Z", + "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-e2term-5dcf8b54b-5mkxl", + "uid": "8fae1dcd-5e42-4a66-be6f-e893d5563689", + "resourceVersion": "2945639", + "creationTimestamp": "2019-10-18T16:15:03Z", "labels": { "app": "ricplt-e2term", - "pod-template-hash": "7b9b7bb954", + "group": "nagios", + "pod-template-hash": "5dcf8b54b", "release": "r1-e2term" }, "annotations": { @@ -827,8 +864,8 @@ { "apiVersion": "apps/v1", "kind": "ReplicaSet", - "name": "deployment-ricplt-e2term-7b9b7bb954", - "uid": "180a2dcb-a379-42c5-9664-d008aa25ed6f", + "name": "deployment-ricplt-e2term-5dcf8b54b", + "uid": "cc20b8a0-6d74-4fb9-b384-bdce9c9ae184", "controller": true, "blockOwnerDeletion": true } @@ -844,9 +881,29 @@ } }, { - "name": "default-token-l8tqd", + "name": "localtime", + "hostPath": { + "path": "/etc/localtime", + "type": "" + } + }, + { + "name": "pizpub-config", + "configMap": { + "name": "configmap-ricplt-e2term-pizpub", + "defaultMode": 420 + } + }, + { + "name": "vol-shared", + "persistentVolumeClaim": { + "claimName": "pvc-ricplt-e2term" + } + }, + { + "name": "default-token-5j24g", "secret": { - "secretName": "default-token-l8tqd", + "secretName": "default-token-5j24g", "defaultMode": 420 } } @@ -854,7 +911,7 @@ "containers": [ { "name": "container-ricplt-e2term", - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2:2.0.6.1", + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2:2.0.7.5", "ports": [ { "name": "rmrroute", @@ -884,7 +941,17 @@ "subPath": "router.txt" }, { - "name": "default-token-l8tqd", + "name": "local-router-file", + "mountPath": "/tmp/rmr_verbose", + "subPath": "rmr_verbose" + }, + { + "name": "vol-shared", + "mountPath": "/data/outgoing/", + "subPath": "outgoing" + }, + { + "name": "default-token-5j24g", "readOnly": true, "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" } @@ -897,6 +964,48 @@ }, "stdin": true, "tty": true + }, + { + "name": "container-ricplt-e2term-pizpub", + "image": "registry.kube-system.svc.rec.io:5555/ric/pizpub:0.0.5155", + "resources": { + + }, + "volumeMounts": [ + { + "name": "localtime", + "readOnly": true, + "mountPath": "/etc/localtime" + }, + { + "name": "vol-shared", + "mountPath": "/data" + }, + { + "name": "pizpub-config", + "mountPath": "/opt/app/config/conf/" + }, + { + "name": "default-token-5j24g", + "readOnly": true, + "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" + } + ], + "lifecycle": { + "postStart": { + "exec": { + "command": [ + "/bin/sh", + "/opt/app/config/conf/cleaner.sh", + "/data/sent", + "3" + ] + } + } + }, + "terminationMessagePath": "/dev/termination-log", + "terminationMessagePolicy": "File", + "imagePullPolicy": "Always" } ], "restartPolicy": "Always", @@ -904,7 +1013,7 @@ "dnsPolicy": "ClusterFirstWithHostNet", "serviceAccountName": "default", "serviceAccount": "default", - "nodeName": "192.168.1.204", + "nodeName": "172.29.16.201", "securityContext": { }, @@ -918,56 +1027,75 @@ "enableServiceLinks": true }, "status": { - "phase": "Pending", + "phase": "Running", "conditions": [ { "type": "Initialized", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:50Z" + "lastTransitionTime": "2019-10-18T16:15:22Z" }, { "type": "Ready", - "status": "False", + "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:50Z", - "reason": "ContainersNotReady", - "message": "containers with unready status: [container-ricplt-e2term]" + "lastTransitionTime": "2019-10-18T16:15:33Z" }, { "type": "ContainersReady", - "status": "False", + "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:50Z", - "reason": "ContainersNotReady", - "message": "containers with unready status: [container-ricplt-e2term]" + "lastTransitionTime": "2019-10-18T16:15:33Z" }, { "type": "PodScheduled", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:50Z" + "lastTransitionTime": "2019-10-18T16:15:22Z" } ], - "hostIP": "192.168.1.204", - "podIP": "10.0.0.13", - "startTime": "2019-10-01T18:54:50Z", + "hostIP": "172.29.16.201", + "podIP": "10.244.1.90", + "podIPs": [ + { + "ip": "10.244.1.90" + } + ], + "startTime": "2019-10-18T16:15:22Z", "containerStatuses": [ { "name": "container-ricplt-e2term", "state": { - "waiting": { - "reason": "ImagePullBackOff", - "message": "Back-off pulling image \"registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2:2.0.6.1\"" + "running": { + "startedAt": "2019-10-18T16:15:31Z" + } + }, + "lastState": { + + }, + "ready": true, + "restartCount": 0, + "image": "ranco-dev-tools.eastus.cloudapp.azure.com:10001/ric-plt-e2:2.0.7.5", + "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2@sha256:0ea1a356d018495a93e124ddd793e09626bf6e4d9b96355e731673ef7fab5a1f", + "containerID": "docker://bf9ca87dbad9436b0ed99ffe38036fb49033a9bc2cf2eb548397fbc9c48f1c3d", + "started": true + }, + { + "name": "container-ricplt-e2term-pizpub", + "state": { + "running": { + "startedAt": "2019-10-18T16:15:32Z" } }, "lastState": { }, - "ready": false, + "ready": true, "restartCount": 0, - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-e2:2.0.6.1", - "imageID": "" + "image": "ranco-dev-tools.eastus.cloudapp.azure.com:10001/pizpub:0.0.5155", + "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/pizpub@sha256:138c2d2d25e6528c4a5a8a402c277722d1c1fd4d6792b644967acd538affb1ed", + "containerID": "docker://93e39661623b7afc8156008bb6fbc206458964a6eb0633f80164e4c7ef59fe76", + "started": true } ], "qosClass": "BestEffort" @@ -975,17 +1103,18 @@ }, { "metadata": { - "name": "deployment-ricplt-rtmgr-9df5684bd-zk8vh", - "generateName": "deployment-ricplt-rtmgr-9df5684bd-", + "name": "deployment-ricplt-jaegeradapter-6ff8676c7-m4qkf", + "generateName": "deployment-ricplt-jaegeradapter-6ff8676c7-", "namespace": "ricplt", - "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-rtmgr-9df5684bd-zk8vh", - "uid": "3b473514-81ce-40e0-80f8-5065adaad4a5", - "resourceVersion": "211240", - "creationTimestamp": "2019-10-01T18:54:48Z", + "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-jaegeradapter-6ff8676c7-m4qkf", + "uid": "d6a5e9e9-87d0-4d1e-b1b7-cc1a4f20dc2e", + "resourceVersion": "2945640", + "creationTimestamp": "2019-10-18T16:15:08Z", "labels": { - "app": "ricplt-rtmgr", - "pod-template-hash": "9df5684bd", - "release": "r1-rtmgr" + "app": "ricplt-jaegeradapter", + "group": "nagios", + "pod-template-hash": "6ff8676c7", + "release": "r1-jaegeradapter" }, "annotations": { "kubernetes.io/psp": "caas-default" @@ -994,8 +1123,8 @@ { "apiVersion": "apps/v1", "kind": "ReplicaSet", - "name": "deployment-ricplt-rtmgr-9df5684bd", - "uid": "4cdea1b8-0bfa-4969-9eec-f7d809fd570b", + "name": "deployment-ricplt-jaegeradapter-6ff8676c7", + "uid": "98bc03d7-a082-4ac1-9b89-064022a37dff", "controller": true, "blockOwnerDeletion": true } @@ -1004,35 +1133,242 @@ "spec": { "volumes": [ { - "name": "rtmgrcfg", - "configMap": { - "name": "configmap-ricplt-rtmgr-rtmgrcfg", - "items": [ - { - "key": "rtmgrcfg", - "path": "rtmgr-config.json", - "mode": 420 + "name": "default-token-5j24g", + "secret": { + "secretName": "default-token-5j24g", + "defaultMode": 420 + } + } + ], + "containers": [ + { + "name": "container-ricplt-jaegeradapter", + "image": "registry.kube-system.svc.rec.io:5555/ric/all-in-one:1.12", + "ports": [ + { + "name": "zipkincompact", + "containerPort": 5775, + "protocol": "UDP" + }, + { + "name": "jaegercompact", + "containerPort": 6831, + "protocol": "UDP" + }, + { + "name": "jaegerbinary", + "containerPort": 6832, + "protocol": "UDP" + }, + { + "name": "httpquery", + "containerPort": 16686, + "protocol": "TCP" + }, + { + "name": "httpconfig", + "containerPort": 5778, + "protocol": "TCP" + }, + { + "name": "zipkinhttp", + "containerPort": 9411, + "protocol": "TCP" + }, + { + "name": "jaegerhttp", + "containerPort": 14268, + "protocol": "TCP" + }, + { + "name": "jaegerhttpt", + "containerPort": 14267, + "protocol": "TCP" + } + ], + "envFrom": [ + { + "configMapRef": { + "name": "configmap-ricplt-jaegeradapter" } - ], + } + ], + "resources": { + + }, + "volumeMounts": [ + { + "name": "default-token-5j24g", + "readOnly": true, + "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" + } + ], + "livenessProbe": { + "httpGet": { + "path": "/", + "port": 16686, + "scheme": "HTTP" + }, + "timeoutSeconds": 1, + "periodSeconds": 10, + "successThreshold": 1, + "failureThreshold": 3 + }, + "readinessProbe": { + "httpGet": { + "path": "/", + "port": 16686, + "scheme": "HTTP" + }, + "timeoutSeconds": 1, + "periodSeconds": 10, + "successThreshold": 1, + "failureThreshold": 3 + }, + "terminationMessagePath": "/dev/termination-log", + "terminationMessagePolicy": "File", + "imagePullPolicy": "Always" + } + ], + "restartPolicy": "Always", + "terminationGracePeriodSeconds": 30, + "dnsPolicy": "ClusterFirst", + "serviceAccountName": "default", + "serviceAccount": "default", + "nodeName": "172.29.16.203", + "securityContext": { + + }, + "imagePullSecrets": [ + { + "name": "docker-reg-cred" + } + ], + "hostname": "jaegeradapter", + "schedulerName": "default-scheduler", + "enableServiceLinks": true + }, + "status": { + "phase": "Running", + "conditions": [ + { + "type": "Initialized", + "status": "True", + "lastProbeTime": null, + "lastTransitionTime": "2019-10-18T16:15:08Z" + }, + { + "type": "Ready", + "status": "True", + "lastProbeTime": null, + "lastTransitionTime": "2019-10-18T16:15:15Z" + }, + { + "type": "ContainersReady", + "status": "True", + "lastProbeTime": null, + "lastTransitionTime": "2019-10-18T16:15:15Z" + }, + { + "type": "PodScheduled", + "status": "True", + "lastProbeTime": null, + "lastTransitionTime": "2019-10-18T16:15:08Z" + } + ], + "hostIP": "172.29.16.203", + "podIP": "10.244.3.254", + "podIPs": [ + { + "ip": "10.244.3.254" + } + ], + "startTime": "2019-10-18T16:15:08Z", + "containerStatuses": [ + { + "name": "container-ricplt-jaegeradapter", + "state": { + "running": { + "startedAt": "2019-10-18T16:15:09Z" + } + }, + "lastState": { + + }, + "ready": true, + "restartCount": 0, + "image": "registry.kube-system.svc.rec.io:5555/ric/all-in-one:1.12", + "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/all-in-one@sha256:51b901b653f4a4ca5dd50be9133c08dacf2d3eb092e507c213e7955a0e132297", + "containerID": "docker://95013a49a1705a503f5f7dde7a38fa7277523a73cdef96d264fcefe170e8a921", + "started": true + } + ], + "qosClass": "BestEffort" + } + }, + { + "metadata": { + "name": "deployment-ricplt-rsm-88477585f-qkkj7", + "generateName": "deployment-ricplt-rsm-88477585f-", + "namespace": "ricplt", + "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-rsm-88477585f-qkkj7", + "uid": "d4c58ff4-743e-4ed6-bd36-aeb02daa1ca6", + "resourceVersion": "2945642", + "creationTimestamp": "2019-10-18T16:15:07Z", + "labels": { + "app": "ricplt-rsm", + "group": "nagios", + "pod-template-hash": "88477585f", + "release": "r1-rsm" + }, + "annotations": { + "kubernetes.io/psp": "caas-default" + }, + "ownerReferences": [ + { + "apiVersion": "apps/v1", + "kind": "ReplicaSet", + "name": "deployment-ricplt-rsm-88477585f", + "uid": "1fe7de57-90d9-4898-9b71-1ae9c4a6f014", + "controller": true, + "blockOwnerDeletion": true + } + ] + }, + "spec": { + "volumes": [ + { + "name": "local-router-file", + "configMap": { + "name": "configmap-ricplt-rsm-router-configmap", + "defaultMode": 420 + } + }, + { + "name": "local-configuration-file", + "configMap": { + "name": "configmap-ricplt-rsm", "defaultMode": 420 } }, { - "name": "default-token-l8tqd", + "name": "default-token-5j24g", "secret": { - "secretName": "default-token-l8tqd", + "secretName": "default-token-5j24g", "defaultMode": 420 } } ], "containers": [ { - "name": "container-ricplt-rtmgr", - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-rtmgr:0.3.3", - "command": [ - "/run_rtmgr.sh" - ], + "name": "container-ricplt-rsm", + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-rsm:2.0.7", "ports": [ + { + "name": "http", + "containerPort": 4800, + "protocol": "TCP" + }, { "name": "rmrroute", "containerPort": 4561, @@ -1040,14 +1376,14 @@ }, { "name": "rmrdata", - "containerPort": 4560, + "containerPort": 4801, "protocol": "TCP" } ], "envFrom": [ { "configMapRef": { - "name": "configmap-ricplt-rtmgr-env" + "name": "configmap-ricplt-rsm-env" } } ], @@ -1056,19 +1392,29 @@ }, "volumeMounts": [ { - "name": "rtmgrcfg", - "readOnly": true, - "mountPath": "/cfg" + "name": "local-router-file", + "mountPath": "/opt/RSM/router.txt", + "subPath": "router.txt" + }, + { + "name": "local-configuration-file", + "mountPath": "/opt/RSM/resources/configuration.yaml", + "subPath": "configuration.yaml" }, { - "name": "default-token-l8tqd", + "name": "default-token-5j24g", "readOnly": true, "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" } ], "terminationMessagePath": "/dev/termination-log", "terminationMessagePolicy": "File", - "imagePullPolicy": "Always" + "imagePullPolicy": "Always", + "securityContext": { + "privileged": false + }, + "stdin": true, + "tty": true } ], "restartPolicy": "Always", @@ -1076,7 +1422,7 @@ "dnsPolicy": "ClusterFirst", "serviceAccountName": "default", "serviceAccount": "default", - "nodeName": "192.168.1.205", + "nodeName": "172.29.16.203", "securityContext": { }, @@ -1085,7 +1431,7 @@ "name": "docker-reg-cred" } ], - "hostname": "rtmgr", + "hostname": "rsm", "schedulerName": "default-scheduler", "enableServiceLinks": true }, @@ -1096,36 +1442,41 @@ "type": "Initialized", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:48Z" + "lastTransitionTime": "2019-10-18T16:15:07Z" }, { "type": "Ready", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:53Z" + "lastTransitionTime": "2019-10-18T16:15:09Z" }, { "type": "ContainersReady", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:53Z" + "lastTransitionTime": "2019-10-18T16:15:09Z" }, { "type": "PodScheduled", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:48Z" + "lastTransitionTime": "2019-10-18T16:15:07Z" } ], - "hostIP": "192.168.1.205", - "podIP": "10.0.0.14", - "startTime": "2019-10-01T18:54:48Z", + "hostIP": "172.29.16.203", + "podIP": "10.244.3.253", + "podIPs": [ + { + "ip": "10.244.3.253" + } + ], + "startTime": "2019-10-18T16:15:07Z", "containerStatuses": [ { - "name": "container-ricplt-rtmgr", + "name": "container-ricplt-rsm", "state": { "running": { - "startedAt": "2019-10-01T18:54:52Z" + "startedAt": "2019-10-18T16:15:08Z" } }, "lastState": { @@ -1133,9 +1484,10 @@ }, "ready": true, "restartCount": 0, - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-rtmgr:0.3.3", - "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-rtmgr@sha256:3a4df1ea7f9038e8d44a1f4f699d08086ea17c8086d3e8d79dd104f1caedacb9", - "containerID": "docker://7e8c9ee1b33ea431cde8b6185499ccf9c28c6905278919ca4c60c8722437ac23" + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-rsm:2.0.7", + "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-rsm@sha256:e6fb3bc17fcd5a2fbc7d34eeb744fbfed4eaaaf6c669e084b379ee05368820d3", + "containerID": "docker://5e90673a6b2c292f2ce7c731bf8747c8a63f429eca08d08a993130001c7d6f5e", + "started": true } ], "qosClass": "BestEffort" @@ -1143,16 +1495,17 @@ }, { "metadata": { - "name": "deployment-ricplt-submgr-59748656fb-nxlgx", - "generateName": "deployment-ricplt-submgr-59748656fb-", + "name": "deployment-ricplt-submgr-7549b87fb8-4t6mx", + "generateName": "deployment-ricplt-submgr-7549b87fb8-", "namespace": "ricplt", - "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-submgr-59748656fb-nxlgx", - "uid": "e1c0de67-8818-4d24-9fc8-f53b80159231", - "resourceVersion": "211300", - "creationTimestamp": "2019-10-01T18:54:52Z", + "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-submgr-7549b87fb8-4t6mx", + "uid": "c6fbd48b-2757-421c-a534-f1931b04312b", + "resourceVersion": "2945646", + "creationTimestamp": "2019-10-18T16:15:05Z", "labels": { "app": "ricplt-submgr", - "pod-template-hash": "59748656fb", + "group": "nagios", + "pod-template-hash": "7549b87fb8", "release": "r1-submgr" }, "annotations": { @@ -1162,8 +1515,8 @@ { "apiVersion": "apps/v1", "kind": "ReplicaSet", - "name": "deployment-ricplt-submgr-59748656fb", - "uid": "5dab922e-aaeb-4e5f-9aa9-aef573d60dda", + "name": "deployment-ricplt-submgr-7549b87fb8", + "uid": "e2b9dd9f-cca4-4f64-9e11-b6ee174c4f6f", "controller": true, "blockOwnerDeletion": true } @@ -1172,9 +1525,23 @@ "spec": { "volumes": [ { - "name": "default-token-l8tqd", + "name": "config-volume", + "configMap": { + "name": "submgrcfg", + "items": [ + { + "key": "submgrcfg", + "path": "submgr-config.yaml", + "mode": 420 + } + ], + "defaultMode": 420 + } + }, + { + "name": "default-token-5j24g", "secret": { - "secretName": "default-token-l8tqd", + "secretName": "default-token-5j24g", "defaultMode": 420 } } @@ -1182,7 +1549,7 @@ "containers": [ { "name": "container-ricplt-submgr", - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-submgr:0.7.1", + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-submgr:0.10.5", "command": [ "/run_submgr.sh" ], @@ -1215,7 +1582,11 @@ }, "volumeMounts": [ { - "name": "default-token-l8tqd", + "name": "config-volume", + "mountPath": "/cfg" + }, + { + "name": "default-token-5j24g", "readOnly": true, "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" } @@ -1230,7 +1601,7 @@ "dnsPolicy": "ClusterFirst", "serviceAccountName": "default", "serviceAccount": "default", - "nodeName": "192.168.1.205", + "nodeName": "172.29.16.205", "securityContext": { }, @@ -1250,36 +1621,41 @@ "type": "Initialized", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:52Z" + "lastTransitionTime": "2019-10-18T16:15:05Z" }, { "type": "Ready", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:56Z" + "lastTransitionTime": "2019-10-18T16:15:07Z" }, { "type": "ContainersReady", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:56Z" + "lastTransitionTime": "2019-10-18T16:15:07Z" }, { "type": "PodScheduled", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:52Z" + "lastTransitionTime": "2019-10-18T16:15:05Z" } ], - "hostIP": "192.168.1.205", - "podIP": "10.0.0.15", - "startTime": "2019-10-01T18:54:52Z", + "hostIP": "172.29.16.205", + "podIP": "10.244.0.168", + "podIPs": [ + { + "ip": "10.244.0.168" + } + ], + "startTime": "2019-10-18T16:15:05Z", "containerStatuses": [ { "name": "container-ricplt-submgr", "state": { "running": { - "startedAt": "2019-10-01T18:54:56Z" + "startedAt": "2019-10-18T16:15:07Z" } }, "lastState": { @@ -1287,9 +1663,10 @@ }, "ready": true, "restartCount": 0, - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-submgr:0.7.1", - "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-submgr@sha256:a6a74837a106eb7047a2c692fec7fa7c931ed6c82364a4d18bac859a6c9fd1f8", - "containerID": "docker://b8a1e8193d9a98b20a675ecbc0555d2beea750b89a85bbedb94a72cb6a97b1a0" + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-submgr:0.10.5", + "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-submgr@sha256:aa8ada253d0800a849b6124fc54793815caaf93ad46b8d47cdd1f590ef69f813", + "containerID": "docker://724ba7834ef80d1f3c85ae7990ead480ed5226f0275816bae358edc9ddf54da6", + "started": true } ], "qosClass": "BestEffort" @@ -1297,16 +1674,17 @@ }, { "metadata": { - "name": "deployment-ricplt-vespamgr-d9c8fdcf8-nb4lp", - "generateName": "deployment-ricplt-vespamgr-d9c8fdcf8-", + "name": "deployment-ricplt-vespamgr-55f6484b7-g5zfw", + "generateName": "deployment-ricplt-vespamgr-55f6484b7-", "namespace": "ricplt", - "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-vespamgr-d9c8fdcf8-nb4lp", - "uid": "90cf9a83-9f71-41aa-853c-eddf671962df", - "resourceVersion": "211317", - "creationTimestamp": "2019-10-01T18:54:53Z", + "selfLink": "/api/v1/namespaces/ricplt/pods/deployment-ricplt-vespamgr-55f6484b7-g5zfw", + "uid": "a7ae0f4a-adfa-48c6-8c41-725ba1c84b11", + "resourceVersion": "2945649", + "creationTimestamp": "2019-10-18T16:15:06Z", "labels": { "app": "ricplt-vespamgr", - "pod-template-hash": "d9c8fdcf8", + "group": "nagios", + "pod-template-hash": "55f6484b7", "release": "r1-vespamgr" }, "annotations": { @@ -1316,8 +1694,8 @@ { "apiVersion": "apps/v1", "kind": "ReplicaSet", - "name": "deployment-ricplt-vespamgr-d9c8fdcf8", - "uid": "89ea5799-b592-409b-a63b-e457f8e8a848", + "name": "deployment-ricplt-vespamgr-55f6484b7", + "uid": "dc5e0e81-23da-4fed-99da-14cb7a8fe06c", "controller": true, "blockOwnerDeletion": true } @@ -1326,9 +1704,9 @@ "spec": { "volumes": [ { - "name": "default-token-l8tqd", + "name": "default-token-5j24g", "secret": { - "secretName": "default-token-l8tqd", + "secretName": "default-token-5j24g", "defaultMode": 420 } } @@ -1336,7 +1714,7 @@ "containers": [ { "name": "container-ricplt-vespamgr", - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-vespamgr:0.0.3", + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-vespamgr:0.0.5", "ports": [ { "name": "http", @@ -1356,16 +1734,34 @@ } } ], + "env": [ + { + "name": "VESMGR_APPMGRDOMAIN", + "value": "appmgr-service" + } + ], "resources": { }, "volumeMounts": [ { - "name": "default-token-l8tqd", + "name": "default-token-5j24g", "readOnly": true, "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" } ], + "livenessProbe": { + "httpGet": { + "path": "/supervision", + "port": 8080, + "scheme": "HTTP" + }, + "initialDelaySeconds": 30, + "timeoutSeconds": 20, + "periodSeconds": 60, + "successThreshold": 1, + "failureThreshold": 3 + }, "terminationMessagePath": "/dev/termination-log", "terminationMessagePolicy": "File", "imagePullPolicy": "Always" @@ -1376,7 +1772,7 @@ "dnsPolicy": "ClusterFirst", "serviceAccountName": "default", "serviceAccount": "default", - "nodeName": "192.168.1.202", + "nodeName": "172.29.16.204", "securityContext": { }, @@ -1396,50 +1792,56 @@ "type": "Initialized", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:53Z" + "lastTransitionTime": "2019-10-18T16:15:06Z" }, { "type": "Ready", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:58Z" + "lastTransitionTime": "2019-10-18T16:15:08Z" }, { "type": "ContainersReady", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:58Z" + "lastTransitionTime": "2019-10-18T16:15:08Z" }, { "type": "PodScheduled", "status": "True", "lastProbeTime": null, - "lastTransitionTime": "2019-10-01T18:54:53Z" + "lastTransitionTime": "2019-10-18T16:15:06Z" } ], - "hostIP": "192.168.1.202", - "podIP": "10.0.0.6", - "startTime": "2019-10-01T18:54:53Z", + "hostIP": "172.29.16.204", + "podIP": "10.244.2.101", + "podIPs": [ + { + "ip": "10.244.2.101" + } + ], + "startTime": "2019-10-18T16:15:06Z", "containerStatuses": [ { "name": "container-ricplt-vespamgr", "state": { "running": { - "startedAt": "2019-10-01T18:54:57Z" + "startedAt": "2019-10-18T16:15:08Z" } }, "lastState": { }, "ready": true, - "restartCount": 9, - "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-vespamgr:0.0.3", - "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-vespamgr@sha256:e3f7f2b7d7088f6db65f648d6d965c4e967dd4b45fc9b84255abe93ffa2d7611", - "containerID": "docker://9df25927cbad72ddf66a255bd9bf054be8a55c26a90acce690aa51d0c950eee3" + "restartCount": 0, + "image": "registry.kube-system.svc.rec.io:5555/ric/ric-plt-vespamgr:0.0.5", + "imageID": "docker-pullable://registry.kube-system.svc.rec.io:5555/ric/ric-plt-vespamgr@sha256:97753ef72471a5fddd59ff35a2fe763b041848f6e83214acb78ad73c7316b371", + "containerID": "docker://80884c969cbf802945c075afc47d747b5e747e4645c691d376820c9d61094e7c", + "started": true } ], "qosClass": "BestEffort" } } ] -} +} \ No newline at end of file diff --git a/webapp-frontend/src/app/caas-ingress/caas-ingress.component.html b/webapp-frontend/src/app/caas-ingress/caas-ingress.component.html index 0799ec66..5e53fd3b 100644 --- a/webapp-frontend/src/app/caas-ingress/caas-ingress.component.html +++ b/webapp-frontend/src/app/caas-ingress/caas-ingress.component.html @@ -45,7 +45,7 @@ Containers - {{element.spec.containers.length}} + {{element.readyCount}}/{{element.spec.containers.length}} diff --git a/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts b/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts index d823c0db..0134bb64 100644 --- a/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts +++ b/webapp-frontend/src/app/caas-ingress/caas-ingress.datasource.ts @@ -59,10 +59,14 @@ export class CaasIngressDataSource extends DataSource { ) .subscribe((pl: V1PodList) => { this.rowCount = pl.items.length; - // precompute the restart count to keep HTML simple + // precompute container ready, restart counts to keep HTML simple for (const v1pod of pl.items) { + v1pod['readyCount'] = 0; v1pod['restartCount'] = 0; for (const cs of v1pod.status.containerStatuses) { + if (cs.ready) { + v1pod['readyCount'] = v1pod['readyCount'] + 1; + } v1pod['restartCount'] = v1pod['restartCount'] + cs.restartCount; } } -- 2.16.6