Use also label for injecting sidecar

Author: mgencur

test/rekt/features/jobsink/jobsink.go

@@ -65,7 +65,7 @@ func Success(jobSinkName string) *feature.Feature {
 		}
 		var opts []func(*batchv1.Job)
 		if ic := environment.GetIstioConfig(ctx); ic.Enabled {
-			opts = append(opts, jobsink.WithPodIstioAnnotations())
+			opts = append(opts, jobsink.WithIstioConfig())
 		}
 		jobsink.Install(jobSink, jobsink.WithForwarderJob(sinkURL.String(), opts...))(ctx, t)
 	})

test/rekt/resources/jobsink/jobsink.go

@@ -106,13 +106,19 @@ func WithJob(job batchv1.Job) manifest.CfgFn {
 	}
 }
 
-func WithPodIstioAnnotations() func(*batchv1.Job) {
+func WithIstioConfig() func(*batchv1.Job) {
 	return func(job *batchv1.Job) {
-		job.Spec.Template.Annotations = map[string]string{
-			"sidecar.istio.io/inject":                "true",
-			"sidecar.istio.io/rewriteAppHTTPProbers": "true",
-			"proxy.istio.io/config":                  `{ "holdApplicationUntilProxyStarts": true }`,
+		if job.Spec.Template.Labels == nil {
+			job.Spec.Template.Labels = make(map[string]string)
 		}
+		job.Spec.Template.Labels["sidecar.istio.io/inject"] = "true"
+
+		if job.Spec.Template.Annotations == nil {
+			job.Spec.Template.Annotations = make(map[string]string)
+		}
+		job.Spec.Template.Annotations["sidecar.istio.io/rewriteAppHTTPProbers"] = "true"
+		job.Spec.Template.Annotations["proxy.istio.io/config"] = `{ "holdApplicationUntilProxyStarts": true }`
+		job.Spec.Template.Annotations["sidecar.istio.io/inject"] = "true" // For backwards compatibility.
 	}
 }