Skip to content
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

Jump to bottom

fix(operator): consistent pod service monitors reconcilor app labels #5073

Merged
merged 3 commits into from
Aug 10, 2023
Merged

fix(operator): consistent pod service monitors reconcilor app labels #5073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c31ec5
use "app.kubernetes.io/name" label for statefulset reconciler
michaelcheah Aug 8, 2023
cb15477
fix podmonitors to use labels configured in helm chart and reconciler
michaelcheah Aug 8, 2023
37c238c
add missing server-metrics port for mlserver server config
michaelcheah Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 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 @@ -1663,6 +1663,8 @@ spec:
- containerPort: 9000
name: server-http
protocol: TCP
- containerPort: 8082
RafalSkolasinski marked this conversation as resolved.
Show resolved Hide resolved
name: server-metrics
readinessProbe:
httpGet:
path: /v2/health/live
Expand Down
6 changes: 3 additions & 3 deletions operator/controllers/reconcilers/server/statefulset_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ func toStatefulSet(meta metav1.ObjectMeta,
scaling *mlopsv1alpha1.ScalingSpec,
labels map[string]string,
annotations map[string]string) *appsv1.StatefulSet {
labels[constants.AppKey] = constants.ServerLabelValue
metaLabels := utils.MergeMaps(map[string]string{constants.AppKey: constants.ServerLabelValue}, labels)
templateLabels := utils.MergeMaps(map[string]string{constants.ServerLabelNameKey: meta.Name, constants.AppKey: constants.ServerLabelValue}, labels)
labels[constants.KubernetesNameLabelKey] = constants.ServerLabelValue
metaLabels := utils.MergeMaps(map[string]string{constants.KubernetesNameLabelKey: constants.ServerLabelValue}, labels)
templateLabels := utils.MergeMaps(map[string]string{constants.ServerLabelNameKey: meta.Name, constants.KubernetesNameLabelKey: constants.ServerLabelValue}, labels)
ss := &appsv1.StatefulSet{
ObjectMeta: metav1.ObjectMeta{
Name: meta.Name,
Expand Down
14 changes: 7 additions & 7 deletions operator/controllers/reconcilers/server/statefulset_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
func TestStatefulSetReconcile(t *testing.T) {
g := NewGomegaWithT(t)

stsJson := `{"metadata":{"name":"mlserver","namespace":"ns1","creationTimestamp":null,"labels":{"app":"seldon-server","app.kubernetes.io/managed-by":"Helm"},"ownerReferences":[{"apiVersion":"mlops.seldon.io/v1alpha1","kind":"Server","name":"mlserver","uid":"7a9dc74b-552c-49da-8e45-09a6af752319","controller":true,"blockOwnerDeletion":true}]},"spec":{"replicas":1,"selector":{"matchLabels":{"seldon-server-name":"mlserver"}},"template":{"metadata":{"name":"mlserver","namespace":"ns1","creationTimestamp":null,"labels":{"app":"seldon-server","app.kubernetes.io/managed-by":"Helm","seldon-server-name":"mlserver"}},"spec":{"volumes":[{"name":"downstream-ca-certs","secret":{"secretName":"seldon-downstream-server","optional":true}},{"name":"config-volume","configMap":{"name":"seldon-agent"}},{"name":"tracing-config-volume","configMap":{"name":"seldon-tracing"}}],"containers":[{"name":"rclone","image":"docker.io/seldonio/seldon-rclone:latest","ports":[{"name":"rclone","containerPort":5572,"protocol":"TCP"}],"resources":{"limits":{"memory":"128Mi"},"requests":{"cpu":"50m","memory":"128Mi"}},"volumeMounts":[{"name":"mlserver-models","mountPath":"/mnt/agent"}],"readinessProbe":{"tcpSocket":{"port":5572},"initialDelaySeconds":5,"timeoutSeconds":1,"periodSeconds":5,"successThreshold":1,"failureThreshold":3},"lifecycle":{"preStop":{"httpGet":{"path":"terminate","port":9007}}},"imagePullPolicy":"IfNotPresent"}],"terminationGracePeriodSeconds":120,"serviceAccountName":"seldon-server","securityContext":{"runAsUser":1000,"runAsGroup":1000,"runAsNonRoot":true,"fsGroup":1000}}},"volumeClaimTemplates":[{"metadata":{"name":"mlserver-models","creationTimestamp":null},"spec":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"1Gi"}}},"status":{}}],"serviceName":"mlserver","podManagementPolicy":"Parallel","updateStrategy":{}},"status":{"replicas":0,"availableReplicas":0}}`
stsJson := `{"metadata":{"name":"mlserver","namespace":"ns1","creationTimestamp":null,"labels":{"app.kubernetes.io/name":"seldon-server","app.kubernetes.io/managed-by":"Helm"},"ownerReferences":[{"apiVersion":"mlops.seldon.io/v1alpha1","kind":"Server","name":"mlserver","uid":"7a9dc74b-552c-49da-8e45-09a6af752319","controller":true,"blockOwnerDeletion":true}]},"spec":{"replicas":1,"selector":{"matchLabels":{"seldon-server-name":"mlserver"}},"template":{"metadata":{"name":"mlserver","namespace":"ns1","creationTimestamp":null,"labels":{"app":"seldon-server","app.kubernetes.io/managed-by":"Helm","seldon-server-name":"mlserver"}},"spec":{"volumes":[{"name":"downstream-ca-certs","secret":{"secretName":"seldon-downstream-server","optional":true}},{"name":"config-volume","configMap":{"name":"seldon-agent"}},{"name":"tracing-config-volume","configMap":{"name":"seldon-tracing"}}],"containers":[{"name":"rclone","image":"docker.io/seldonio/seldon-rclone:latest","ports":[{"name":"rclone","containerPort":5572,"protocol":"TCP"}],"resources":{"limits":{"memory":"128Mi"},"requests":{"cpu":"50m","memory":"128Mi"}},"volumeMounts":[{"name":"mlserver-models","mountPath":"/mnt/agent"}],"readinessProbe":{"tcpSocket":{"port":5572},"initialDelaySeconds":5,"timeoutSeconds":1,"periodSeconds":5,"successThreshold":1,"failureThreshold":3},"lifecycle":{"preStop":{"httpGet":{"path":"terminate","port":9007}}},"imagePullPolicy":"IfNotPresent"}],"terminationGracePeriodSeconds":120,"serviceAccountName":"seldon-server","securityContext":{"runAsUser":1000,"runAsGroup":1000,"runAsNonRoot":true,"fsGroup":1000}}},"volumeClaimTemplates":[{"metadata":{"name":"mlserver-models","creationTimestamp":null},"spec":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"1Gi"}}},"status":{}}],"serviceName":"mlserver","podManagementPolicy":"Parallel","updateStrategy":{}},"status":{"replicas":0,"availableReplicas":0}}`
sts := appsv1.StatefulSet{}
err := json.Unmarshal([]byte(stsJson), &sts)
g.Expect(err).To(BeNil())
Expand Down Expand Up @@ -271,7 +271,7 @@ func TestStatefulSetReconcile(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Namespace: "default",
Labels: map[string]string{constants.AppKey: constants.ServerLabelValue},
Labels: map[string]string{constants.KubernetesNameLabelKey: constants.ServerLabelValue},
},
Spec: appsv1.StatefulSetSpec{
ServiceName: "foo",
Expand All @@ -281,7 +281,7 @@ func TestStatefulSetReconcile(t *testing.T) {
},
Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{constants.ServerLabelNameKey: "foo", constants.AppKey: constants.ServerLabelValue},
Labels: map[string]string{constants.ServerLabelNameKey: "foo", constants.KubernetesNameLabelKey: constants.ServerLabelValue},
Name: "foo",
Namespace: "default",
},
Expand Down Expand Up @@ -417,8 +417,8 @@ func TestToStatefulSet(t *testing.T) {
Name: "foo",
Namespace: "default",
Labels: map[string]string{
constants.AppKey: constants.ServerLabelValue,
"l1": "l1val"},
constants.KubernetesNameLabelKey: constants.ServerLabelValue,
"l1": "l1val"},
Annotations: map[string]string{"a1": "a1val"},
},
Spec: appsv1.StatefulSetSpec{
Expand All @@ -430,8 +430,8 @@ func TestToStatefulSet(t *testing.T) {
Template: v1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{constants.ServerLabelNameKey: "foo",
constants.AppKey: constants.ServerLabelValue,
"l1": "l1val"},
constants.KubernetesNameLabelKey: constants.ServerLabelValue,
"l1": "l1val"},
Annotations: map[string]string{"a1": "a1val"},
Name: "foo",
Namespace: "default",
Expand Down
1 change: 0 additions & 1 deletion operator/pkg/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ var (

// Label selector
const (
AppKey = "app"
KubernetesNameLabelKey = "app.kubernetes.io/name"
ServerLabelValue = "seldon-server"
ServerLabelNameKey = "seldon-server-name"
Expand Down
2 changes: 1 addition & 1 deletion prometheus/monitors/agent-podmonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
selector:
matchLabels:
app: seldon-server
app.kubernetes.io/name: seldon-server
namespaceSelector:
matchNames: []
any: false
Expand Down
2 changes: 1 addition & 1 deletion prometheus/monitors/envoy-servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
selector:
matchLabels:
app: seldon-mesh
app.kubernetes.io/name: seldon-envoy
namespaceSelector:
matchNames: []
any: false
Expand Down
2 changes: 1 addition & 1 deletion prometheus/monitors/pipelinegateway-podmonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
selector:
matchLabels:
app: pipelinegateway
RafalSkolasinski marked this conversation as resolved.
Show resolved Hide resolved
app.kubernetes.io/name: pipelinegateway
namespaceSelector:
matchNames: []
any: false
Expand Down
2 changes: 1 addition & 1 deletion prometheus/monitors/server-podmonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
selector:
matchLabels:
app: seldon-server
RafalSkolasinski marked this conversation as resolved.
Show resolved Hide resolved
app.kubernetes.io/name: seldon-server
namespaceSelector:
matchNames: []
any: false
Expand Down