Only scrape istio-proxy

controllers/application/service.go

@@ -53,7 +53,7 @@ func (r *ApplicationReconciler) reconcileService(ctx context.Context, applicatio
 		service.SetLabels(labels)
 
 		ports := append(getAdditionalPorts(application.Spec.AdditionalPorts), getServicePort(application.Spec.Port, application.Spec.AppProtocol))
-		if r.IsIstioEnabledForNamespace(ctx, application.Namespace) && application.Spec.Prometheus != nil {
+		if r.IsIstioEnabledForNamespace(ctx, application.Namespace) {
 			ports = append(ports, defaultPrometheusPort)
 		}
 

controllers/application/service_monitor.go

@@ -32,7 +32,7 @@ func (r *ApplicationReconciler) reconcileServiceMonitor(ctx context.Context, app
 		return util.RequeueWithError(err)
 	}
 
-	if application.Spec.Prometheus == nil {
+	if !r.IsIstioEnabledForNamespace(ctx, application.Namespace) {
 		err := client.IgnoreNotFound(r.GetClient().Delete(ctx, &serviceMonitor))
 		if err != nil {
 			r.SetControllerError(ctx, application, controllerName, err)
@@ -61,7 +61,12 @@ func (r *ApplicationReconciler) reconcileServiceMonitor(ctx context.Context, app
 			NamespaceSelector: pov1.NamespaceSelector{
 				MatchNames: []string{application.Namespace},
 			},
-			Endpoints: r.determineEndpoint(ctx, application),
+			Endpoints: []pov1.Endpoint{
+				{
+					Path:       util.IstioMetricsPath,
+					TargetPort: &util.IstioMetricsPortName,
+				},
+			},
 		}
 
 		return nil
@@ -71,20 +76,3 @@ func (r *ApplicationReconciler) reconcileServiceMonitor(ctx context.Context, app
 
 	return util.RequeueWithError(err)
 }
-
-func (r *ApplicationReconciler) determineEndpoint(ctx context.Context, application *skiperatorv1alpha1.Application) []pov1.Endpoint {
-	ep := pov1.Endpoint{
-		Path: util.IstioMetricsPath, TargetPort: &util.IstioMetricsPortName,
-	}
-
-	if r.IsIstioEnabledForNamespace(ctx, application.Namespace) {
-		return []pov1.Endpoint{ep}
-	}
-
-	return []pov1.Endpoint{
-		{
-			Path:       application.Spec.Prometheus.Path,
-			TargetPort: &application.Spec.Prometheus.Port,
-		},
-	}
-}

controllers/skipjob/network_policy.go

@@ -29,6 +29,7 @@ func (r *SKIPJobReconciler) reconcileNetworkPolicy(ctx context.Context, skipJob
 		Namespaces:      &namespaces,
 		Name:            skipJob.Name,
 		RelatedServices: &egressServices,
+		IstioEnabled:    r.IsIstioEnabledForNamespace(ctx, skipJob.Namespace),
 	}
 
 	netpolSpec := networking.CreateNetPolSpec(netpolOpts)

controllers/skipjob/pod_monitor.go

@@ -43,24 +43,14 @@ func (r *SKIPJobReconciler) reconcilePodMonitor(ctx context.Context, skipJob *sk
 			NamespaceSelector: pov1.NamespaceSelector{
 				MatchNames: []string{skipJob.Namespace},
 			},
-			PodMetricsEndpoints: r.determineEndpoint(ctx, skipJob),
+			PodMetricsEndpoints: []pov1.PodMetricsEndpoint{
+				{
+					Path:       util.IstioMetricsPath,
+					TargetPort: &util.IstioMetricsPortName,
+				},
+			},
 		}
 		return nil
 	})
 	return util.RequeueWithError(err)
 }
-
-func (r *SKIPJobReconciler) determineEndpoint(ctx context.Context, application *skiperatorv1alpha1.SKIPJob) []pov1.PodMetricsEndpoint {
-	ep := pov1.PodMetricsEndpoint{
-		Path: util.IstioMetricsPath, TargetPort: &util.IstioMetricsPortName,
-	}
-	if r.IsIstioEnabledForNamespace(ctx, application.Namespace) {
-		return []pov1.PodMetricsEndpoint{ep}
-	}
-	return []pov1.PodMetricsEndpoint{
-		{
-			Path:       application.Spec.Prometheus.Path,
-			TargetPort: &application.Spec.Prometheus.Port,
-		},
-	}
-}

pkg/resourcegenerator/core/pod.go

@@ -191,8 +191,8 @@ func getContainerPorts(application *skiperatorv1alpha1.Application, opts PodOpts
 		})
 	}
 
-	// Expose merged Prometheus telemetry to Service, so it can be picked up from ServiceMonitor
-	if application.Spec.Prometheus != nil && opts.IstioEnabled {
+	// Expose Prometheus telemetry to Service, so it can be picked up from ServiceMonitor
+	if opts.IstioEnabled {
 		containerPorts = append(containerPorts, corev1.ContainerPort{
 			Name:          util.IstioMetricsPortName.StrVal,
 			ContainerPort: util.IstioMetricsPortNumber.IntVal,

pkg/resourcegenerator/networking/network_policy.go

@@ -158,8 +158,8 @@ func getIngressRules(opts NetPolOpts) []networkingv1.NetworkPolicyIngressRule {
 		}
 	}
 
-	// If Prometheus metrics are exposed, allow grafana-agent to scrape
-	if opts.PrometheusConfig != nil {
+	// Allow grafana-agent to scrape
+	if opts.IstioEnabled {
 		promScrapeRule := networkingv1.NetworkPolicyIngressRule{
 			From: []networkingv1.NetworkPolicyPeer{
 				{
@@ -176,7 +176,7 @@ func getIngressRules(opts NetPolOpts) []networkingv1.NetworkPolicyIngressRule {
 			},
 			Ports: []networkingv1.NetworkPolicyPort{
 				{
-					Port: determinePrometheusScrapePort(opts.PrometheusConfig, opts.IstioEnabled),
+					Port: util.PointTo(util.IstioMetricsPortName),
 				},
 			},
 		}
@@ -287,10 +287,3 @@ func getIngressGatewayLabel(isInternal bool) map[string]string {
 		return map[string]string{"app": "istio-ingress-external"}
 	}
 }
-
-func determinePrometheusScrapePort(prometheusConfig *skiperatorv1alpha1.PrometheusConfig, istioEnabled bool) *intstr.IntOrString {
-	if istioEnabled {
-		return util.PointTo(util.IstioMetricsPortName)
-	}
-	return util.PointTo(prometheusConfig.Port)
-}

pkg/util/constants.go

@@ -15,7 +15,7 @@ var CommonAnnotations = map[string]string{
 const SkiperatorUser = int64(150)
 
 var (
-	IstioMetricsPortNumber = intstr.FromInt(15020)
+	IstioMetricsPortNumber = intstr.FromInt32(15020)
 	IstioMetricsPortName   = intstr.FromString("istio-metrics")
 	IstioMetricsPath       = "/stats/prometheus"
 

tests/application/service-monitor/chainsaw-test.yaml

@@ -8,18 +8,6 @@ spec:
   skipDelete: false
   namespace: service-monitor-ns
   steps:
-    - try:
-        - create:
-            file: multiple-applications.yaml
-        - assert:
-            file: multiple-applications-assert.yaml
-    - try:
-        - apply:
-            file: patch-single-application.yaml
-        - assert:
-            file: patch-single-application-assert.yaml
-        - error:
-            file: patch-single-application-error.yaml
     - try:
         - create:
             file: application-istio.yaml