kubeflow · google-oss-prow · May 9, 2025 · Mar 14, 2025 · Mar 19, 2025 · Mar 20, 2025
diff --git a/conformance/run.sh b/conformance/run.sh
@@ -2,7 +2,7 @@
 
 # Run conformance test and generate test report.
 python test/e2e/v1beta1/scripts/gh-actions/run-e2e-experiment.py --experiment-path examples/v1beta1/hp-tuning/random.yaml --namespace kf-conformance \
---trial-pod-annotations '{"sidecar.istio.io/inject": "false"}' | tee /tmp/katib-conformance.log
+--trial-pod-labels '{"sidecar.istio.io/inject": "false"}' | tee /tmp/katib-conformance.log
 
 
 # Create the done file.

diff --git a/docs/proposals/1214-custom-crd-in-trial/README.md b/docs/proposals/1214-custom-crd-in-trial/README.md
@@ -180,7 +180,7 @@ SucceededCondition: Succeeded
 Previously, we had problems with Istio sidecar containers,
 check [kubeflow/issue#1081](https://github.com/kubeflow/kubeflow/issues/4742).
 In some cases, it is unable to properly download datasets in training pod.
-It was fixed by adding annotation `sidecar.istio.io/inject: false` to appropriate Trial job in Katib controller.
+It was fixed by adding label `sidecar.istio.io/inject: false` to appropriate Trial job in Katib controller.
 
 Various CRD can have unified design and it is hard to understand where annotation must be specified
 to disable Istio injection for the running pods.

diff --git a/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb b/examples/v1beta1/kubeflow-pipelines/early-stopping.ipynb
@@ -222,7 +222,7 @@
     "    \"spec\": {\n",
     "        \"template\": {\n",
     "            \"metadata\": {\n",
-    "                \"annotations\": {\n",
+    "                \"labels\": {\n",
     "                     \"sidecar.istio.io/inject\": \"false\"\n",
     "                }\n",
     "            },\n",

diff --git a/examples/v1beta1/kubeflow-pipelines/kubeflow-e2e-mnist.ipynb b/examples/v1beta1/kubeflow-pipelines/kubeflow-e2e-mnist.ipynb
@@ -210,7 +210,7 @@
     "                    \"restartPolicy\": \"OnFailure\",\n",
     "                    \"template\": {\n",
     "                        \"metadata\": {\n",
-    "                            \"annotations\": {\n",
+    "                            \"labels\": {\n",
     "                                \"sidecar.istio.io/inject\": \"false\"\n",
     "                            }\n",
     "                        },\n",
@@ -236,7 +236,7 @@
     "                    \"restartPolicy\": \"OnFailure\",\n",
     "                    \"template\": {\n",
     "                        \"metadata\": {\n",
-    "                            \"annotations\": {\n",
+    "                            \"labels\": {\n",
     "                                \"sidecar.istio.io/inject\": \"false\"\n",
     "                            }\n",
     "                        },\n",
@@ -360,7 +360,7 @@
     "        \"restartPolicy\": \"OnFailure\",\n",
     "        \"template\": {\n",
     "            \"metadata\": {\n",
-    "                \"annotations\": {\n",
+    "                \"labels\": {\n",
     "                    \"sidecar.istio.io/inject\": \"false\"\n",
     "                }\n",
     "            },\n",
@@ -401,7 +401,7 @@
     "        \"restartPolicy\": \"OnFailure\",\n",
     "        \"template\": {\n",
     "            \"metadata\": {\n",
-    "                \"annotations\": {\n",
+    "                \"labels\": {\n",
     "                    \"sidecar.istio.io/inject\": \"false\"\n",
     "                }\n",
     "            },\n",
@@ -600,7 +600,7 @@
     },
     {
      "data": {
-      "image/png": "iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAAAAABXZoBIAAAA1ElEQVR4nN3QPwtBYRQG8EMU0e0uZLIw+QKXRZlMGC0GX8CglE0pk0VxPwQmE5YrJYPVIjYMlImSwXNiMOi97319AM/6O6fzh+g/Y5hr5mrRNByseAZba4D7EnlSN8wy3uAYXJOwDEw0ohKwD9mtxehqRLQBCnZr8GPkJ/Ll79y0m37GiIjiK2AQsGMYiIbryyvjmZO20U9gAIcjTg43GhfethOROToO+En6xRUlZhnSjd+I6BY7xVIRY79w4XapR9IOSTWWYSWUqE0xlH771R7UrULefm5U2pxVCt0AAAAASUVORK5CYII=\n",
+      "image/png": "iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAAAAABXZoBIAAAA1ElEQVR4nN3QPwtBYRQG8EMU0e0uZLIw+QKXRZlMGC0GX8CglE0pk0VxPwQmE5YrJYPVIjYMlImSwXNiMOi97319AM/6O6fzh+g/Y5hr5mrRNByseAZba4D7EnlSN8wy3uAYXJOwDEw0ohKwD9mtxehqRLQBCnZr8GPkJ/Ll79y0m37GiIjiK2AQsGMYiIbryyvjmZO20U9gAIcjTg43GhfethOROToO+En6xRUlZhnSjd+I6BY7xVIRY79w4XapR9IOSTWWYSWUqE0xlH771R7UrULefm5U2pxVCt0AAAAASUVORK5CYII=",
       "text/plain": [
        "<PIL.BmpImagePlugin.BmpImageFile image mode=L size=28x28 at 0x7F9A711F33A0>"
       ]

diff --git a/examples/v1beta1/kubeflow-pipelines/mpi-job-horovod.py b/examples/v1beta1/kubeflow-pipelines/mpi-job-horovod.py
@@ -96,9 +96,7 @@ def horovod_mnist_hpo(
                 "Launcher": {
                     "replicas": 1,
                     "template": {
-                        "metadata": {
-                            "annotations": {"sidecar.istio.io/inject": "false"}
-                        },
+                        "metadata": {"labels": {"sidecar.istio.io/inject": "false"}},
                         "spec": {
                             "containers": [
                                 {
@@ -141,9 +139,7 @@ def horovod_mnist_hpo(
                 "Worker": {
                     "replicas": 2,
                     "template": {
-                        "metadata": {
-                            "annotations": {"sidecar.istio.io/inject": "false"}
-                        },
+                        "metadata": {"labels": {"sidecar.istio.io/inject": "false"}},
                         "spec": {
                             "containers": [
                                 {

diff --git a/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb b/examples/v1beta1/sdk/cmaes-and-resume-policies.ipynb
@@ -125,7 +125,7 @@
     "    \"spec\": {\n",
     "        \"template\": {\n",
     "            \"metadata\": {\n",
-    "                \"annotations\": {\n",
+    "                \"labels\": {\n",
     "                    \"sidecar.istio.io/inject\": \"false\"\n",
     "                }\n",
     "            },\n",

diff --git a/examples/v1beta1/sdk/nas-with-darts.ipynb b/examples/v1beta1/sdk/nas-with-darts.ipynb
@@ -224,7 +224,7 @@
     "    \"spec\": {\n",
     "        \"template\": {\n",
     "            \"metadata\": {\n",
-    "                \"annotations\": {\n",
+    "                \"labels\": {\n",
     "                    \"sidecar.istio.io/inject\": \"false\"\n",
     "                }\n",
     "            },\n",

diff --git a/manifests/v1beta1/components/controller/controller.yaml b/manifests/v1beta1/components/controller/controller.yaml
@@ -15,10 +15,10 @@ spec:
     metadata:
       labels:
         katib.kubeflow.org/component: controller
+        sidecar.istio.io/inject: "false"
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "8080"
-        sidecar.istio.io/inject: "false"
     spec:
       serviceAccountName: katib-controller
       containers:

diff --git a/manifests/v1beta1/components/db-manager/db-manager.yaml b/manifests/v1beta1/components/db-manager/db-manager.yaml
@@ -15,7 +15,6 @@ spec:
     metadata:
       labels:
         katib.kubeflow.org/component: db-manager
-      annotations:
         sidecar.istio.io/inject: "false"
     spec:
       containers:

diff --git a/manifests/v1beta1/components/mysql/mysql.yaml b/manifests/v1beta1/components/mysql/mysql.yaml
@@ -17,7 +17,6 @@ spec:
     metadata:
       labels:
         katib.kubeflow.org/component: mysql
-      annotations:
         sidecar.istio.io/inject: "false"
     spec:
       containers:

diff --git a/manifests/v1beta1/components/postgres/postgres.yaml b/manifests/v1beta1/components/postgres/postgres.yaml
@@ -17,8 +17,8 @@ spec:
     metadata:
       labels:
         katib.kubeflow.org/component: postgres
-      annotations:
         sidecar.istio.io/inject: "false"
+      annotations:
     spec:
       containers:
         - name: katib-postgres

diff --git a/manifests/v1beta1/components/ui/ui.yaml b/manifests/v1beta1/components/ui/ui.yaml
@@ -15,7 +15,6 @@ spec:
     metadata:
       labels:
         katib.kubeflow.org/component: ui
-      annotations:
         sidecar.istio.io/inject: "false"
     spec:
       containers:

diff --git a/manifests/v1beta1/installs/katib-with-kubeflow/patches/istio-sidecar-injection.yaml b/manifests/v1beta1/installs/katib-with-kubeflow/patches/istio-sidecar-injection.yaml
@@ -6,5 +6,5 @@ metadata:
 spec:
   template:
     metadata:
-      annotations:
+      labels:
         sidecar.istio.io/inject: "true"
diff --git a/pkg/controller.v1beta1/consts/const.go b/pkg/controller.v1beta1/consts/const.go
@@ -119,11 +119,11 @@ const (
 	// JobKindJob is the kind of the Kubernetes Job.
 	JobKindJob = "Job"
 
-	// AnnotationIstioSidecarInjectName is the annotation of Istio Sidecar
-	AnnotationIstioSidecarInjectName = "sidecar.istio.io/inject"
+	// LabelIstioSidecarInjectName is the label of Istio Sidecar
+	LabelIstioSidecarInjectName = "sidecar.istio.io/inject"
 
-	// AnnotationIstioSidecarInjectValue is the value of Istio Sidecar annotation
-	AnnotationIstioSidecarInjectValue = "false"
+	// LabelIstioSidecarInjectValue is the value of Istio Sidecar label
+	LabelIstioSidecarInjectValue = "false"
 
 	// LabelTrialTemplateConfigMapName is the label name for the Trial templates configMap
 	LabelTrialTemplateConfigMapName = "katib.kubeflow.org/component"

diff --git a/pkg/controller.v1beta1/suggestion/composer/composer.go b/pkg/controller.v1beta1/suggestion/composer/composer.go
@@ -104,7 +104,7 @@ func (g *General) DesiredDeployment(s *suggestionsv1beta1.Suggestion) (*appsv1.D
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels:      util.SuggestionLabels(s),
-					Annotations: util.SuggestionAnnotations(s),
+					Annotations: s.Annotations,
 				},
 				Spec: corev1.PodSpec{
 					Containers: g.desiredContainers(s, suggestionConfigData, earlyStoppingConfigData),

diff --git a/pkg/controller.v1beta1/suggestion/composer/composer_test.go b/pkg/controller.v1beta1/suggestion/composer/composer_test.go
@@ -72,15 +72,15 @@ var (
 	}
 
 	deploymentLabels = map[string]string{
-		"custom-label":             "test",
-		consts.LabelDeploymentName: suggestionName + "-" + suggestionAlgorithm,
-		consts.LabelExperimentName: suggestionName,
-		consts.LabelSuggestionName: suggestionName,
+		"custom-label":                     "test",
+		consts.LabelDeploymentName:         suggestionName + "-" + suggestionAlgorithm,
+		consts.LabelExperimentName:         suggestionName,
+		consts.LabelSuggestionName:         suggestionName,
+		consts.LabelIstioSidecarInjectName: consts.LabelIstioSidecarInjectValue,
 	}
 
 	podAnnotations = map[string]string{
-		"custom-annotation":       "test",
-		"sidecar.istio.io/inject": "false",
+		"custom-annotation": "test",
 	}
 
 	namespace       = "kubeflow"

diff --git a/pkg/controller.v1beta1/util/annotations.go b/pkg/controller.v1beta1/util/annotations.go
@@ -1,40 +1,29 @@
 /*
 Copyright 2022 The Kubeflow Authors.
-
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-
 package util
 
 import (
-	suggestionsv1beta1 "github.com/kubeflow/katib/pkg/apis/controller/suggestions/v1beta1"
 	"github.com/kubeflow/katib/pkg/controller.v1beta1/consts"
 )
 
-// SuggestionAnnotations returns the expected suggestion annotations.
-func SuggestionAnnotations(instance *suggestionsv1beta1.Suggestion) map[string]string {
-	return appendAnnotation(
-		instance.Annotations,
-		consts.AnnotationIstioSidecarInjectName,
-		consts.AnnotationIstioSidecarInjectValue)
-}
-
-func appendAnnotation(annotations map[string]string, newAnnotationName string, newAnnotationValue string) map[string]string {
+// AppendIstioSidecarLabel adds the Istio sidecar injection label to a labels map
+func AppendIstioSidecarLabel(labels map[string]string) map[string]string {
 	res := make(map[string]string)
-	for k, v := range annotations {
+	for k, v := range labels {
 		res[k] = v
 	}
-	res[newAnnotationName] = newAnnotationValue
-
+	res[consts.LabelIstioSidecarInjectName] = consts.LabelIstioSidecarInjectValue
 	return res
 }
diff --git a/pkg/controller.v1beta1/util/labels.go b/pkg/controller.v1beta1/util/labels.go
@@ -22,6 +22,7 @@ import (
 	"github.com/kubeflow/katib/pkg/controller.v1beta1/consts"
 )
 
+// SuggestionLabels returns the expected suggestion labels.
 // SuggestionLabels returns the expected suggestion labels.
 func SuggestionLabels(instance *suggestionsv1beta1.Suggestion) map[string]string {
 	res := make(map[string]string)
@@ -31,7 +32,7 @@ func SuggestionLabels(instance *suggestionsv1beta1.Suggestion) map[string]string
 	res[consts.LabelDeploymentName] = GetSuggestionDeploymentName(instance)
 	res[consts.LabelExperimentName] = instance.Name
 	res[consts.LabelSuggestionName] = instance.Name
-
+	res[consts.LabelIstioSidecarInjectName] = consts.LabelIstioSidecarInjectValue
 	return res
 }
 

diff --git a/sdk/python/v1beta1/kubeflow/katib/api/katib_client_test.py b/sdk/python/v1beta1/kubeflow/katib/api/katib_client_test.py
@@ -95,7 +95,7 @@ def generate_trial_template() -> V1beta1TrialTemplate:
         "kind": "Job",
         "spec": {
             "template": {
-                "metadata": {"annotations": {"sidecar.istio.io/inject": "false"}},
+                "metadata": {"labels": {"sidecar.istio.io/inject": "false"}},
                 "spec": {
                     "containers": [
                         {