From 7a661cf9cbe7952da721f8c8b00ed28eba19cb03 Mon Sep 17 00:00:00 2001 From: Andrey Velichkevich Date: Wed, 11 Aug 2021 20:54:01 +0100 Subject: [PATCH] Modify Labels for Katib Components (#1611) --- examples/v1beta1/trial-configmap-source.yaml | 2 +- .../v1beta1/components/cert-generator/cert-generator.yaml | 2 ++ manifests/v1beta1/components/controller/controller.yaml | 7 +++---- manifests/v1beta1/components/controller/service.yaml | 4 +++- .../v1beta1/components/controller/trial-templates.yaml | 4 ++-- manifests/v1beta1/components/db-manager/db-manager.yaml | 7 +++---- manifests/v1beta1/components/db-manager/service.yaml | 4 ++-- manifests/v1beta1/components/mysql/mysql.yaml | 7 +++---- manifests/v1beta1/components/mysql/service.yaml | 4 ++-- manifests/v1beta1/components/ui/service.yaml | 4 ++-- manifests/v1beta1/components/ui/ui.yaml | 7 +++---- pkg/controller.v1beta1/consts/const.go | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/v1beta1/trial-configmap-source.yaml b/examples/v1beta1/trial-configmap-source.yaml index 3e2fa353a86..2457d0bced7 100644 --- a/examples/v1beta1/trial-configmap-source.yaml +++ b/examples/v1beta1/trial-configmap-source.yaml @@ -48,6 +48,6 @@ spec: description: Training model optimizer (sdg, adam or ftrl) reference: optimizer configMap: - configMapName: trial-template + configMapName: trial-templates configMapNamespace: kubeflow templatePath: defaultTrialTemplate.yaml diff --git a/manifests/v1beta1/components/cert-generator/cert-generator.yaml b/manifests/v1beta1/components/cert-generator/cert-generator.yaml index e55631af6e1..234543c21cc 100644 --- a/manifests/v1beta1/components/cert-generator/cert-generator.yaml +++ b/manifests/v1beta1/components/cert-generator/cert-generator.yaml @@ -3,6 +3,8 @@ kind: Job metadata: name: katib-cert-generator namespace: kubeflow + labels: + katib.kubeflow.org/component: cert-generator spec: template: metadata: diff --git a/manifests/v1beta1/components/controller/controller.yaml b/manifests/v1beta1/components/controller/controller.yaml index 7c2a5c876b7..6cadb0863f5 100644 --- a/manifests/v1beta1/components/controller/controller.yaml +++ b/manifests/v1beta1/components/controller/controller.yaml @@ -3,18 +3,17 @@ kind: Deployment metadata: name: katib-controller namespace: kubeflow - # TODO (andreyvelich): Modify labels to follow k8s guidelines. labels: - app: katib-controller + katib.kubeflow.org/component: controller spec: replicas: 1 selector: matchLabels: - app: katib-controller + katib.kubeflow.org/component: controller template: metadata: labels: - app: katib-controller + katib.kubeflow.org/component: controller annotations: prometheus.io/scrape: "true" sidecar.istio.io/inject: "false" diff --git a/manifests/v1beta1/components/controller/service.yaml b/manifests/v1beta1/components/controller/service.yaml index cb2548a13c7..d159217f13e 100644 --- a/manifests/v1beta1/components/controller/service.yaml +++ b/manifests/v1beta1/components/controller/service.yaml @@ -3,6 +3,8 @@ kind: Service metadata: name: katib-controller namespace: kubeflow + labels: + katib.kubeflow.org/component: controller annotations: prometheus.io/port: "8080" prometheus.io/scheme: http @@ -17,4 +19,4 @@ spec: port: 8080 targetPort: 8080 selector: - app: katib-controller + katib.kubeflow.org/component: controller diff --git a/manifests/v1beta1/components/controller/trial-templates.yaml b/manifests/v1beta1/components/controller/trial-templates.yaml index 998e12d6d5d..69144e08e60 100644 --- a/manifests/v1beta1/components/controller/trial-templates.yaml +++ b/manifests/v1beta1/components/controller/trial-templates.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: ConfigMap metadata: - name: trial-template + name: trial-templates namespace: kubeflow labels: - app: katib-trial-templates + katib.kubeflow.org/component: trial-templates data: defaultTrialTemplate.yaml: |- apiVersion: batch/v1 diff --git a/manifests/v1beta1/components/db-manager/db-manager.yaml b/manifests/v1beta1/components/db-manager/db-manager.yaml index e18619ebd64..cc7cb79dc5c 100644 --- a/manifests/v1beta1/components/db-manager/db-manager.yaml +++ b/manifests/v1beta1/components/db-manager/db-manager.yaml @@ -3,18 +3,17 @@ kind: Deployment metadata: name: katib-db-manager namespace: kubeflow - # TODO (andreyvelich): Modify labels to follow k8s guidelines. labels: - app: katib-db-manager + katib.kubeflow.org/component: db-manager spec: replicas: 1 selector: matchLabels: - app: katib-db-manager + katib.kubeflow.org/component: db-manager template: metadata: labels: - app: katib-db-manager + katib.kubeflow.org/component: db-manager annotations: sidecar.istio.io/inject: "false" spec: diff --git a/manifests/v1beta1/components/db-manager/service.yaml b/manifests/v1beta1/components/db-manager/service.yaml index 429de359629..427ec4b9ed6 100644 --- a/manifests/v1beta1/components/db-manager/service.yaml +++ b/manifests/v1beta1/components/db-manager/service.yaml @@ -4,7 +4,7 @@ metadata: name: katib-db-manager namespace: kubeflow labels: - app: katib-db-manager + katib.kubeflow.org/component: db-manager spec: type: ClusterIP ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: api selector: - app: katib-db-manager + katib.kubeflow.org/component: db-manager diff --git a/manifests/v1beta1/components/mysql/mysql.yaml b/manifests/v1beta1/components/mysql/mysql.yaml index f481d9e275d..fb6c7cf097f 100644 --- a/manifests/v1beta1/components/mysql/mysql.yaml +++ b/manifests/v1beta1/components/mysql/mysql.yaml @@ -3,20 +3,19 @@ kind: Deployment metadata: name: katib-mysql namespace: kubeflow - # TODO (andreyvelich): Modify labels to follow k8s guidelines. labels: - app: katib-mysql + katib.kubeflow.org/component: mysql spec: replicas: 1 selector: matchLabels: - app: katib-mysql + katib.kubeflow.org/component: mysql strategy: type: Recreate template: metadata: labels: - app: katib-mysql + katib.kubeflow.org/component: mysql annotations: sidecar.istio.io/inject: "false" spec: diff --git a/manifests/v1beta1/components/mysql/service.yaml b/manifests/v1beta1/components/mysql/service.yaml index d06823e4e3e..9ce709a4363 100644 --- a/manifests/v1beta1/components/mysql/service.yaml +++ b/manifests/v1beta1/components/mysql/service.yaml @@ -4,7 +4,7 @@ metadata: name: katib-mysql namespace: kubeflow labels: - app: katib-mysql + katib.kubeflow.org/component: mysql spec: type: ClusterIP ports: @@ -12,4 +12,4 @@ spec: protocol: TCP name: dbapi selector: - app: katib-mysql + katib.kubeflow.org/component: mysql diff --git a/manifests/v1beta1/components/ui/service.yaml b/manifests/v1beta1/components/ui/service.yaml index 0b9038f69e8..34b70decf76 100644 --- a/manifests/v1beta1/components/ui/service.yaml +++ b/manifests/v1beta1/components/ui/service.yaml @@ -4,7 +4,7 @@ metadata: name: katib-ui namespace: kubeflow labels: - app: katib-ui + katib.kubeflow.org/component: ui spec: type: ClusterIP ports: @@ -13,4 +13,4 @@ spec: name: ui targetPort: 8080 selector: - app: katib-ui + katib.kubeflow.org/component: ui diff --git a/manifests/v1beta1/components/ui/ui.yaml b/manifests/v1beta1/components/ui/ui.yaml index b0806f6753a..6582db1d0e9 100644 --- a/manifests/v1beta1/components/ui/ui.yaml +++ b/manifests/v1beta1/components/ui/ui.yaml @@ -3,18 +3,17 @@ kind: Deployment metadata: name: katib-ui namespace: kubeflow - # TODO (andreyvelich): Modify labels to follow k8s guidelines. labels: - app: katib-ui + katib.kubeflow.org/component: ui spec: replicas: 1 selector: matchLabels: - app: katib-ui + katib.kubeflow.org/component: ui template: metadata: labels: - app: katib-ui + katib.kubeflow.org/component: ui annotations: sidecar.istio.io/inject: "false" spec: diff --git a/pkg/controller.v1beta1/consts/const.go b/pkg/controller.v1beta1/consts/const.go index a61d99a7c6b..0ac309ddbdc 100644 --- a/pkg/controller.v1beta1/consts/const.go +++ b/pkg/controller.v1beta1/consts/const.go @@ -142,9 +142,9 @@ const ( AnnotationIstioSidecarInjectValue = "false" // LabelTrialTemplateConfigMapName is the label name for the Trial templates configMap - LabelTrialTemplateConfigMapName = "app" + LabelTrialTemplateConfigMapName = "katib.kubeflow.org/component" // LabelTrialTemplateConfigMapValue is the label value for the Trial templates configMap - LabelTrialTemplateConfigMapValue = "katib-trial-templates" + LabelTrialTemplateConfigMapValue = "trial-templates" // TrialTemplateParamReplaceFormat is the format to make substitution in Trial template from Names in TrialParameters // E.g if Name = learningRate, according value in Trial template must be ${trialParameters.learningRate}