Skip to content

Commit 272f4ce

Browse files
committed
feat(kustomize): use LabelTransformer instead of deprecated commonLabels
This is a "piece" of a more comprehensive/interesting PR: - opendatahub-io#1015 Unfortunately, that PR has grown wildly unwieldy in its size - and immediate feedback received was to try to break it into smaller pieces - so consider this one piece! The ulitmate goal here on this targetted PR is two-fold: - standardization irrespective of image build "flavour" our kustomize labelling - get rid of following warning: ``` $ kubectl kustomize jupyter/minimal/ubi9-python-3.11/kustomize/base ... ``` No actual changes are introduced in this PR - simply leveraging the `LabelTransformer` to accomplish what `commonLabels` was previously doing. Related-to: https://issues.redhat.com/browse/RHOAIENG-23291
1 parent 4e17ba3 commit 272f4ce

File tree

52 files changed

+296
-45
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+296
-45
lines changed

codeserver/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ kind: Kustomization
44
namePrefix: codeserver-
55
resources:
66
- pod.yaml
7+
transformers:
8+
- labels.yaml
79
images:
810
- name: codeserver-workbench
911
newName: quay.io/opendatahub/workbench-images
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
app: codeserver-image
8+
fieldSpecs:
9+
- path: metadata/labels
10+
create: true
11+
- path: spec/template/metadata/labels
12+
create: false
13+
- path: spec/selector/matchLabels
14+
create: false

codeserver/ubi9-python-3.11/kustomize/base/pod.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ apiVersion: v1
33
kind: Pod
44
metadata:
55
name: pod
6-
labels:
7-
app: codeserver-image
86
spec:
97
containers:
108
- name: codeserver

jupyter/datascience/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
namePrefix: jupyter-datascience-ubi9-python-3-11-
5-
commonLabels:
6-
app: jupyter-datascience-ubi9-python-3-11
75
resources:
86
- service.yaml
97
- statefulset.yaml
8+
transformers:
9+
- labels.yaml
1010
images:
1111
- name: quay.io/opendatahub/workbench-images
1212
newName: quay.io/opendatahub/workbench-images
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
app: jupyter-datascience-ubi9-python-3-11
8+
fieldSpecs:
9+
- path: metadata/labels
10+
create: true
11+
- path: spec/template/metadata/labels
12+
create: false
13+
- path: spec/selector/matchLabels
14+
create: false

jupyter/datascience/ubi9-python-3.11/kustomize/base/statefulset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ metadata:
99
opendatahub.io/user: jovyan
1010
spec:
1111
replicas: 1
12-
selector: {}
12+
selector:
13+
matchLabels: {}
1314
serviceName: notebook
1415
template:
1516
metadata:

jupyter/minimal/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
namePrefix: jupyter-minimal-ubi9-python-3-11-
5-
commonLabels:
6-
app: jupyter-minimal-ubi9-python-3-11
75
resources:
86
- service.yaml
97
- statefulset.yaml
8+
transformers:
9+
- labels.yaml
1010
images:
1111
- name: quay.io/opendatahub/workbench-images
1212
newName: quay.io/opendatahub/workbench-images
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
app: jupyter-minimal-ubi9-python-3-11
8+
fieldSpecs:
9+
- path: metadata/labels
10+
create: true
11+
- path: spec/template/metadata/labels
12+
create: false
13+
- path: spec/selector/matchLabels
14+
create: false

jupyter/minimal/ubi9-python-3.11/kustomize/base/statefulset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ metadata:
99
opendatahub.io/user: jovyan
1010
spec:
1111
replicas: 1
12-
selector: {}
12+
selector:
13+
matchLabels: {}
1314
serviceName: notebook
1415
template:
1516
metadata:

jupyter/pytorch/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
namePrefix: jupyter-pytorch-ubi9-python-3-11-
5-
commonLabels:
6-
app: jupyter-pytorch-ubi9-python-3-11
75
resources:
86
- service.yaml
97
- statefulset.yaml
8+
transformers:
9+
- labels.yaml
1010
images:
1111
- name: quay.io/opendatahub/workbench-images
1212
newName: quay.io/opendatahub/workbench-images
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
app: jupyter-pytorch-ubi9-python-3-11
8+
fieldSpecs:
9+
- path: metadata/labels
10+
create: true
11+
- path: spec/template/metadata/labels
12+
create: false
13+
- path: spec/selector/matchLabels
14+
create: false

jupyter/pytorch/ubi9-python-3.11/kustomize/base/statefulset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ metadata:
99
opendatahub.io/user: jovyan
1010
spec:
1111
replicas: 1
12-
selector: {}
12+
selector:
13+
matchLabels: {}
1314
serviceName: notebook
1415
template:
1516
metadata:

jupyter/rocm/pytorch/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
namePrefix: jupyter-rocm-pytorch-ubi9-python-3-11-
5-
commonLabels:
6-
app: jupyter-rocm-pytorch-ubi9-python-3-11
75
resources:
86
- service.yaml
97
- statefulset.yaml
8+
transformers:
9+
- labels.yaml
1010
images:
1111
- name: quay.io/opendatahub/workbench-images
1212
newName: quay.io/opendatahub/workbench-images
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
app: jupyter-rocm-pytorch-ubi9-python-3-11
8+
fieldSpecs:
9+
- path: metadata/labels
10+
create: true
11+
- path: spec/template/metadata/labels
12+
create: false
13+
- path: spec/selector/matchLabels
14+
create: false

jupyter/rocm/pytorch/ubi9-python-3.11/kustomize/base/statefulset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ metadata:
99
opendatahub.io/user: jovyan
1010
spec:
1111
replicas: 1
12-
selector: {}
12+
selector:
13+
matchLabels: {}
1314
serviceName: notebook
1415
template:
1516
metadata:

jupyter/rocm/tensorflow/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
namePrefix: jupyter-rocm-tensorflow-ubi9-python-3-11-
5-
commonLabels:
6-
app: jupyter-rocm-tensorflow-ubi9-python-3-11
75
resources:
86
- service.yaml
97
- statefulset.yaml
8+
transformers:
9+
- labels.yaml
1010
images:
1111
- name: quay.io/opendatahub/workbench-images
1212
newName: quay.io/opendatahub/workbench-images
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
app: jupyter-rocm-tensorflow-ubi9-python-3-11
8+
fieldSpecs:
9+
- path: metadata/labels
10+
create: true
11+
- path: spec/template/metadata/labels
12+
create: false
13+
- path: spec/selector/matchLabels
14+
create: false

jupyter/rocm/tensorflow/ubi9-python-3.11/kustomize/base/statefulset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ metadata:
99
opendatahub.io/user: jovyan
1010
spec:
1111
replicas: 1
12-
selector: {}
12+
selector:
13+
matchLabels: {}
1314
serviceName: notebook
1415
template:
1516
metadata:

jupyter/tensorflow/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
namePrefix: jupyter-tensorflow-ubi9-python-3-11-
5-
commonLabels:
6-
app: jupyter-tensorflow-ubi9-python-3-11
75
resources:
86
- service.yaml
97
- statefulset.yaml
8+
transformers:
9+
- labels.yaml
1010
images:
1111
- name: quay.io/opendatahub/workbench-images
1212
newName: quay.io/opendatahub/workbench-images
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
app: jupyter-tensorflow-ubi9-python-3-11
8+
fieldSpecs:
9+
- path: metadata/labels
10+
create: true
11+
- path: spec/template/metadata/labels
12+
create: false
13+
- path: spec/selector/matchLabels
14+
create: false

jupyter/tensorflow/ubi9-python-3.11/kustomize/base/statefulset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ metadata:
99
opendatahub.io/user: jovyan
1010
spec:
1111
replicas: 1
12-
selector: {}
12+
selector:
13+
matchLabels: {}
1314
serviceName: notebook
1415
template:
1516
metadata:

jupyter/trustyai/ubi9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
namePrefix: jupyter-trustyai-ubi9-python-3-11-
5-
commonLabels:
6-
app: jupyter-trustyai-ubi9-python-3-11
75
resources:
86
- service.yaml
97
- statefulset.yaml
8+
transformers:
9+
- labels.yaml
1010
images:
1111
- name: quay.io/opendatahub/workbench-images
1212
newName: quay.io/opendatahub/workbench-images
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
app: jupyter-trustyai-ubi9-python-3-11
8+
fieldSpecs:
9+
- path: metadata/labels
10+
create: true
11+
- path: spec/template/metadata/labels
12+
create: false
13+
- path: spec/selector/matchLabels
14+
create: false

jupyter/trustyai/ubi9-python-3.11/kustomize/base/statefulset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ metadata:
99
opendatahub.io/user: jovyan
1010
spec:
1111
replicas: 1
12-
selector: {}
12+
selector:
13+
matchLabels: {}
1314
serviceName: notebook
1415
template:
1516
metadata:

manifests/base/kustomization.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ resources:
2121
- runtime-rocm-tensorflow-imagestream.yaml
2222
- runtime-tensorflow-imagestream.yaml
2323

24-
commonLabels:
25-
opendatahub.io/component: "true"
26-
component.opendatahub.io/name: notebooks
24+
transformers:
25+
- labels.yaml
2726

2827
configMapGenerator:
2928
- name: notebooks-parameters

manifests/base/labels.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
opendatahub.io/component: "true"
8+
component.opendatahub.io/name: notebooks
9+
fieldSpecs:
10+
- path: metadata/labels
11+
create: true

manifests/overlays/additional/kustomization.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ kind: Kustomization
55
resources:
66
- ../../base
77

8-
commonLabels:
9-
opendatahub.io/component: "true"
10-
component.opendatahub.io/name: notebooks
8+
transformers:
9+
- labels.yaml
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
opendatahub.io/component: "true"
8+
component.opendatahub.io/name: notebooks
9+
fieldSpecs:
10+
- path: metadata/labels
11+
create: true

rstudio/c9s-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ kind: Kustomization
44
namePrefix: rstudio-
55
resources:
66
- pod.yaml
7+
transformers:
8+
- labels.yaml
79
images:
810
- name: rstudio-workbench
911
newName: quay.io/opendatahub/workbench-images
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: builtin
3+
kind: LabelTransformer
4+
metadata:
5+
name: add-labels
6+
labels:
7+
app: rstudio-image
8+
fieldSpecs:
9+
- path: metadata/labels
10+
create: true
11+
- path: spec/template/metadata/labels
12+
create: false
13+
- path: spec/selector/matchLabels
14+
create: false

rstudio/c9s-python-3.11/kustomize/base/pod.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ apiVersion: v1
33
kind: Pod
44
metadata:
55
name: pod
6-
labels:
7-
app: rstudio-image
86
spec:
97
containers:
108
- name: rstudio

rstudio/rhel9-python-3.11/kustomize/base/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ kind: Kustomization
44
namePrefix: rstudio-
55
resources:
66
- pod.yaml
7+
transformers:
8+
- labels.yaml
79
images:
810
- name: rstudio-workbench
911
newName: quay.io/opendatahub/workbench-images

0 commit comments

Comments
 (0)