Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 4 deletions

diff --git a/app/assets/javascripts/kubernetes_dashboard/helpers/k8s_integration_helper.js b/app/assets/javascripts/kubernetes_dashboard/helpers/k8s_integration_helper.js
index d55a57f0ab7..17f1ebdc013 100644
--- a/app/assets/javascripts/kubernetes_dashboard/helpers/k8s_integration_helper.js
+++ b/app/assets/javascripts/kubernetes_dashboard/helpers/k8s_integration_helper.js
@@ -1,5 +1,11 @@
 import { differenceInSeconds } from '~/lib/utils/datetime_utility';
-import { STATUS_TRUE, STATUS_FALSE, PHASE_PENDING, PHASE_READY, PHASE_FAILED } from '../constants';
+import {
+  STATUS_TRUE,
+  STATUS_FALSE,
+  STATUS_PENDING,
+  STATUS_READY,
+  STATUS_FAILED,
+} from '../constants';
 
 export function getAge(creationTimestamp) {
   if (!creationTimestamp) return '';
@@ -28,10 +34,17 @@ export function getAge(creationTimestamp) {
 export function calculateDeploymentStatus(item) {
   const [available, progressing] = item.status?.conditions ?? [];
   if (available?.status === STATUS_TRUE) {
-    return PHASE_READY;
+    return STATUS_READY;
   }
   if (available?.status === STATUS_FALSE && progressing?.status !== STATUS_TRUE) {
-    return PHASE_FAILED;
+    return STATUS_FAILED;
   }
-  return PHASE_PENDING;
+  return STATUS_PENDING;
+}
+
+export function calculateStatefulSetStatus(item) {
+  if (item.status?.readyReplicas === item.spec?.replicas) {
+    return STATUS_READY;
+  }
+  return STATUS_FAILED;
 }