Fix tests migrated to Chainsaw

Author: IshwarKanse

.chainsaw.yaml

@@ -6,7 +6,8 @@ metadata:
 spec:
   parallel: 4
   timeouts:
-    assert: 5m0s
+    assert: 6m0s
     cleanup: 5m0s
     delete: 5m0s
     error: 5m0s
+    apply: 10s

tests/e2e-autoscale/autoscale/02-install.yaml

@@ -15,7 +15,7 @@ spec:
             - --otlp-insecure
             # High duration to ensure the trace creation doesn't stop.
             # It'll be stopped in step 4
-            - --duration=1m
+            - --duration=6m
             - --workers=20
             - traces
       restartPolicy: Never

tests/e2e-openshift/Dockerfile

@@ -1,6 +1,6 @@
 # The Dockerfile's resulting image is purpose-built for executing OpenTelemetry Operator e2e tests within the OpenShift release (https://github.com/openshift/release) using Prow CI. 
 
-FROM golang:1.20
+FROM golang:1.21
 
 # Copy the repository files
 COPY . /tmp/opentelemetry-operator
@@ -25,6 +25,9 @@ RUN curl -LO https://github.com/kudobuilder/kuttl/releases/download/v0.15.0/kube
     && chmod +x kubectl-kuttl_0.15.0_linux_x86_64 \
     && mv kubectl-kuttl_0.15.0_linux_x86_64 /usr/local/bin/kuttl
 
+# Install Chainsaw e2e testing tool
+RUN go install github.com/kyverno/chainsaw@latest
+
 # Install kubectl and oc
 RUN curl -LO https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest/openshift-client-linux.tar.gz \
     && tar -xzf openshift-client-linux.tar.gz \

tests/e2e-openshift/kafka/00-assert.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: kuttl-kafka
+  name: chainsaw-kafka
 
 ---
 apiVersion: apps/v1
@@ -17,7 +17,7 @@ metadata:
     strimzi.io/kind: Kafka
     strimzi.io/name: my-cluster-entity-operator
   name: my-cluster-entity-operator
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 status:
   availableReplicas: 1
   readyReplicas: 1
@@ -28,7 +28,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: my-cluster-kafka-0
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 status:
   phase: Running
 
@@ -37,7 +37,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: my-cluster-zookeeper-0
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 status:
   phase: Running
 
@@ -56,7 +56,7 @@ metadata:
     strimzi.io/kind: Kafka
     strimzi.io/name: my-cluster-kafka
   name: my-cluster-kafka-bootstrap
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   ports:
   - name: tcp-replication
@@ -90,7 +90,7 @@ metadata:
     strimzi.io/kind: Kafka
     strimzi.io/name: my-cluster-kafka
   name: my-cluster-kafka-brokers
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   ports:
   - name: tcp-ctrlplane
@@ -133,7 +133,7 @@ metadata:
     strimzi.io/kind: Kafka
     strimzi.io/name: my-cluster-zookeeper
   name: my-cluster-zookeeper-client
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   ports:
   - name: tcp-clients
@@ -159,7 +159,7 @@ metadata:
     strimzi.io/kind: Kafka
     strimzi.io/name: my-cluster-zookeeper
   name: my-cluster-zookeeper-nodes
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   ports:
   - name: tcp-clients

tests/e2e-openshift/kafka/00-create-kafka-instance.yaml

@@ -3,14 +3,14 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: kuttl-kafka
+  name: chainsaw-kafka
 
 ---
 apiVersion: kafka.strimzi.io/v1beta2
 kind: Kafka
 metadata:
   name: my-cluster
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   entityOperator:
     topicOperator:

tests/e2e-openshift/kafka/01-assert.yaml

@@ -2,7 +2,7 @@ apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaTopic
 metadata:
   name: otlp-spans
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   config:
     retention.ms: 300000

tests/e2e-openshift/kafka/01-create-kafka-topics.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     strimzi.io/cluster: my-cluster
   name: otlp-spans
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   config:
     retention.ms: 300000

tests/e2e-openshift/kafka/02-assert.yaml

@@ -3,13 +3,13 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: opentelemetry-collector
-    app.kubernetes.io/instance: kuttl-kafka.kafka-receiver
+    app.kubernetes.io/instance: chainsaw-kafka.kafka-receiver
     app.kubernetes.io/managed-by: opentelemetry-operator
     app.kubernetes.io/name: kafka-receiver-collector
     app.kubernetes.io/part-of: opentelemetry
     app.kubernetes.io/version: latest
   name: kafka-receiver-collector
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 status:
   availableReplicas: 1
   readyReplicas: 1
@@ -21,11 +21,11 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: opentelemetry-collector
-    app.kubernetes.io/instance: kuttl-kafka.kafka-receiver
+    app.kubernetes.io/instance: chainsaw-kafka.kafka-receiver
     app.kubernetes.io/managed-by: opentelemetry-operator
     app.kubernetes.io/name: kafka-receiver-collector-monitoring
   name: kafka-receiver-collector-monitoring
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   ports:
   - name: monitoring
@@ -34,6 +34,6 @@ spec:
     targetPort: 8888
   selector:
     app.kubernetes.io/component: opentelemetry-collector
-    app.kubernetes.io/instance: kuttl-kafka.kafka-receiver
+    app.kubernetes.io/instance: chainsaw-kafka.kafka-receiver
     app.kubernetes.io/managed-by: opentelemetry-operator
   type: ClusterIP

tests/e2e-openshift/kafka/02-otel-kakfa-receiver.yaml

@@ -2,13 +2,13 @@ apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:
   name: kafka-receiver
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   mode: "deployment"
   config: |
     receivers:
       kafka/traces:
-        brokers: ["my-cluster-kafka-brokers.kuttl-kafka.svc:9092"]
+        brokers: ["my-cluster-kafka-brokers.chainsaw-kafka.svc:9092"]
         protocol_version: 3.5.0
         topic: otlp-spans
     exporters:

tests/e2e-openshift/kafka/03-assert.yaml

@@ -3,13 +3,13 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: opentelemetry-collector
-    app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
+    app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
     app.kubernetes.io/managed-by: opentelemetry-operator
     app.kubernetes.io/name: kafka-exporter-collector
     app.kubernetes.io/part-of: opentelemetry
     app.kubernetes.io/version: latest
   name: kafka-exporter-collector
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 status:
   availableReplicas: 1
   readyReplicas: 1
@@ -21,11 +21,11 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: opentelemetry-collector
-    app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
+    app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
     app.kubernetes.io/managed-by: opentelemetry-operator
     app.kubernetes.io/name: kafka-exporter-collector
   name: kafka-exporter-collector
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   ports:
   - appProtocol: grpc
@@ -40,7 +40,7 @@ spec:
     targetPort: 4318
   selector:
     app.kubernetes.io/component: opentelemetry-collector
-    app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
+    app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
     app.kubernetes.io/managed-by: opentelemetry-operator
   sessionAffinity: None
 
@@ -50,12 +50,12 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/component: opentelemetry-collector
-    app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
+    app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
     app.kubernetes.io/managed-by: opentelemetry-operator
     app.kubernetes.io/name: kafka-exporter-collector
     operator.opentelemetry.io/collector-headless-service: Exists
   name: kafka-exporter-collector-headless
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   ports:
   - appProtocol: grpc
@@ -70,6 +70,6 @@ spec:
     targetPort: 4318
   selector:
     app.kubernetes.io/component: opentelemetry-collector
-    app.kubernetes.io/instance: kuttl-kafka.kafka-exporter
+    app.kubernetes.io/instance: chainsaw-kafka.kafka-exporter
     app.kubernetes.io/managed-by: opentelemetry-operator
   type: ClusterIP

tests/e2e-openshift/kafka/03-otel-kakfa-exporter.yaml

@@ -2,7 +2,7 @@ apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:
   name: kafka-exporter
-  namespace: kuttl-kafka
+  namespace: chainsaw-kafka
 spec:
   mode: deployment
   config: |
@@ -14,7 +14,7 @@ spec:
     processors:
     exporters:
       kafka/traces:
-        brokers: ["my-cluster-kafka-brokers.kuttl-kafka.svc:9092"]
+        brokers: ["my-cluster-kafka-brokers.chainsaw-kafka.svc:9092"]
         protocol_version: 3.5.0
         topic: otlp-spans
     service:

tests/e2e-openshift/kafka/04-generate-traces.yaml

@@ -15,11 +15,11 @@ spec:
           image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.92.0
           command: ["./telemetrygen"]
           args:
-            - "--otlp-endpoint=kafka-exporter-collector-headless.kuttl-kafka.svc:4317"
+            - "--otlp-endpoint=kafka-exporter-collector-headless.chainsaw-kafka.svc:4317"
             - "--otlp-insecure=true"
             - "--rate=1"
             - "--duration=30s"
-            - "--otlp-attributes=test=\"kuttl-kafka\""
+            - "--otlp-attributes=test=\"chainsaw-kafka\""
             - "--otlp-header=kafka-topic=\"otlp-spans\""
             - "--service=\"kafka\""
             - "traces"

tests/e2e-openshift/kafka/chainsaw-test.yaml

@@ -39,4 +39,4 @@ spec:
   - name: step-05
     try:
     - script:
-        content: ./tests/e2e-openshift/kafka/check_traces.sh
+        content: ./check_traces.sh

tests/e2e-openshift/kafka/check_traces.sh

@@ -1,15 +1,14 @@
 #!/bin/bash
-# This script checks the kafka-receiver OTEL collector pod for the presence of Traces.
 
 # Define the label selector
-LABEL_SELECTOR="app.kubernetes.io/instance=kuttl-kafka.kafka-receiver"
+LABEL_SELECTOR="app.kubernetes.io/instance=chainsaw-kafka.kafka-receiver"
 
 # Define the search strings
 SEARCH_STRING1='-> service.name: Str("kafka")'
-SEARCH_STRING2='-> test: Str(kuttl-kafka)'
+SEARCH_STRING2='-> test: Str(chainsaw-kafka)'
 
 # Get the list of pods with the specified label
-PODS=$(kubectl -n kuttl-kafka get pods -l $LABEL_SELECTOR -o jsonpath='{.items[*].metadata.name}')
+PODS=$(kubectl -n chainsaw-kafka get pods -l $LABEL_SELECTOR -o jsonpath='{.items[*].metadata.name}')
 
 # Initialize flags to track if strings are found
 FOUND1=false
@@ -18,22 +17,21 @@ FOUND2=false
 # Loop through each pod and search for the strings in the logs
 for POD in $PODS; do
     # Search for the first string
-    if ! $FOUND1 && kubectl -n kuttl-kafka logs $POD | grep -q -- "$SEARCH_STRING1"; then
+    if ! $FOUND1 && kubectl -n chainsaw-kafka logs $POD | grep -q -- "$SEARCH_STRING1"; then
         echo "\"$SEARCH_STRING1\" found in $POD"
         FOUND1=true
     fi
     # Search for the second string
-    if ! $FOUND2 && kubectl -n kuttl-kafka logs $POD | grep -q -- "$SEARCH_STRING2"; then
+    if ! $FOUND2 && kubectl -n chainsaw-kafka logs $POD | grep -q -- "$SEARCH_STRING2"; then
         echo "\"$SEARCH_STRING2\" found in $POD"
         FOUND2=true
     fi
 done
 
 # Check if either of the strings was not found
 if ! $FOUND1 || ! $FOUND2; then
-    echo "No Traces with service name Kafka and attribute test=kuttl-kafka found."
+    echo "No Traces with service name Kafka and attribute test=chainsaw-kafka found."
     exit 1
 else
-    echo "Traces with service name Kafka and attribute test=kuttl-kafka found."
+    echo "Traces with service name Kafka and attribute test=chainsaw-kafka found."
 fi
-

tests/e2e-openshift/monitoring/00-assert.yaml

@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: prometheus-operator
+  namespace: openshift-user-workload-monitoring
+(status.replicas == spec.replicas): true
+spec:
+  (replicas >= `1`): true
+
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: prometheus-user-workload
+  namespace: openshift-user-workload-monitoring
+(status.replicas == spec.replicas): true
+spec:
+  (replicas >= `1`): true
+
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: thanos-ruler-user-workload
+  namespace: openshift-user-workload-monitoring
+(status.replicas == spec.replicas): true
+spec:
+  (replicas >= `1`): true

tests/e2e-openshift/monitoring/03-assert.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: kuttl-cluster-monitoring-metrics-api
+  name: chainsaw-monitoring-metrics-api
 rules:
 - apiGroups:
   - monitoring.coreos.com
@@ -15,11 +15,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: kuttl-cluster-monitoring-metrics-api
+  name: chainsaw-monitoring-metrics-api
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: kuttl-cluster-monitoring-metrics-api
+  name: chainsaw-monitoring-metrics-api
 subjects:
 - kind: ServiceAccount
   name: prometheus-user-workload