rename headless service

Author: labrenbe

docs/modules/nifi/pages/usage_guide/monitoring.adoc

@@ -127,7 +127,7 @@ spec:
           - __meta_kubernetes_pod_container_port_number
         targetLabel: __address__
         replacement: ${1}.${2}.${3}.svc.cluster.local:${4}
-        regex: (.+);(.+?)(?:-metrics)?;(.+);(.+)
+        regex: (.+);(.+?)(?:-headless)?;(.+);(.+)
   selector:
     matchLabels:
       prometheus.io/scrape: "true"
@@ -138,4 +138,4 @@ spec:
 <1> Authorization via Bearer Token stored in a secret
 <2> Relabel \\__address__ to be a FQDN rather then the IP-Address of target pod
 
-NOTE: As of xref:listener-operator:listener.adoc[Listener] integration, SDP exposes a Service with `-metrics` thus we need to regex this suffix.
+NOTE: As of xref:listener-operator:listener.adoc[Listener] integration, SDP exposes a Service with `-headless` thus we need to regex this suffix.

rust/operator-binary/src/controller.rs

@@ -1483,7 +1483,7 @@ async fn build_node_rolegroup_statefulset(
 }
 
 pub fn rolegroup_service_name(rolegroup: &RoleGroupRef<v1alpha1::NifiCluster>) -> String {
-    format!("{name}-metrics", name = rolegroup.object_name())
+    format!("{name}-headless", name = rolegroup.object_name())
 }
 
 async fn get_proxy_hosts(

rust/operator-binary/src/reporting_task/mod.rs

@@ -8,7 +8,7 @@
 //! Due to changes in the JWT validation in 1.25.0, the issuer refers to the FQDN of the Pod that was created, e.g.:
 //! {
 //!     "sub": "admin",
-//!     "iss": "test-nifi-node-default-0.test-nifi-node-default-metrics.default.svc.cluster.local:8443",
+//!     "iss": "test-nifi-node-default-0.test-nifi-node-default-headless.default.svc.cluster.local:8443",
 //! }
 //! which was different in e.g. 1.23.2
 //! {

tests/templates/kuttl/iceberg/61-provision-nifi-flow.yaml

@@ -54,7 +54,7 @@ data:
     import urllib3
 
     # As of 2022-08-29 we cant use "https://nifi:8443" here because <h2>The request contained an invalid host header [<code>nifi:8443</code>] in the request [<code>/nifi-api</code>]. Check for request manipulation or third-party intercept.</h2>
-    ENDPOINT = f"https://nifi-node-default-0.nifi-node-default-metrics.{os.environ['NAMESPACE']}.svc.cluster.local:8443" # For local testing / developing replace it, afterwards change back to f"https://nifi-node-default-0.nifi-node-default-metrics.{os.environ['NAMESPACE']}.svc.cluster.local:8443"
+    ENDPOINT = f"https://nifi-node-default-0.nifi-node-default-headless.{os.environ['NAMESPACE']}.svc.cluster.local:8443" # For local testing / developing replace it, afterwards change back to f"https://nifi-node-default-0.nifi-node-default-headless.{os.environ['NAMESPACE']}.svc.cluster.local:8443"
     USERNAME = "admin"
     PASSWORD = open("/nifi-users/admin").read()
 

tests/templates/kuttl/ldap/test_nifi.py

@@ -46,7 +46,7 @@ def get_token(nifi_host, username, password):
     # disable warnings as we have specified non-verified https connections
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-    host = f"https://test-nifi-node-default-1.test-nifi-node-default-metrics.{args['namespace']}.svc.cluster.local:8443"
+    host = f"https://test-nifi-node-default-1.test-nifi-node-default-headless.{args['namespace']}.svc.cluster.local:8443"
     token = get_token(host, args["user"], args["password"])
     headers = {"Authorization": token}
     node_count = int(args["count"])

tests/templates/kuttl/oidc-opa/test.py

@@ -17,7 +17,7 @@
 namespace = os.environ["NAMESPACE"]
 tls = os.environ["OIDC_USE_TLS"]
 nifi_version = os.environ["NIFI_VERSION"]
-nifi = f"test-nifi-node-default-0.test-nifi-node-default-metrics.{namespace}.svc.cluster.local"
+nifi = f"test-nifi-node-default-0.test-nifi-node-default-headless.{namespace}.svc.cluster.local"
 keycloak_service = f"keycloak.{namespace}.svc.cluster.local"
 
 keycloak_base_url = (

tests/templates/kuttl/smoke_v1/test_nifi.py

@@ -46,7 +46,7 @@ def get_token(nifi_host, username, password):
     # disable warnings as we have specified non-verified https connections
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-    host = f"https://nifi-node-default-1.nifi-node-default-metrics.{args['namespace']}.svc.cluster.local:8443"
+    host = f"https://nifi-node-default-1.nifi-node-default-headless.{args['namespace']}.svc.cluster.local:8443"
     token = get_token(host, args["user"], args["password"])
     headers = {"Authorization": token}
     node_count = int(args["count"])

tests/templates/kuttl/smoke_v1/test_nifi_metrics.py

@@ -39,7 +39,7 @@
     port = args["port"]
     timeout = int(args["timeout"])
 
-    url = f"http://nifi-node-default-0.nifi-node-default-metrics.{namespace}.svc.cluster.local:{port}/metrics"
+    url = f"http://nifi-node-default-0.nifi-node-default-headless.{namespace}.svc.cluster.local:{port}/metrics"
 
     # wait for 'timeout' seconds
     t_end = time.time() + timeout

tests/templates/kuttl/smoke_v2/test_nifi.py

@@ -46,7 +46,7 @@ def get_token(nifi_host, username, password):
     # disable warnings as we have specified non-verified https connections
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-    host = f"https://nifi-node-default-1.nifi-node-default-metrics.{args['namespace']}.svc.cluster.local:8443"
+    host = f"https://nifi-node-default-1.nifi-node-default-headless.{args['namespace']}.svc.cluster.local:8443"
     token = get_token(host, args["user"], args["password"])
     headers = {"Authorization": token}
     node_count = int(args["count"])

tests/templates/kuttl/upgrade/04-assert.yaml.j2

@@ -8,9 +8,9 @@ commands:
   - script: kubectl exec -n $NAMESPACE test-nifi-0 -- python /tmp/test_nifi_metrics.py -n $NAMESPACE
 {% endif %}
 {% if test_scenario['values']['nifi_old'].split(',')[0] == '2.0.0' %}
-  - script: kubectl exec -n $NAMESPACE test-nifi-0 -- sh -c "python /tmp/flow.py -e https://test-nifi-node-default-0.test-nifi-node-default-metrics.$NAMESPACE.svc.cluster.local:8443 run json /tmp/generate-and-log-flowfiles.json > /tmp/old_input"
+  - script: kubectl exec -n $NAMESPACE test-nifi-0 -- sh -c "python /tmp/flow.py -e https://test-nifi-node-default-0.test-nifi-node-default-headless.$NAMESPACE.svc.cluster.local:8443 run json /tmp/generate-and-log-flowfiles.json > /tmp/old_input"
 {% else %}
-  - script: kubectl exec -n $NAMESPACE test-nifi-0 -- sh -c "python /tmp/flow.py -e https://test-nifi-node-default-0.test-nifi-node-default-metrics.$NAMESPACE.svc.cluster.local:8443 run template /tmp/generate-and-log-flowfiles.xml > /tmp/old_input"
+  - script: kubectl exec -n $NAMESPACE test-nifi-0 -- sh -c "python /tmp/flow.py -e https://test-nifi-node-default-0.test-nifi-node-default-headless.$NAMESPACE.svc.cluster.local:8443 run template /tmp/generate-and-log-flowfiles.xml > /tmp/old_input"
 {% endif %}
   # This tests if the output contains an Error or zero flow files are queued, which also indicates that something went wrong
   - script: kubectl exec -n $NAMESPACE test-nifi-0 -- sh -c "cat /tmp/old_input | grep -Eov 'Error|\b0\b'"