Skip to content

feat(charts): adding labels and annotations to a seldonconfig component #5918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
driev merged 14 commits into from
Sep 25, 2024
Merged

feat(charts): adding labels and annotations to a seldonconfig component #5918

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1368af2
adding a metadata object to seldonconfig components
driev Sep 18, 2024
c3bf03b
Merge branch 'v2' into INFRA-642/per-seldonconfig-component-metadata
driev Sep 18, 2024
3304394
adding labels to the servers helm charts
driev Sep 20, 2024
f811754
add metadata to seldonconfig.component
driev Sep 20, 2024
05a8257
using sed to template the templates
driev Sep 20, 2024
83816cf
add makefile changes
driev Sep 20, 2024
5a5ca1a
patching each component with labels and annotations
driev Sep 23, 2024
0d66317
add a test
driev Sep 23, 2024
942bea7
missing forward slash
driev Sep 23, 2024
5056fa2
hack labelz
driev Sep 23, 2024
e36088a
remove test labels
driev Sep 23, 2024
3bc8d5e
add annotationz to servers
driev Sep 23, 2024
b4c137c
add prometheus annotations to the default seldonconfig
driev Sep 24, 2024
95c7632
add a comment and a test
driev Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions k8s/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ create-helm-charts:
kustomize build kustomize/helm-servers/ > ${HELM_SERVERS_BASE}/seldon-v2-servers.yaml
sed -i 's/\(.*\)\(imagePullSecrets:\).*/{{- with .Values.imagePullSecrets }}\n\1\2\n\1{{- toYaml . | nindent 8 }}\n{{- end }}/g' ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml
sed -i 's/HACK_REMOVE_ME//' ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml
sed 's/HACK_REMOVE_ME//' ${HELM_SERVERS_BASE}/seldon-v2-servers.yaml \
> ${HELM_SERVERS_BASE}/.seldon-v2-servers.yaml
sed 's/labelz:/labels:\n\ \ \ /' ${HELM_SERVERS_BASE}/seldon-v2-servers.yaml > ${HELM_SERVERS_BASE}/.seldon-v2-servers.yaml
sed -i 's/HACK_REMOVE_ME//' ${HELM_SERVERS_BASE}/.seldon-v2-servers.yaml
sed -zi 's#\(apiVersion: rbac.authorization.k8s.io/v1\nkind: ClusterRole.*\- get\n\-\-\-\)#{{- if .Values.controller.clusterwide -}}\n\1\n{{- end }}#' ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml
sed -zi 's#\(apiVersion: rbac.authorization.k8s.io/v1\nkind: ClusterRoleBinding.*ServiceAccount\n name: seldon-v2-controller-manager\n namespace:[^-]\{27\}\n\-\-\-\)#{{- if .Values.controller.clusterwide -}}\n\1\n{{- end }}#' ${HELM_COMPONENTS_BASE}/seldon-v2-components.yaml
mv ${HELM_SERVERS_BASE}/.seldon-v2-servers.yaml ${HELM_SERVERS_BASE}/seldon-v2-servers.yaml
Expand Down
8 changes: 8 additions & 0 deletions k8s/helm-charts/seldon-core-v2-crds/templates/seldon-v2-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,14 @@ spec:
components:
items:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
name:
type: string
podSpec:
Expand Down
4 changes: 4 additions & 0 deletions k8s/helm-charts/seldon-core-v2-servers/templates/seldon-v2-servers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: mlops.seldon.io/v1alpha1
kind: Server
metadata:
labels:
{{ .Values.mlserver.labels | toYaml }}
name: mlserver
namespace: '{{ .Release.Namespace }}'
spec:
Expand All @@ -11,6 +13,8 @@ spec:
apiVersion: mlops.seldon.io/v1alpha1
kind: Server
metadata:
labels:
{{ .Values.triton.labels | toYaml }}
name: triton
namespace: '{{ .Release.Namespace }}'
spec:
Expand Down
29 changes: 23 additions & 6 deletions k8s/helm-charts/seldon-core-v2-setup/templates/seldon-v2-components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,10 @@ metadata:
namespace: '{{ .Release.Namespace }}'
spec:
components:
- name: seldon-scheduler
- annotations: {{- toYaml .Values.scheduler.annotations | nindent
8 }}
labels: {{- toYaml .Values.scheduler.labels | nindent 8 }}
name: seldon-scheduler
podSpec:
containers:
- args:
Expand Down Expand Up @@ -1009,7 +1012,10 @@ spec:
resources:
requests:
storage: '{{ .Values.scheduler.resources.storage }}'
- name: seldon-pipelinegateway
- annotations: {{- toYaml .Values.pipelinegateway.annotations | nindent
8 }}
labels: {{- toYaml .Values.pipelinegateway.labels | nindent 8 }}
name: seldon-pipelinegateway
podSpec:
containers:
- args:
Expand Down Expand Up @@ -1145,7 +1151,10 @@ spec:
name: seldon-tracing
name: tracing-config-volume
replicas: 1
- name: seldon-modelgateway
- annotations: {{- toYaml .Values.modelgateway.annotations | nindent
8 }}
labels: {{- toYaml .Values.modelgateway.labels | nindent 8 }}
name: seldon-modelgateway
podSpec:
containers:
- args:
Expand Down Expand Up @@ -1263,7 +1272,10 @@ spec:
name: seldon-tracing
name: tracing-config-volume
replicas: 1
- name: hodometer
- annotations: {{- toYaml .Values.hodometer.annotations | nindent
8 }}
labels: {{- toYaml .Values.hodometer.labels | nindent 8 }}
name: hodometer
podSpec:
containers:
- env:
Expand Down Expand Up @@ -1319,7 +1331,9 @@ spec:
serviceAccountName: hodometer
terminationGracePeriodSeconds: 5
replicas: 1
- name: seldon-envoy
- annotations: {{- toYaml .Values.envoy.annotations | nindent 8 }}
labels: {{- toYaml .Values.envoy.labels | nindent 8 }}
name: seldon-envoy
podSpec:
containers:
- env:
Expand Down Expand Up @@ -1374,7 +1388,10 @@ spec:
8 }}
terminationGracePeriodSeconds: 5
replicas: 1
- name: seldon-dataflow-engine
- annotations: {{- toYaml .Values.dataflow.annotations | nindent 8
}}
labels: {{- toYaml .Values.dataflow.labels | nindent 8 }}
name: seldon-dataflow-engine
podSpec:
containers:
- env:
Expand Down
4 changes: 4 additions & 0 deletions k8s/helm-charts/seldon-core-v2-setup/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ controller:
runAsNonRoot: true

envoy:
annotations:
"prometheus.io/path": "/stats/prometheus"
"prometheus.io/port": "9003"
"prometheus.io/scrape": "true"
image:
pullPolicy: IfNotPresent
registry: docker.io
Expand Down
4 changes: 4 additions & 0 deletions k8s/helm-charts/seldon-core-v2-setup/values.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ controller:
runAsNonRoot: true

envoy:
annotations:
"prometheus.io/path": "/stats/prometheus"
"prometheus.io/port": "9003"
"prometheus.io/scrape": "true"
image:
pullPolicy: IfNotPresent
registry: docker.io
Expand Down
6 changes: 6 additions & 0 deletions k8s/kustomize/helm-components-sc/patch_dataflow_json6902.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
- op: replace
path: /spec/components/5/podSpec/securityContext
value: HACK_REMOVE_ME{{- toYaml .Values.dataflow.securityContext | nindent 8 }}
- op: replace
path: /spec/components/5/labels
value: HACK_REMOVE_ME{{- toYaml .Values.dataflow.labels | nindent 8 }}
- op: replace
path: /spec/components/5/annotations
value: HACK_REMOVE_ME{{- toYaml .Values.dataflow.annotations | nindent 8 }}
6 changes: 6 additions & 0 deletions k8s/kustomize/helm-components-sc/patch_envoy_json6902.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,9 @@
- op: replace
path: /spec/components/4/podSpec/securityContext
value: HACK_REMOVE_ME{{- toYaml .Values.envoy.securityContext | nindent 8 }}
- op: replace
path: /spec/components/4/labels
value: HACK_REMOVE_ME{{- toYaml .Values.envoy.labels | nindent 8 }}
- op: replace
path: /spec/components/4/annotations
value: HACK_REMOVE_ME{{- toYaml .Values.envoy.annotations | nindent 8 }}
6 changes: 6 additions & 0 deletions k8s/kustomize/helm-components-sc/patch_hodometer_json6902.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,9 @@
- op: replace
path: /spec/components/3/podSpec/securityContext
value: HACK_REMOVE_ME{{- toYaml .Values.hodometer.securityContext | nindent 8 }}
- op: replace
path: /spec/components/3/labels
value: HACK_REMOVE_ME{{- toYaml .Values.hodometer.labels | nindent 8 }}
- op: replace
path: /spec/components/3/annotations
value: HACK_REMOVE_ME{{- toYaml .Values.hodometer.annotations | nindent 8 }}
6 changes: 6 additions & 0 deletions k8s/kustomize/helm-components-sc/patch_modelgateway_json6902.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
- op: replace
path: /spec/components/2/podSpec/securityContext
value: HACK_REMOVE_ME{{- toYaml .Values.modelgateway.securityContext | nindent 8 }}
- op: replace
path: /spec/components/2/labels
value: HACK_REMOVE_ME{{- toYaml .Values.modelgateway.labels | nindent 8 }}
- op: replace
path: /spec/components/2/annotations
value: HACK_REMOVE_ME{{- toYaml .Values.modelgateway.annotations | nindent 8 }}
6 changes: 6 additions & 0 deletions k8s/kustomize/helm-components-sc/patch_pipelinegateway_json6902.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
- op: replace
path: /spec/components/1/podSpec/securityContext
value: HACK_REMOVE_ME{{- toYaml .Values.pipelinegateway.securityContext | nindent 8 }}
- op: replace
path: /spec/components/1/labels
value: HACK_REMOVE_ME{{- toYaml .Values.pipelinegateway.labels | nindent 8 }}
- op: replace
path: /spec/components/1/annotations
value: HACK_REMOVE_ME{{- toYaml .Values.pipelinegateway.annotations | nindent 8 }}
6 changes: 6 additions & 0 deletions k8s/kustomize/helm-components-sc/patch_scheduler_json6902.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
- op: replace
path: /spec/components/0/podSpec/securityContext
value: HACK_REMOVE_ME{{- toYaml .Values.scheduler.securityContext | nindent 8 }}
- op: replace
path: /spec/components/0/labels
value: HACK_REMOVE_ME{{- toYaml .Values.scheduler.labels | nindent 8 }}
- op: replace
path: /spec/components/0/annotations
value: HACK_REMOVE_ME{{- toYaml .Values.scheduler.annotations | nindent 8 }}
1 change: 1 addition & 0 deletions k8s/kustomize/helm-servers/patch_mlserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: mlops.seldon.io/v1alpha1
kind: Server
metadata:
name: mlserver
labelz: HACK_REMOVE_ME{{ .Values.mlserver.labels | toYaml }}
spec:
replicas: HACK_REMOVE_ME{{ .Values.mlserver.replicas }}
podSpec: HACK_REMOVE_ME{{ toJson .Values.mlserver.podSpec }}
1 change: 1 addition & 0 deletions k8s/kustomize/helm-servers/patch_triton.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: mlops.seldon.io/v1alpha1
kind: Server
metadata:
name: triton
labelz: HACK_REMOVE_ME{{ .Values.triton.labels | toYaml }}
spec:
replicas: HACK_REMOVE_ME{{ .Values.triton.replicas }}
podSpec: HACK_REMOVE_ME{{ toJson .Values.triton.podSpec }}
38 changes: 32 additions & 6 deletions k8s/yaml/components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,11 @@ metadata:
name: default
spec:
components:
- name: seldon-scheduler
- annotations:
null
labels:
null
name: seldon-scheduler
podSpec:
containers:
- args:
Expand Down Expand Up @@ -648,7 +652,11 @@ spec:
resources:
requests:
storage: '1Gi'
- name: seldon-pipelinegateway
- annotations:
null
labels:
null
name: seldon-pipelinegateway
podSpec:
containers:
- args:
Expand Down Expand Up @@ -778,7 +786,11 @@ spec:
name: seldon-tracing
name: tracing-config-volume
replicas: 1
- name: seldon-modelgateway
- annotations:
null
labels:
null
name: seldon-modelgateway
podSpec:
containers:
- args:
Expand Down Expand Up @@ -891,7 +903,11 @@ spec:
name: seldon-tracing
name: tracing-config-volume
replicas: 1
- name: hodometer
- annotations:
null
labels:
null
name: hodometer
podSpec:
containers:
- env:
Expand Down Expand Up @@ -944,7 +960,13 @@ spec:
serviceAccountName: hodometer
terminationGracePeriodSeconds: 5
replicas: 1
- name: seldon-envoy
- annotations:
prometheus.io/path: /stats/prometheus
prometheus.io/port: "9003"
prometheus.io/scrape: "true"
labels:
null
name: seldon-envoy
podSpec:
containers:
- env:
Expand Down Expand Up @@ -996,7 +1018,11 @@ spec:
runAsUser: 1000
terminationGracePeriodSeconds: 5
replicas: 1
- name: seldon-dataflow-engine
- annotations:
null
labels:
null
name: seldon-dataflow-engine
podSpec:
containers:
- env:
Expand Down
8 changes: 8 additions & 0 deletions k8s/yaml/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,14 @@ spec:
components:
items:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
name:
type: string
podSpec:
Expand Down
6 changes: 6 additions & 0 deletions k8s/yaml/runtime.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,28 @@ spec:
- name: hodometer
disable: false
replicas: 1
podSpec: null
- name: seldon-scheduler
disable: false
serviceType: LoadBalancer
podSpec: null
- name: seldon-envoy
disable: false
replicas: 1
serviceType: LoadBalancer
podSpec: null
- name: seldon-dataflow-engine
disable: false
replicas: 1
podSpec: null
- name: seldon-modelgateway
disable: false
replicas: 1
podSpec: null
- name: seldon-pipelinegateway
disable: false
replicas: 1
podSpec: null
config:
agentConfig:
rclone:
Expand Down
6 changes: 6 additions & 0 deletions k8s/yaml/servers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,22 @@
apiVersion: mlops.seldon.io/v1alpha1
kind: Server
metadata:
labels:
null
name: mlserver
spec:
podSpec: null
replicas: 1
serverConfig: mlserver
---
# Source: seldon-core-v2-servers/templates/seldon-v2-servers.yaml
apiVersion: mlops.seldon.io/v1alpha1
kind: Server
metadata:
labels:
null
name: triton
spec:
podSpec: null
replicas: 1
serverConfig: triton
3 changes: 3 additions & 0 deletions operator/apis/mlops/v1alpha1/seldonconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ type TracingConfig struct {

type ComponentDefn struct {
// +kubebuilder:validation:Required

Name string `json:"name"`
Labels map[string]string `json:"labels,omitempty"`
Annotations map[string]string `json:"annotations,omitempty"`
Replicas *int32 `json:"replicas,omitempty"`
PodSpec *v1.PodSpec `json:"podSpec,omitempty"`
VolumeClaimTemplates []PersistentVolumeClaim `json:"volumeClaimTemplates,omitempty"`
Expand Down
14 changes: 14 additions & 0 deletions operator/apis/mlops/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading