Add labels to deployments and improve label coverage of resources #2130

glindsell · 2020-07-14T16:10:34Z

Signed-off-by: glindsell gl@seldon.io

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Change of component and endpoint label names to include seldon.io prefix

Signed-off-by: glindsell <gl@seldon.io>

glindsell · 2020-07-14T16:13:31Z

/test integration

seldondev · 2020-07-14T16:15:08Z

Tue Jul 14 16:15:05 UTC 2020
The logs for [pr-build] [3] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/3.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=3

seldondev · 2020-07-14T16:15:14Z

Tue Jul 14 16:15:13 UTC 2020
The logs for [integration] [5] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/5.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=5

seldondev · 2020-07-14T16:15:23Z

Tue Jul 14 16:15:21 UTC 2020
The logs for [lint] [4] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/4.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=4

glindsell · 2020-07-15T08:21:22Z

/test integration

seldondev · 2020-07-15T08:22:45Z

Wed Jul 15 08:22:44 UTC 2020
The logs for [integration] [6] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/6.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=6

glindsell · 2020-07-16T08:36:05Z

/test integration

seldondev · 2020-07-16T08:36:48Z

Thu Jul 16 08:36:47 UTC 2020
The logs for [lint] [8] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/8.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=8

seldondev · 2020-07-16T08:37:00Z

Thu Jul 16 08:36:59 UTC 2020
The logs for [pr-build] [7] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/7.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=7

seldondev · 2020-07-16T08:37:40Z

Thu Jul 16 08:37:39 UTC 2020
The logs for [integration] [9] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/9.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=9

glindsell · 2020-07-16T15:19:23Z

/test integration

glindsell · 2020-07-16T15:19:41Z

/test lint

seldondev · 2020-07-16T15:21:15Z

Thu Jul 16 15:21:12 UTC 2020
The logs for [integration] [10] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/10.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=10

seldondev · 2020-07-16T15:21:20Z

Thu Jul 16 15:21:19 UTC 2020
The logs for [lint] [11] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/11.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=11

Signed-off-by: glindsell <gl@seldon.io>

glindsell · 2020-07-17T14:23:16Z

/test integration

seldondev · 2020-07-17T14:24:29Z

Fri Jul 17 14:24:28 UTC 2020
The logs for [lint] [13] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/13.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=13

seldondev · 2020-07-17T14:24:36Z

Fri Jul 17 14:24:35 UTC 2020
The logs for [pr-build] [12] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/12.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=12

seldondev · 2020-07-17T14:25:30Z

Fri Jul 17 14:25:29 UTC 2020
The logs for [integration] [14] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/14.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=14

glindsell · 2020-07-17T16:13:36Z

/test integration

seldondev · 2020-07-17T16:15:21Z

Fri Jul 17 16:15:18 UTC 2020
The logs for [integration] [15] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/15.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=15

glindsell · 2020-07-20T09:41:27Z

/test integration

seldondev · 2020-07-20T09:42:58Z

Mon Jul 20 09:42:57 UTC 2020
The logs for [integration] [16] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/16.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=16

seldondev · 2020-07-22T17:11:50Z

Wed Jul 22 17:11:46 UTC 2020
The logs for [pr-build] [27] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/27.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=27

glindsell · 2020-07-23T08:36:01Z

/test integration

seldondev · 2020-07-23T08:37:48Z

Thu Jul 23 08:37:46 UTC 2020
The logs for [integration] [29] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/29.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=29

Signed-off-by: glindsell <gl@seldon.io>

glindsell · 2020-07-23T13:25:53Z

/test integration

seldondev · 2020-07-23T13:26:32Z

Thu Jul 23 13:26:31 UTC 2020
The logs for [pr-build] [30] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/30.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=30

seldondev · 2020-07-23T13:26:51Z

Thu Jul 23 13:26:50 UTC 2020
The logs for [lint] [31] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/31.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=31

seldondev · 2020-07-23T13:27:23Z

Thu Jul 23 13:27:22 UTC 2020
The logs for [integration] [32] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/32.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=32

adriangonz

Nice one @glindsell! I just added a small question down below, but everything else looks good! 👍

adriangonz · 2020-07-24T13:07:10Z

operator/controllers/seldondeployment_controller.go

@@ -732,8 +735,9 @@ func createContainerService(deploy *appsv1.Deployment,
 			SessionAffinity: corev1.ServiceAffinityNone,
 		},
 	}
-	addLabelsToService(svc, pu, p)
-	addLabelsToDeployment(deploy, containerServiceKey, containerServiceValue)
+	deploy.ObjectMeta.Labels[containerServiceKey] = containerServiceValue


Do we need to add a label to any service here? Just wondering as before we were also calling a addLabelsToService method.

addLabelsToService doesn't add the containerServiceKey or containerServiceValue labels. Therefore when moving the addLabelsTo... functions up a level to the createComponents method I didn't add svc.ObjectMeta.Labels[containerServiceKey] = containerServiceValue

Perhaps this does need to be added? I'm not sure as it is not part of the set of labels that I am dealing with in this PR.

adriangonz · 2020-07-24T13:08:41Z

operator/apis/machinelearning.seldon.io/v1/seldondeployment_types.go

-	Label_shadow             = "shadow"
-	Label_canary             = "canary"
-	Label_explainer          = "explainer"
+	Label_router             = "seldon.io/router"


Nice one! Namespacing the labels under seldon.io/* seems like the right thing to do 👍

adriangonz · 2020-07-24T13:10:02Z

BTW @glindsell could you also add some comment to the release-notes block in the PR body? I guess mainly to highlight the change in the labels names.

Signed-off-by: glindsell <gl@seldon.io>

seldondev · 2020-07-24T16:09:44Z

Fri Jul 24 16:09:43 UTC 2020
The logs for [pr-build] [33] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/33.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=33

seldondev · 2020-07-24T16:10:01Z

Fri Jul 24 16:10:00 UTC 2020
The logs for [lint] [34] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/34.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=34

glindsell · 2020-07-24T16:15:48Z

/test integration

seldondev · 2020-07-24T16:17:09Z

Fri Jul 24 16:17:08 UTC 2020
The logs for [integration] [35] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/35.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=35

adriangonz · 2020-07-24T16:20:18Z

/approve

seldondev · 2020-07-24T16:20:49Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adriangonz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [adriangonz]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

axsaucedo · 2020-07-24T16:33:36Z

/hold (briefly for the question)
Are we going to want this to go in 1.2.2? If not we can wait until Monday before merging, otherwise we'll have to cherrypick (which is also fine, just want to make sure it's explicit)

axsaucedo · 2020-07-24T16:34:01Z

/hold

glindsell · 2020-07-27T08:39:38Z

/test integration

seldondev · 2020-07-27T08:40:54Z

Mon Jul 27 08:40:53 UTC 2020
The logs for [integration] [36] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/36.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=36

glindsell · 2020-07-27T14:26:57Z

/hold (briefly for the question)
Are we going to want this to go in 1.2.2? If not we can wait until Monday before merging, otherwise we'll have to cherrypick (which is also fine, just want to make sure it's explicit)

@axsaucedo are we ok to merge now?

axsaucedo · 2020-07-29T10:35:04Z

/hold cancel

seldondev · 2020-07-29T10:36:51Z

Wed Jul 29 10:36:50 UTC 2020
The logs for [pr-build] [37] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/37.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=37

seldondev · 2020-07-29T10:36:59Z

Wed Jul 29 10:36:58 UTC 2020
The logs for [lint] [38] will show after the pipeline context has finished.
https://github.com/SeldonIO/seldon-core/blob/gh-pages/jenkins-x/logs/SeldonIO/seldon-core/PR-2130/38.log

impatient try
jx get build logs SeldonIO/seldon-core/PR-2130 --build=38

Add new component and endpoint labels to operator and remove old labels

44d8861

Signed-off-by: glindsell <gl@seldon.io>

seldondev added the size/L label Jul 14, 2020

Merge remote-tracking branch 'upstream/master' into 1405-new-labels

efa110c

Merge remote-tracking branch 'upstream/master' into 1405-new-labels

059959e

glindsell added 2 commits July 17, 2020 15:08

Merge remote-tracking branch 'upstream/master' into 1405-new-labels

c1e0cc5

Add container service keys and values back in

cf55b71

Signed-off-by: glindsell <gl@seldon.io>

glindsell requested review from ukclivecox and adriangonz July 20, 2020 12:53

Add seldon.io prefix to labels

d3f15e4

Signed-off-by: glindsell <gl@seldon.io>

glindsell marked this pull request as ready for review July 24, 2020 09:37

adriangonz reviewed Jul 24, 2020

View reviewed changes

Return deployments and services when adding labels

fcc4826

Signed-off-by: glindsell <gl@seldon.io>

seldondev added the approved label Jul 24, 2020

seldondev added the do-not-merge/hold label Jul 24, 2020

seldondev removed the do-not-merge/hold label Jul 29, 2020

glindsell merged commit 91f7791 into SeldonIO:master Jul 30, 2020

Add labels to deployments and improve label coverage of resources #2130

Add labels to deployments and improve label coverage of resources #2130

Conversation

glindsell commented Jul 14, 2020 • edited Loading

glindsell commented Jul 14, 2020

seldondev commented Jul 14, 2020

seldondev commented Jul 14, 2020

seldondev commented Jul 14, 2020

glindsell commented Jul 15, 2020

seldondev commented Jul 15, 2020

glindsell commented Jul 16, 2020

seldondev commented Jul 16, 2020

seldondev commented Jul 16, 2020

seldondev commented Jul 16, 2020

glindsell commented Jul 16, 2020

glindsell commented Jul 16, 2020

seldondev commented Jul 16, 2020

seldondev commented Jul 16, 2020

glindsell commented Jul 17, 2020

seldondev commented Jul 17, 2020

seldondev commented Jul 17, 2020

seldondev commented Jul 17, 2020

glindsell commented Jul 17, 2020

seldondev commented Jul 17, 2020

glindsell commented Jul 20, 2020

seldondev commented Jul 20, 2020

seldondev commented Jul 22, 2020

glindsell commented Jul 23, 2020

seldondev commented Jul 23, 2020

glindsell commented Jul 23, 2020

seldondev commented Jul 23, 2020

seldondev commented Jul 23, 2020

seldondev commented Jul 23, 2020

adriangonz left a comment

Choose a reason for hiding this comment

adriangonz Jul 24, 2020

Choose a reason for hiding this comment

glindsell Jul 24, 2020

Choose a reason for hiding this comment

adriangonz Jul 24, 2020

Choose a reason for hiding this comment

adriangonz commented Jul 24, 2020 • edited Loading

seldondev commented Jul 24, 2020

seldondev commented Jul 24, 2020

glindsell commented Jul 24, 2020

seldondev commented Jul 24, 2020

adriangonz commented Jul 24, 2020

seldondev commented Jul 24, 2020

axsaucedo commented Jul 24, 2020

axsaucedo commented Jul 24, 2020

glindsell commented Jul 27, 2020

seldondev commented Jul 27, 2020

glindsell commented Jul 27, 2020

axsaucedo commented Jul 29, 2020

seldondev commented Jul 29, 2020

seldondev commented Jul 29, 2020

glindsell commented Jul 14, 2020 •

edited

Loading

adriangonz commented Jul 24, 2020 •

edited

Loading