Merge pull request #134 from HumairAK/add_progressing

Add more meaningful status conditions, messages, and checks.
opendatahub-io · Jun 14, 2023 · f2a11c9 · f2a11c9
2 parents 792029b + a2f4728
commit f2a11c9
Show file tree

Hide file tree

Showing 38 changed files with 368 additions and 63 deletions.
diff --git a/config/internal/apiserver/deployment.yaml.tmpl b/config/internal/apiserver/deployment.yaml.tmpl
@@ -6,16 +6,19 @@ metadata:
   labels:
     app: ds-pipeline-{{.Name}}
     component: data-science-pipelines
+    dspa: {{.Name}}
 spec:
   selector:
     matchLabels:
       app: ds-pipeline-{{.Name}}
       component: data-science-pipelines
+      dspa: {{.Name}}
   template:
     metadata:
       labels:
         app: ds-pipeline-{{.Name}}
         component: data-science-pipelines
+        dspa: {{.Name}}
     spec:
       containers:
         - env:

diff --git a/config/internal/mariadb/deployment.yaml.tmpl b/config/internal/mariadb/deployment.yaml.tmpl
@@ -7,6 +7,7 @@ metadata:
   labels:
     app: mariadb-{{.Name}}
     component: data-science-pipelines
+    dspa: {{.Name}}
 spec:
   strategy:
     # Need this since backing PVC is ReadWriteOnce,
@@ -17,11 +18,13 @@ spec:
     matchLabels:
       app: mariadb-{{.Name}}
       component: data-science-pipelines
+      dspa: {{.Name}}
   template:
     metadata:
       labels:
         app: mariadb-{{.Name}}
         component: data-science-pipelines
+        dspa: {{.Name}}
     spec:
       containers:
         - name: mariadb

diff --git a/config/internal/minio/deployment.yaml.tmpl b/config/internal/minio/deployment.yaml.tmpl
@@ -6,18 +6,21 @@ metadata:
   labels:
     app: minio-{{.Name}}
     component: data-science-pipelines
+    dspa: {{.Name}}
 spec:
   selector:
     matchLabels:
       app: minio-{{.Name}}
       component: data-science-pipelines
+      dspa: {{.Name}}
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
         app: minio-{{.Name}}
         component: data-science-pipelines
+        dspa: {{.Name}}
     spec:
       containers:
         - args:

diff --git a/config/internal/ml-metadata/metadata-envoy.deployment.yaml.tmpl b/config/internal/ml-metadata/metadata-envoy.deployment.yaml.tmpl
@@ -6,19 +6,22 @@ metadata:
   labels:
     app: ds-pipeline-metadata-envoy-{{.Name}}
     component: data-science-pipelines
+    dspa: {{.Name}}
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: ds-pipeline-metadata-envoy-{{.Name}}
       component: data-science-pipelines
+      dspa: {{.Name}}
   template:
     metadata:
       annotations:
         sidecar.istio.io/inject: "false"
       labels:
         app: ds-pipeline-metadata-envoy-{{.Name}}
         component: data-science-pipelines
+        dspa: {{.Name}}
     spec:
       containers:
         - image: {{.MLMD.Envoy.Image}}

diff --git a/config/internal/ml-metadata/metadata-grpc.deployment.yaml.tmpl b/config/internal/ml-metadata/metadata-grpc.deployment.yaml.tmpl
@@ -6,17 +6,20 @@ metadata:
   labels:
     app: ds-pipeline-metadata-grpc-{{.Name}}
     component: data-science-pipelines
+    dspa: {{.Name}}
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: ds-pipeline-metadata-grpc-{{.Name}}
       component: data-science-pipelines
+      dspa: {{.Name}}
   template:
     metadata:
       labels:
         app: ds-pipeline-metadata-grpc-{{.Name}}
         component: data-science-pipelines
+        dspa: {{.Name}}
     spec:
       containers:
         - args:

diff --git a/config/internal/ml-metadata/metadata-writer.deployment.yaml.tmpl b/config/internal/ml-metadata/metadata-writer.deployment.yaml.tmpl
@@ -6,17 +6,20 @@ metadata:
   labels:
     app: ds-pipeline-metadata-writer-{{.Name}}
     component: data-science-pipelines
+    dspa: {{.Name}}
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: ds-pipeline-metadata-writer-{{.Name}}
       component: data-science-pipelines
+      dspa: {{.Name}}
   template:
     metadata:
       labels:
         app: ds-pipeline-metadata-writer-{{.Name}}
         component: data-science-pipelines
+        dspa: {{.Name}}
     spec:
       containers:
         - env:

diff --git a/config/internal/mlpipelines-ui/deployment.yaml.tmpl b/config/internal/mlpipelines-ui/deployment.yaml.tmpl
@@ -6,18 +6,21 @@ metadata:
   labels:
     app: ds-pipeline-ui-{{.Name}}
     component: data-science-pipelines
+    dspa: {{.Name}}
 spec:
   selector:
     matchLabels:
       app: ds-pipeline-ui-{{.Name}}
       component: data-science-pipelines
+      dspa: {{.Name}}
   template:
     metadata:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: ds-pipeline-ui-{{.Name}}
         component: data-science-pipelines
+        dspa: {{.Name}}
     spec:
       containers:
         - env:

diff --git a/config/internal/persistence-agent/deployment.yaml.tmpl b/config/internal/persistence-agent/deployment.yaml.tmpl
@@ -6,18 +6,21 @@ metadata:
   labels:
     app: ds-pipeline-persistenceagent-{{.Name}}
     component: data-science-pipelines
+    dspa: {{.Name}}
 spec:
   selector:
     matchLabels:
       app: ds-pipeline-persistenceagent-{{.Name}}
       component: data-science-pipelines
+      dspa: {{.Name}}
   template:
     metadata:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: ds-pipeline-persistenceagent-{{.Name}}
         component: data-science-pipelines
+        dspa: {{.Name}}
     spec:
       containers:
         - env:

diff --git a/config/internal/scheduled-workflow/deployment.yaml.tmpl b/config/internal/scheduled-workflow/deployment.yaml.tmpl
@@ -6,18 +6,21 @@ metadata:
   labels:
     app: ds-pipeline-scheduledworkflow-{{.Name}}
     component: data-science-pipelines
+    dspa: {{.Name}}
 spec:
   selector:
     matchLabels:
       app: ds-pipeline-scheduledworkflow-{{.Name}}
       component: data-science-pipelines
+      dspa: {{.Name}}
   template:
     metadata:
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: ds-pipeline-scheduledworkflow-{{.Name}}
         component: data-science-pipelines
+        dspa: {{.Name}}
     spec:
       containers:
         - env:

diff --git a/controllers/config/defaults.go b/controllers/config/defaults.go
@@ -67,12 +67,23 @@ const (
 	MlmdWriterImagePath           = "Images.MlmdWriter"
 )
 
+// DSPA Status Condition Types
+const (
+	APIServerReady         = "APIServerReady"
+	PersistenceAgentReady  = "PersistenceAgentReady"
+	ScheduledWorkflowReady = "ScheduledWorkflowReady"
+	CrReady                = "Ready"
+)
+
+// DSPA Ready Status Condition Reasons
+// As per k8s api convention: Reason is intended
+// to be used in concise output, such as one-line
+// kubectl get output, and in summarizing
+// occurrences of causes
 const (
-	APIServerReady           = "APIServerReady"
-	PersistenceAgentReady    = "PersistenceAgentReady"
-	ScheduledWorkflowReady   = "ScheduledWorkflowReady"
-	CrReady                  = "Ready"
 	MinimumReplicasAvailable = "MinimumReplicasAvailable"
+	FailingToDeploy          = "FailingToDeploy"
+	Deploying                = "Deploying"
 )
 
 // Any required Configmap paths can be added here,