Merge branch 'main' into fix-allocator-metric

Author: iblancasa

.chloggen/operator32.yaml

@@ -5,10 +5,10 @@ change_type: 'enhancement'
 component: operator
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Support for Kubernetes `1.32`  version.
+note: Add support for Kubernetes `1.32`
 
 # One or more tracking issues related to the change
-issues: [ ]
+issues: [3544]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.

.golangci.yaml

@@ -57,10 +57,6 @@ issues:
     - linters:
         - gci
       source: "// \\+kubebuilder"
-    # For some reason goheader complains about these files, even though the headers are correct
-    - linters:
-        - goheader
-      path: upgrade_strategy\.go
 
 linters:
   enable:

Makefile

@@ -496,7 +496,7 @@ KUSTOMIZE_VERSION ?= v5.5.0
 # renovate: datasource=go depName=sigs.k8s.io/controller-tools/cmd/controller-gen
 CONTROLLER_TOOLS_VERSION ?= v0.17.0
 # renovate: datasource=go depName=github.com/golangci/golangci-lint/cmd/golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.63.2
+GOLANGCI_LINT_VERSION ?= v1.63.4
 # renovate: datasource=go depName=sigs.k8s.io/kind
 KIND_VERSION ?= v0.26.0
 # renovate: datasource=go depName=github.com/kyverno/chainsaw

main.go

@@ -287,9 +287,9 @@ func main() {
 		os.Exit(1)
 	}
 
-	clientset, clientErr := kubernetes.NewForConfig(mgr.GetConfig())
+	clientset, err := kubernetes.NewForConfig(mgr.GetConfig())
 	if err != nil {
-		setupLog.Error(clientErr, "failed to create kubernetes clientset")
+		setupLog.Error(err, "failed to create kubernetes clientset")
 	}
 
 	ctx := ctrl.SetupSignalHandler()

tests/e2e-openshift/export-to-cluster-logging-lokistack/check_logs.sh

@@ -4,24 +4,30 @@ TOKEN=$(oc -n openshift-logging create token otel-collector-deployment)
 LOKI_URL=$(oc -n openshift-logging get route logging-loki -o json | jq '.spec.host' -r)
 
 while true; do
-  LOG_OUTPUT=$(logcli -o raw --tls-skip-verify \
+  # Fetch logs
+  RAW_OUTPUT=$(logcli -o raw --tls-skip-verify \
   --bearer-token="${TOKEN}" \
   --addr "https://${LOKI_URL}/api/logs/v1/application" query '{log_type="application"}')
 
-  if echo "$LOG_OUTPUT" | jq -e '
-    . as $root |
-    select(
-      .body == "the message" and
-      .severity == "Info" and
-      .attributes.app == "server" and
-      .resources."k8s.container.name" == "telemetrygen" and
-      .resources."k8s.namespace.name" == "chainsaw-incllogs"
-    )
-  ' > /dev/null; then
+  # Extract the part of the output containing the common labels
+  COMMON_LABELS=$(echo "$RAW_OUTPUT" | grep "Common labels:")
+
+  # Log output for the actual log messages
+  LOG_OUTPUT=$(echo "$RAW_OUTPUT" | grep -v "Common labels:")
+
+  # Check if specific log messages exist
+  if echo "$COMMON_LABELS" | grep -q 'app="server"' && \
+    echo "$COMMON_LABELS" | grep -q 'k8s_container_name="telemetrygen"' && \
+    echo "$COMMON_LABELS" | grep -q 'k8s_namespace_name="chainsaw-incllogs"' && \
+    echo "$COMMON_LABELS" | grep -q 'kubernetes_container_name="telemetrygen"' && \
+    echo "$COMMON_LABELS" | grep -q 'kubernetes_namespace_name="chainsaw-incllogs"' && \ 
+    echo "$LOG_OUTPUT" | grep -q "the message"; then
     echo "Logs found:"
+    echo "$COMMON_LABELS"
     break
   else
     echo "Logs not found. Continuing to check..."
     sleep 5
   fi
 done
+

tests/e2e-openshift/export-to-cluster-logging-lokistack/otel-collector.yaml

@@ -17,6 +17,9 @@ rules:
  - apiGroups: [""]
    resources: ["pods", "namespaces", "nodes"]
    verbs: ["get", "watch", "list"]
+ - apiGroups: ["apps"]
+   resources: ["replicasets"]
+   verbs: ["get", "list", "watch"]
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -39,7 +42,7 @@ metadata:
   name: otel
   namespace: openshift-logging
 spec:
-  image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.107.0
+  image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.116.1
   serviceAccount: otel-collector-deployment
   config:
     extensions:
@@ -51,66 +54,44 @@ spec:
           grpc: {}
           http: {}
     processors:
-      k8sattributes:
-        auth_type: "serviceAccount"
-        passthrough: false
-        extract:
-          metadata:
-            - k8s.pod.name
-            - k8s.container.name
-            - k8s.namespace.name
-          labels:
-          - tag_name: app.label.component
-            key: app.kubernetes.io/component
-            from: pod
-        pod_association:
-          - sources:
-              - from: resource_attribute
-                name: k8s.pod.name
-              - from: resource_attribute
-                name: k8s.container.name
-              - from: resource_attribute
-                name: k8s.namespace.name
-          - sources:
-              - from: connection
+      k8sattributes: {}
       resource:
         attributes:
-          - key: loki.format
-            action: insert
-            value: json
-          - key:  kubernetes_namespace_name
+          - key:  kubernetes.namespace_name
             from_attribute: k8s.namespace.name
             action: upsert
-          - key:  kubernetes_pod_name
+          - key:  kubernetes.pod_name
             from_attribute: k8s.pod.name
             action: upsert
-          - key: kubernetes_container_name
+          - key: kubernetes.container_name
             from_attribute: k8s.container.name
             action: upsert
           - key: log_type
             value: application
             action: upsert
-          - key: loki.resource.labels
-            value: log_type, kubernetes_namespace_name, kubernetes_pod_name, kubernetes_container_name
-            action: insert
       transform:
         log_statements:
           - context: log
             statements:
               - set(attributes["level"], ConvertCase(severity_text, "lower"))
-
     exporters:
-      loki:
-        endpoint: https://logging-loki-gateway-http.openshift-logging.svc.cluster.local:8080/api/logs/v1/application/loki/api/v1/push
+      otlphttp:
+        endpoint: https://logging-loki-gateway-http.openshift-logging.svc.cluster.local:8080/api/logs/v1/application/otlp
+        encoding: json
         tls:
           ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
         auth:
           authenticator: bearertokenauth
-
+      debug:
+        verbosity: detailed
     service:
       extensions: [bearertokenauth]
       pipelines:
         logs:
           receivers: [otlp]
           processors: [k8sattributes, transform, resource]
-          exporters: [loki]
+          exporters: [otlphttp]
+        logs/test:
+          receivers: [otlp]
+          processors: []
+          exporters: [debug]