Skip to content

Commit f2a11c9

Browse files
Merge pull request opendatahub-io#134 from HumairAK/add_progressing
Add more meaningful status conditions, messages, and checks.
2 parents 792029b + a2f4728 commit f2a11c9

38 files changed

+368
-63
lines changed

config/internal/apiserver/deployment.yaml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ metadata:
66
labels:
77
app: ds-pipeline-{{.Name}}
88
component: data-science-pipelines
9+
dspa: {{.Name}}
910
spec:
1011
selector:
1112
matchLabels:
1213
app: ds-pipeline-{{.Name}}
1314
component: data-science-pipelines
15+
dspa: {{.Name}}
1416
template:
1517
metadata:
1618
labels:
1719
app: ds-pipeline-{{.Name}}
1820
component: data-science-pipelines
21+
dspa: {{.Name}}
1922
spec:
2023
containers:
2124
- env:

config/internal/mariadb/deployment.yaml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
labels:
88
app: mariadb-{{.Name}}
99
component: data-science-pipelines
10+
dspa: {{.Name}}
1011
spec:
1112
strategy:
1213
# Need this since backing PVC is ReadWriteOnce,
@@ -17,11 +18,13 @@ spec:
1718
matchLabels:
1819
app: mariadb-{{.Name}}
1920
component: data-science-pipelines
21+
dspa: {{.Name}}
2022
template:
2123
metadata:
2224
labels:
2325
app: mariadb-{{.Name}}
2426
component: data-science-pipelines
27+
dspa: {{.Name}}
2528
spec:
2629
containers:
2730
- name: mariadb

config/internal/minio/deployment.yaml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ metadata:
66
labels:
77
app: minio-{{.Name}}
88
component: data-science-pipelines
9+
dspa: {{.Name}}
910
spec:
1011
selector:
1112
matchLabels:
1213
app: minio-{{.Name}}
1314
component: data-science-pipelines
15+
dspa: {{.Name}}
1416
strategy:
1517
type: Recreate
1618
template:
1719
metadata:
1820
labels:
1921
app: minio-{{.Name}}
2022
component: data-science-pipelines
23+
dspa: {{.Name}}
2124
spec:
2225
containers:
2326
- args:

config/internal/ml-metadata/metadata-envoy.deployment.yaml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@ metadata:
66
labels:
77
app: ds-pipeline-metadata-envoy-{{.Name}}
88
component: data-science-pipelines
9+
dspa: {{.Name}}
910
spec:
1011
replicas: 1
1112
selector:
1213
matchLabels:
1314
app: ds-pipeline-metadata-envoy-{{.Name}}
1415
component: data-science-pipelines
16+
dspa: {{.Name}}
1517
template:
1618
metadata:
1719
annotations:
1820
sidecar.istio.io/inject: "false"
1921
labels:
2022
app: ds-pipeline-metadata-envoy-{{.Name}}
2123
component: data-science-pipelines
24+
dspa: {{.Name}}
2225
spec:
2326
containers:
2427
- image: {{.MLMD.Envoy.Image}}

config/internal/ml-metadata/metadata-grpc.deployment.yaml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@ metadata:
66
labels:
77
app: ds-pipeline-metadata-grpc-{{.Name}}
88
component: data-science-pipelines
9+
dspa: {{.Name}}
910
spec:
1011
replicas: 1
1112
selector:
1213
matchLabels:
1314
app: ds-pipeline-metadata-grpc-{{.Name}}
1415
component: data-science-pipelines
16+
dspa: {{.Name}}
1517
template:
1618
metadata:
1719
labels:
1820
app: ds-pipeline-metadata-grpc-{{.Name}}
1921
component: data-science-pipelines
22+
dspa: {{.Name}}
2023
spec:
2124
containers:
2225
- args:

config/internal/ml-metadata/metadata-writer.deployment.yaml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@ metadata:
66
labels:
77
app: ds-pipeline-metadata-writer-{{.Name}}
88
component: data-science-pipelines
9+
dspa: {{.Name}}
910
spec:
1011
replicas: 1
1112
selector:
1213
matchLabels:
1314
app: ds-pipeline-metadata-writer-{{.Name}}
1415
component: data-science-pipelines
16+
dspa: {{.Name}}
1517
template:
1618
metadata:
1719
labels:
1820
app: ds-pipeline-metadata-writer-{{.Name}}
1921
component: data-science-pipelines
22+
dspa: {{.Name}}
2023
spec:
2124
containers:
2225
- env:

config/internal/mlpipelines-ui/deployment.yaml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ metadata:
66
labels:
77
app: ds-pipeline-ui-{{.Name}}
88
component: data-science-pipelines
9+
dspa: {{.Name}}
910
spec:
1011
selector:
1112
matchLabels:
1213
app: ds-pipeline-ui-{{.Name}}
1314
component: data-science-pipelines
15+
dspa: {{.Name}}
1416
template:
1517
metadata:
1618
annotations:
1719
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
1820
labels:
1921
app: ds-pipeline-ui-{{.Name}}
2022
component: data-science-pipelines
23+
dspa: {{.Name}}
2124
spec:
2225
containers:
2326
- env:

config/internal/persistence-agent/deployment.yaml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ metadata:
66
labels:
77
app: ds-pipeline-persistenceagent-{{.Name}}
88
component: data-science-pipelines
9+
dspa: {{.Name}}
910
spec:
1011
selector:
1112
matchLabels:
1213
app: ds-pipeline-persistenceagent-{{.Name}}
1314
component: data-science-pipelines
15+
dspa: {{.Name}}
1416
template:
1517
metadata:
1618
annotations:
1719
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
1820
labels:
1921
app: ds-pipeline-persistenceagent-{{.Name}}
2022
component: data-science-pipelines
23+
dspa: {{.Name}}
2124
spec:
2225
containers:
2326
- env:

config/internal/scheduled-workflow/deployment.yaml.tmpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@ metadata:
66
labels:
77
app: ds-pipeline-scheduledworkflow-{{.Name}}
88
component: data-science-pipelines
9+
dspa: {{.Name}}
910
spec:
1011
selector:
1112
matchLabels:
1213
app: ds-pipeline-scheduledworkflow-{{.Name}}
1314
component: data-science-pipelines
15+
dspa: {{.Name}}
1416
template:
1517
metadata:
1618
annotations:
1719
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
1820
labels:
1921
app: ds-pipeline-scheduledworkflow-{{.Name}}
2022
component: data-science-pipelines
23+
dspa: {{.Name}}
2124
spec:
2225
containers:
2326
- env:

controllers/config/defaults.go

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,23 @@ const (
6767
MlmdWriterImagePath = "Images.MlmdWriter"
6868
)
6969

70+
// DSPA Status Condition Types
71+
const (
72+
APIServerReady = "APIServerReady"
73+
PersistenceAgentReady = "PersistenceAgentReady"
74+
ScheduledWorkflowReady = "ScheduledWorkflowReady"
75+
CrReady = "Ready"
76+
)
77+
78+
// DSPA Ready Status Condition Reasons
79+
// As per k8s api convention: Reason is intended
80+
// to be used in concise output, such as one-line
81+
// kubectl get output, and in summarizing
82+
// occurrences of causes
7083
const (
71-
APIServerReady = "APIServerReady"
72-
PersistenceAgentReady = "PersistenceAgentReady"
73-
ScheduledWorkflowReady = "ScheduledWorkflowReady"
74-
CrReady = "Ready"
7584
MinimumReplicasAvailable = "MinimumReplicasAvailable"
85+
FailingToDeploy = "FailingToDeploy"
86+
Deploying = "Deploying"
7687
)
7788

7889
// Any required Configmap paths can be added here,

0 commit comments

Comments
 (0)