Add Istio inject label (knative#8205) (#884)

Signed-off-by: Pierangelo Di Pilato <[email protected]> Co-authored-by: Pierangelo Di Pilato <[email protected]>
openshift-knative · Oct 8, 2024 · 6dd3ae3 · 6dd3ae3
1 parent 3e76806
commit 6dd3ae3
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 7 deletions.
diff --git a/config/post-install/storage-version-migrator.yaml b/config/post-install/storage-version-migrator.yaml
@@ -32,6 +32,7 @@ spec:
         app.kubernetes.io/name: knative-eventing
         app.kubernetes.io/component: storage-version-migration-job
         app.kubernetes.io/version: devel
+        sidecar.istio.io/inject: "false"
       annotations:
         sidecar.istio.io/inject: "false"
     spec:

diff --git a/pkg/reconciler/apiserversource/resources/receive_adapter.go b/pkg/reconciler/apiserversource/resources/receive_adapter.go
@@ -26,11 +26,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"knative.dev/eventing/pkg/adapter/v2"
 	"knative.dev/pkg/kmeta"
 	"knative.dev/pkg/ptr"
 	"knative.dev/pkg/system"
 
+	"knative.dev/eventing/pkg/adapter/v2"
+
 	"knative.dev/eventing/pkg/adapter/apiserver"
 	v1 "knative.dev/eventing/pkg/apis/sources/v1"
 	reconcilersource "knative.dev/eventing/pkg/reconciler/source"
@@ -80,7 +81,7 @@ func MakeReceiveAdapter(args *ReceiveAdapterArgs) (*appsv1.Deployment, error) {
 					Annotations: map[string]string{
 						"sidecar.istio.io/inject": "true",
 					},
-					Labels: args.Labels,
+					Labels: maybeAddKeyValue(args.Labels, "sidecar.istio.io/inject", "true"),
 				},
 				Spec: corev1.PodSpec{
 					NodeSelector:       args.NodeSelector,
@@ -209,3 +210,18 @@ func makeEnv(args *ReceiveAdapterArgs) ([]corev1.EnvVar, error) {
 	}
 	return envs, nil
 }
+
+func maybeAddKeyValue(labels map[string]string, key string, value string) map[string]string {
+	if labels == nil {
+		return map[string]string{key: value}
+	}
+	ret := labels
+	if _, ok := labels[key]; !ok {
+		ret = make(map[string]string, len(labels)+1)
+		for k, v := range labels {
+			ret[k] = v
+		}
+		ret[key] = value
+	}
+	return ret
+}
diff --git a/pkg/reconciler/apiserversource/resources/receive_adapter_test.go b/pkg/reconciler/apiserversource/resources/receive_adapter_test.go
@@ -128,8 +128,9 @@ O2dgzikq8iSy1BlRsVw=
 						"sidecar.istio.io/inject": "true",
 					},
 					Labels: map[string]string{
-						"test-key1": "test-value1",
-						"test-key2": "test-value2",
+						"sidecar.istio.io/inject": "true",
+						"test-key1":               "test-value1",
+						"test-key2":               "test-value2",
 					},
 				},
 				Spec: corev1.PodSpec{

diff --git a/test/config/monitoring/monitoring.yaml b/test/config/monitoring/monitoring.yaml
@@ -38,6 +38,7 @@ spec:
     metadata:
       labels:
         app: zipkin
+        sidecar.istio.io/inject: "false"
       annotations:
         sidecar.istio.io/inject: "false"
     spec:

diff --git a/test/upgrade/prober/forwarder.go b/test/upgrade/prober/forwarder.go
@@ -20,6 +20,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
 	testlib "knative.dev/eventing/test/lib"
 	"knative.dev/eventing/test/lib/duck"
 	"knative.dev/eventing/test/lib/resources"
@@ -69,6 +70,9 @@ func (p *prober) forwarderKService(name, namespace string) *unstructured.Unstruc
 		"spec": map[string]interface{}{
 			"template": map[string]interface{}{
 				"metadata": map[string]interface{}{
+					"labels": map[string]interface{}{
+						"sidecar.istio.io/inject": "true",
+					},
 					"annotations": map[string]interface{}{
 						"sidecar.istio.io/inject":                "true",
 						"sidecar.istio.io/rewriteAppHTTPProbers": "true",

diff --git a/test/upgrade/prober/receiver.go b/test/upgrade/prober/receiver.go
@@ -91,7 +91,8 @@ func (p *prober) createReceiverDeployment() *appsv1.Deployment {
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
-						"app": receiver.Name,
+						"app":                     receiver.Name,
+						"sidecar.istio.io/inject": "true",
 					},
 					Annotations: map[string]string{
 						"sidecar.istio.io/inject":                "true",

diff --git a/test/upgrade/prober/sender.go b/test/upgrade/prober/sender.go
@@ -52,7 +52,8 @@ func (p *prober) deploySender() {
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
-						"app": sender.Name,
+						"app":                     sender.Name,
+						"sidecar.istio.io/inject": "true",
 					},
 					Annotations: map[string]string{
 						"sidecar.istio.io/inject":                "true",

diff --git a/test/upgrade/prober/verify.go b/test/upgrade/prober/verify.go
@@ -255,7 +255,8 @@ func (p *prober) deployFetcher() *batchv1.Job {
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
-						"app": fetcherName,
+						"app":                     fetcherName,
+						"sidecar.istio.io/inject": "true",
 					},
 					Annotations: map[string]string{
 						"sidecar.istio.io/inject":                "true",