From 3a825ac9fb3fd8d9a1cbe5a07bd940dcd7fd9ca8 Mon Sep 17 00:00:00 2001
From: Ishwar Kanse <ikanse@redhat.com>
Date: Thu, 23 Jan 2025 16:52:42 +0530
Subject: [PATCH] Update Chainsaw version

---
 renovate.json                                 | 19 ++++++++++++++++++-
 tests/e2e-openshift/Dockerfile                | 12 ++++++++----
 .../create-clusterrolebinding.yaml            |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/renovate.json b/renovate.json
index 7d481e79fc..fb87024470 100644
--- a/renovate.json
+++ b/renovate.json
@@ -22,7 +22,19 @@
         "(^|/)Makefile$"
       ],
       "matchStrings": [
-        "# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (?:packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))?\\s+[A-Za-z0-9_]+?_VERSION\\s*:*\\??=\\s*[\"']?(?<currentValue>.+?)[\"']?\\s"
+        "# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (?:packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))\\s+[A-Za-z0-9_]+?_VERSION\\s*:*\\??=\\s*[\"']?(?<currentValue>.+?)[\"']?\\s"
+      ]
+    },
+    {
+      "customType": "regex",
+      "description" : "Update Chainsaw version in OpenShift CI tests runner Dockerfile",
+      "datasourceTemplate": "github-releases",
+      "depNameTemplate": "kyverno/chainsaw",
+      "fileMatch": [
+        "(^|/)tests/e2e-openshift/Dockerfile$"
+      ],
+      "matchStrings": [
+        "ENV CHAINSAW_VERSION=(?<currentValue>v[\\d\\.]+)"
       ]
     }
   ],
@@ -37,6 +49,11 @@
       "matchManagers": ["regex"],
       "matchFileNames": ["Makefile"],
       "commitMessageTopic": "tool {{depName}}"
+    },
+    {
+      "matchManagers": ["regex"],
+      "matchFileNames": ["tests/e2e-openshift/Dockerfile"],
+      "commitMessageTopic": "Update Chainsaw version in OpenShift CI Dockerfile"
     }
   ]
 }
diff --git a/tests/e2e-openshift/Dockerfile b/tests/e2e-openshift/Dockerfile
index 0f1564c627..cc70c05d4d 100644
--- a/tests/e2e-openshift/Dockerfile
+++ b/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.22
+FROM golang:1.23
 
 # Copy the repository files
 COPY . /tmp/opentelemetry-operator
@@ -12,6 +12,7 @@ ENV GOPATH=/tmp/go
 ENV GOBIN=/tmp/go/bin
 ENV GOCACHE=/tmp/.cache/go-build
 ENV PATH=$PATH:$GOBIN
+ENV CHAINSAW_VERSION=v0.2.12
 
 # Create the /tmp/go/bin and build cache directories, and grant read and write permissions to all users
 RUN mkdir -p /tmp/go/bin $GOCACHE \
@@ -25,8 +26,11 @@ 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
-RUN go install github.com/kyverno/chainsaw@v0.2.6
+# Install chainsaw
+RUN curl -L -o chainsaw.tar.gz https://github.com/kyverno/chainsaw/releases/download/${CHAINSAW_VERSION}/chainsaw_linux_amd64.tar.gz \
+    && tar -xvzf chainsaw.tar.gz \
+    && chmod +x chainsaw \
+    && mv chainsaw /usr/local/bin/
 
 # Install kubectl and oc
 RUN curl -LO https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest/openshift-client-linux.tar.gz \
@@ -41,4 +45,4 @@ RUN curl -LO https://github.com/grafana/loki/releases/latest/download/logcli-lin
     && mv logcli-linux-amd64 /usr/local/bin/logcli
 
 # Set the working directory
-WORKDIR /tmp/opentelemetry-operator
+WORKDIR /tmp/opentelemetry-operator
\ No newline at end of file
diff --git a/tests/e2e-openshift/scrape-in-cluster-monitoring/create-clusterrolebinding.yaml b/tests/e2e-openshift/scrape-in-cluster-monitoring/create-clusterrolebinding.yaml
index 80e00a48b5..bbf8c62635 100644
--- a/tests/e2e-openshift/scrape-in-cluster-monitoring/create-clusterrolebinding.yaml
+++ b/tests/e2e-openshift/scrape-in-cluster-monitoring/create-clusterrolebinding.yaml
@@ -16,6 +16,6 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: cabundle
-  namespce: chainsaw-scrape-in-cluster-monitoring
+  namespace: chainsaw-scrape-in-cluster-monitoring
   annotations:
     service.beta.openshift.io/inject-cabundle: "true"