Use label instead of annotation

openshift-knative · Sep 23, 2024 · 464fe04 · 464fe04
1 parent cf96813
commit 464fe04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...operator/cmd/openshift-knative-operator/kodata/ingress/latest/istio/1-net-istio-core.yaml b/...operator/cmd/openshift-knative-operator/kodata/ingress/latest/istio/1-net-istio-core.yaml
@@ -181,16 +181,15 @@ spec:
       app: net-istio-controller
   template:
     metadata:
-      annotations:
-        # This must be outside of the mesh to probe the gateways.
-        # NOTE: this is allowed here and not elsewhere because
-        # this is the Istio controller, and so it may be Istio-aware.
-        sidecar.istio.io/inject: "false"
       labels:
         app: net-istio-controller
         app.kubernetes.io/component: net-istio
         app.kubernetes.io/name: knative-serving
         app.kubernetes.io/version: "release-v1.15"
+        # This must be outside of the mesh to probe the gateways.
+        # NOTE: this is allowed here and not elsewhere because
+        # this is the Istio controller, and so it may be Istio-aware.
+        sidecar.istio.io/inject: "false"
     spec:
       serviceAccountName: controller
       containers:

diff --git a/...openshift-knative-operator/kodata/knative-serving/latest/4-serving-post-install-jobs.yaml b/...openshift-knative-operator/kodata/knative-serving/latest/4-serving-post-install-jobs.yaml
@@ -28,13 +28,12 @@ spec:
   backoffLimit: 10
   template:
     metadata:
-      annotations:
-        sidecar.istio.io/inject: "false"
       labels:
         app: storage-version-migration-serving
         app.kubernetes.io/name: knative-serving
         app.kubernetes.io/component: storage-version-migration-job
         app.kubernetes.io/version: "v1.15"
+        sidecar.istio.io/inject: "false"
     spec:
       serviceAccountName: controller
       restartPolicy: OnFailure