Update e2e tests to use Adobe images (#148)

Author: amuraru

.github/workflows/e2e-test.yaml

@@ -30,16 +30,27 @@ jobs:
         uses: actions/setup-go@v6
         with:
           go-version: '1.25'
+
+      - name: Setup Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: '3.19.0'
 
       - name: Cache Go modules
         uses: actions/cache@v4
         with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('go.sum', 'api/go.sum', 'properties/go.sum', 'tests/e2e/go.sum') }}
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-gomod-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-gomod-
+            
+      - name: Cache Go build cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/go-build
+          key: ${{ runner.os }}-gobuild-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ runner.os }}-gobuild-
           
       # Enable Tmate Session if you'd like to Debut the E2E Kind Cluster
       # - name: Setup tmate session

.github/workflows/helm.yml

@@ -14,7 +14,7 @@ any real-time space e.g., Slack, Discord, etc.
 ## Reporting Issues
 
 Before reporting a new issue, please ensure that the issue was not already reported or fixed by searching through our
-[issues list](https://github.com/banzaicloud/koperator/issues).
+[issues list](https://github.com/adobe/koperator/issues).
 
 When creating a new issue, please be sure to include a **title and clear description**, as much relevant information as
 possible, and, if possible, a test case.
@@ -37,8 +37,6 @@ and fix existing bugs. Here is what you can do:
 
 - Help ensure that existing issues follows the recommendations from the _[Reporting Issues](#reporting-issues)_ section,
   providing feedback to the issue's author on what might be missing.
-- Review and update the existing content of our [Wiki](https://github.com/banzaicloud/koperator/wiki) with up-to-date
-  instructions and code samples.
 - Review existing pull requests, and testing patches against real existing applications that use Koperator.
 - Write a test, or add a missing test case to an existing test.
 

CONTRIBUTING.md

@@ -1,11 +1,20 @@
 lowercaseOutputName: true
 rules:
   # Special cases and very specific rules
-    # Export kraft current state metrics
-  - pattern: 'kafka.server<type=raft-metrics><>current-state: (.+)'
-    name: kafka_server_raft_metrics_current_state_$1
+  # KRaft current state info metric rule
+  - pattern: "kafka.server<type=raft-metrics><>current-state: ([a-z]+)"
+    name: kafka_server_raft_metrics_current_state_info
     type: GAUGE
     value: 1
+    labels:
+      "state": "$1"
+  # KRaft specific rules for raft-metrics, raft-channel-metrics, broker-metadata-metrics
+  - pattern: kafka.server<type=(.+)><>([a-z-]+)-total
+    name: kafka_server_$1_$2_total
+    type: COUNTER
+  - pattern: kafka.server<type=(.+)><>([a-z-]+)
+    name: kafka_server_$1_$2
+    type: GAUGE
   - pattern: 'kafka.server<type=(app-info), id=(\d+)><>(Version): ([-.~+\w\d]+)'
     name: kafka_server_$1_$3
     type: COUNTER

api/assets/kafka/jmx-exporter.yml

@@ -25,16 +25,16 @@ if [ "$skip_check" = "true" ]; then
 fi
 
 JMX_ENDPOINT="http://localhost:9020/metrics"
-METRIC_PREFIX="kafka_server_raft_metrics_current_state_"
+METRIC_NAME="kafka_server_raft_metrics_current_state_info"
 
-# Fetch the matching current-state metric with value of 1.0 from the JMX endpoint
-MATCHING_METRIC=$(curl -s "$JMX_ENDPOINT" | grep "^${METRIC_PREFIX}" | awk '$2 == 1.0 {print $1}')
+# Fetch the current-state metric with value of 1.0 from the JMX endpoint
+MATCHING_METRIC=$(curl -s "$JMX_ENDPOINT" | grep "^${METRIC_NAME}" | awk '$2 == 1.0 {print $0}')
 
 # If it's not empty, it means we found a metric with a value of 1.0.
 if [ -n "$MATCHING_METRIC" ]; then
-    # Determine the state of the controller using the last field name of the metric 
-    # Possible values are leader, candidate, voted, follower, unattached, observer
-    STATE=$(echo "$MATCHING_METRIC" | rev | cut -d'_' -f1 | rev)
+    # Extract the state from the label state="value" in the metric line
+    # Possible values are leader, candidate, voted, follower, unattached, observer  
+    STATE=$(echo "$MATCHING_METRIC" | sed -n 's/.*state="\([^"]*\)".*/\1/p')
 
     # Check if the extracted state is 'leader' or 'follower'
     if [ "$STATE" == "leader" ] || [ "$STATE" == "follower" ]; then
@@ -46,6 +46,6 @@ if [ -n "$MATCHING_METRIC" ]; then
         exit 1
     fi
 else
-    echo "JMX Exporter endpoint is not avaiable or kafka_server_raft_metrics_current_state_ was not found."
+    echo "JMX Exporter endpoint is not avaiable or kafka_server_raft_metrics_current_state_info was not found."
     exit 0
 fi

api/assets/kafka/kraft-controller-healthcheck.sh

@@ -53,10 +53,10 @@ const (
 	IsControllerNodeKey = "isControllerNode"
 
 	// DefaultCruiseControlImage is the default CC image used when users don't specify it in CruiseControlConfig.Image
-	DefaultCruiseControlImage = "ghcr.io/banzaicloud/cruise-control:2.5.123"
+	DefaultCruiseControlImage = "adobe/cruise-control:3.0.3-adbe-20250804"
 
 	// DefaultKafkaImage is the default Kafka image used when users don't specify it in KafkaClusterSpec.ClusterImage
-	DefaultKafkaImage = "ghcr.io/adobe/kafka:2.13-3.9.1"
+	DefaultKafkaImage = "ghcr.io/adobe/koperator/kafka:2.13-3.9.1"
 
 	// ControllerNodeProcessRole represents the node is a controller node
 	ControllerNodeProcessRole = "controller"
@@ -110,7 +110,7 @@ const (
 	/* Cruise Control Config */
 
 	// CruiseControlDeployment.spec.template.spec.container["%s-cruisecontrol"].image
-	defaultCruiseControlImage = "ghcr.io/banzaicloud/cruise-control:2.5.123"
+	defaultCruiseControlImage = "adobe/cruise-control:3.0.3-adbe-20250804"
 
 	// CruiseControlDeployment.spec.template.spec.container["%s-cruisecontrol"].resources
 	defaultCruiseControlRequestResourceCpu    = "200m"
@@ -126,7 +126,7 @@ const (
 	defaultKafkaClusterK8sClusterDomain  = "cluster.local"
 
 	// KafkaBroker.spec.container["kafka"].image
-	defaultKafkaImage = "ghcr.io/adobe/kafka:2.13-3.9.1"
+	defaultKafkaImage = "ghcr.io/adobe/koperator/kafka:2.13-3.9.1"
 
 	/* Istio Ingress Config */
 
@@ -145,7 +145,7 @@ const (
 
 	// KafkaBrokerPod.spec.initContainer[jmx-exporter].image
 	// kafkaClusterDeployment.spec.template.spec.initContainer["jmx-exporter"].image
-	defaultMonitorImage = "ghcr.io/banzaicloud/jmx-javaagent:0.16.1"
+	defaultMonitorImage = "ghcr.io/amuraru/jmx-javaagent:0.19.2"
 
 	// KafkaBrokerPod.spec.initContainer["jmx-exporter"].command
 	// kafkaClusterDeployment.spec.template.spec.initContainer["jmx-exporter"].command

api/v1beta1/kafkacluster_types.go

@@ -39,7 +39,7 @@ spec:
 
   # Specify the Kafka Broker related settings
   # clusterImage can specify the whole kafkacluster image in one place
-  #clusterImage: "ghcr.io/adobe/kafka:2.13-3.9.1
+  #clusterImage: "ghcr.io/adobe/koperator/kafka:2.13-3.9.1
 
   #clusterWideConfig specifies the cluster-wide kafka config cluster wide, all these can be overridden per-broker
   #clusterWideConfig: |
@@ -181,7 +181,7 @@ spec:
         cruise.control.metrics.topic.replication.factor=2
       brokerConfig:
         # Docker image used by the operator to create the Broker with id 0
-        #image: "ghcr.io/adobe/kafka:2.13-3.9.1
+        #image: "ghcr.io/adobe/koperator/kafka:2.13-3.9.1
         # resourceRequirements works exactly like Container resources, the user can specify the limit and the requests
         # through this property
         #resourceRequirements:
@@ -252,7 +252,7 @@ spec:
         #volumeMounts:
         #  - mountPath: "/opt/kafka/libs/extra-jars"
         #    name: "jars"
-    - image: "ghcr.io/adobe/kafka:2.13-3.9.1"
+    - image: "ghcr.io/adobe/koperator/kafka:2.13-3.9.1"
       id: 1
       config: |
         auto.create.topics.enable=false
@@ -274,7 +274,7 @@ spec:
       readOnlyConfig: |
         auto.create.topics.enable=false
       brokerConfig:
-        image: "ghcr.io/adobe/kafka:2.13-3.9.1"
+        image: "ghcr.io/adobe/koperator/kafka:2.13-3.9.1"
         storageConfigs:
           - mountPath: "/kafka-logs"
             pvcSpec:
@@ -708,9 +708,9 @@ spec:
   # monitoringConfig describes the monitoring related configs
   #monitoringConfig:
   # jmxImage describes the used prometheus jmx exporter agent container
-  #  jmxImage: "ghcr.io/banzaicloud/jmx-javaagent:0.16.1"
+  #  jmxImage: "ghcr.io/amuraru/jmx-javaagent:0.19.2"
   # pathToJar describes the path to the jar file in the given image
-  #  pathToJar: "/opt/jmx_exporter/jmx_prometheus_javaagent-0.16.1.jar"
+  #  pathToJar: "/jmx_prometheus_javaagent.jar"
   # kafkaJMXExporterConfig describes jmx exporter config for Kafka
   #  kafkaJMXExporterConfig: |
   #   lowercaseOutputName: true

config/samples/banzaicloud_v1beta1_kafkacluster.yaml

@@ -85,7 +85,7 @@ spec:
         storageClass: 'gp2'
         mountPath: '/kafkalog'
         diskSize: '10G'
-        image: 'ghcr.io/adobe/kafka:2.13-3.9.1'
+        image: 'ghcr.io/adobe/koperator/kafka:2.13-3.9.1'
         # annotations to be applied onto the broker pod
         # brokerAnnotations: '{ "sidecar.istio.io/logLevel": "trace", "sidecar.istio.io/proxyCPULimit": "50m" }'
         command: 'upScale'
@@ -101,7 +101,7 @@ spec:
         storageClass: 'gp2'
         mountPath: '/kafkalog'
         diskSize: '10G'
-        image: 'ghcr.io/adobe/kafka:2.13-3.9.1'
+        image: 'ghcr.io/adobe/koperator/kafka:2.13-3.9.1'
         # annotations to be applied onto the broker pod
         # brokerAnnotations: '{ "sidecar.istio.io/logLevel": "trace", "sidecar.istio.io/proxyCPULimit": "50m" }'
         command: 'upScale'
@@ -117,7 +117,7 @@ spec:
         storageClass: 'gp2'
         mountPath: '/kafkalog'
         diskSize: '10G'
-        image: 'ghcr.io/adobe/kafka:2.13-3.9.1'
+        image: 'ghcr.io/adobe/koperator/kafka:2.13-3.9.1'
         # annotations to be applied onto the broker pod
         # brokerAnnotations: '{ "sidecar.istio.io/logLevel": "trace", "sidecar.istio.io/proxyCPULimit": "50m" }'
         command: 'upScale'

config/samples/kafkacluster-prometheus.yaml

@@ -16,7 +16,7 @@ spec:
   zkAddresses:
     - "zookeeper-server-client.zookeeper:2181"
   oneBrokerPerNode: false
-  clusterImage: "ghcr.io/adobe/kafka:2.13-3.9.1"
+  clusterImage: "ghcr.io/adobe/koperator/kafka:2.13-3.9.1"
   readOnlyConfig: |
     auto.create.topics.enable=false
     cruise.control.metrics.topic.auto.create=true

config/samples/kafkacluster-with-istio.yaml

@@ -10,7 +10,7 @@ spec:
   zkAddresses:
     - "zookeeper-server-client.zookeeper:2181"
   oneBrokerPerNode: false
-  clusterImage: "ghcr.io/adobe/kafka:2.13-3.9.1"
+  clusterImage: "ghcr.io/adobe/koperator/kafka:2.13-3.9.1"
   readOnlyConfig: |
     auto.create.topics.enable=false
     cruise.control.metrics.topic.auto.create=true