From 7ac8564472d122332ce686da63a44f935474a273 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 3 Aug 2026 13:42:07 +0000 Subject: [PATCH 1/2] Initial plan From ddb22a93128a10ea2f10ffa4aecd0443d6d297d3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 3 Aug 2026 13:49:15 +0000 Subject: [PATCH 2/2] fix(metrics): align optional metrics configs to port 8080 --- config/default/manager_metrics_patch.yaml | 4 ++-- config/default/metrics_service.yaml | 6 +++--- config/network-policy/allow-metrics-traffic.yaml | 2 +- config/prometheus/monitor.yaml | 4 ++-- manifests/setup/setup.yaml | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/default/manager_metrics_patch.yaml b/config/default/manager_metrics_patch.yaml index 8e0cedb9e..06033e57c 100644 --- a/config/default/manager_metrics_patch.yaml +++ b/config/default/manager_metrics_patch.yaml @@ -1,4 +1,4 @@ -# This patch adds the args to allow exposing the metrics endpoint using HTTPS +# This patch adds the args to allow exposing the metrics endpoint - op: add path: /spec/template/spec/containers/0/args/- - value: --metrics-bind-address=:8443 + value: --metrics-bind-address=:8080 diff --git a/config/default/metrics_service.yaml b/config/default/metrics_service.yaml index 12089cb6e..1ff78069d 100644 --- a/config/default/metrics_service.yaml +++ b/config/default/metrics_service.yaml @@ -7,10 +7,10 @@ metadata: name: fluent-operator-metrics spec: ports: - - name: https - port: 8443 + - name: metrics + port: 8080 protocol: TCP - targetPort: 8443 + targetPort: 8080 selector: app.kubernetes.io/component: operator app.kubernetes.io/name: fluent-operator diff --git a/config/network-policy/allow-metrics-traffic.yaml b/config/network-policy/allow-metrics-traffic.yaml index cddae6c07..fae513f15 100644 --- a/config/network-policy/allow-metrics-traffic.yaml +++ b/config/network-policy/allow-metrics-traffic.yaml @@ -22,5 +22,5 @@ spec: matchLabels: metrics: enabled # Only from namespaces with this label ports: - - port: 8443 + - port: 8080 protocol: TCP diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index 74207a2a4..6b85a5904 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -9,8 +9,8 @@ metadata: spec: endpoints: - path: /metrics - port: https - scheme: https # Ensure this is the name of the port that exposes HTTPS metrics + port: metrics + scheme: http # Ensure this is the name of the port that exposes metrics bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token tlsConfig: # TODO(user): The option insecureSkipVerify: true is not recommended for production since it disables diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml index 159f0b1a2..cc273b193 100644 --- a/manifests/setup/setup.yaml +++ b/manifests/setup/setup.yaml @@ -42984,10 +42984,10 @@ metadata: namespace: fluent spec: ports: - - name: https - port: 8443 + - name: metrics + port: 8080 protocol: TCP - targetPort: 8443 + targetPort: 8080 selector: app.kubernetes.io/component: operator app.kubernetes.io/name: fluent-operator @@ -43015,7 +43015,7 @@ spec: - args: - --leader-elect - --health-probe-bind-address=:8081 - - --metrics-bind-address=:8443 + - --metrics-bind-address=:8080 command: - /manager env: