Skip to content

Commit 340307a

Browse files
authored
Update Chainsaw version (#3657)
1 parent 80d4ebf commit 340307a

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

renovate.json

+18-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,19 @@
2222
"(^|/)Makefile$"
2323
],
2424
"matchStrings": [
25-
"# 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"
25+
"# 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"
26+
]
27+
},
28+
{
29+
"customType": "regex",
30+
"description" : "Update Chainsaw version in OpenShift CI tests runner Dockerfile",
31+
"datasourceTemplate": "github-releases",
32+
"depNameTemplate": "kyverno/chainsaw",
33+
"fileMatch": [
34+
"(^|/)tests/e2e-openshift/Dockerfile$"
35+
],
36+
"matchStrings": [
37+
"ENV CHAINSAW_VERSION=(?<currentValue>v[\\d\\.]+)"
2638
]
2739
}
2840
],
@@ -37,6 +49,11 @@
3749
"matchManagers": ["regex"],
3850
"matchFileNames": ["Makefile"],
3951
"commitMessageTopic": "tool {{depName}}"
52+
},
53+
{
54+
"matchManagers": ["regex"],
55+
"matchFileNames": ["tests/e2e-openshift/Dockerfile"],
56+
"commitMessageTopic": "Update Chainsaw version in OpenShift CI Dockerfile"
4057
}
4158
]
4259
}

tests/e2e-openshift/Dockerfile

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 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.
22

3-
FROM golang:1.22
3+
FROM golang:1.23
44

55
# Copy the repository files
66
COPY . /tmp/opentelemetry-operator
@@ -12,6 +12,7 @@ ENV GOPATH=/tmp/go
1212
ENV GOBIN=/tmp/go/bin
1313
ENV GOCACHE=/tmp/.cache/go-build
1414
ENV PATH=$PATH:$GOBIN
15+
ENV CHAINSAW_VERSION=v0.2.12
1516

1617
# Create the /tmp/go/bin and build cache directories, and grant read and write permissions to all users
1718
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
2526
&& chmod +x kubectl-kuttl_0.15.0_linux_x86_64 \
2627
&& mv kubectl-kuttl_0.15.0_linux_x86_64 /usr/local/bin/kuttl
2728

28-
# Install Chainsaw e2e
29-
RUN go install github.com/kyverno/[email protected]
29+
# Install chainsaw
30+
RUN curl -L -o chainsaw.tar.gz https://github.com/kyverno/chainsaw/releases/download/${CHAINSAW_VERSION}/chainsaw_linux_amd64.tar.gz \
31+
&& tar -xvzf chainsaw.tar.gz \
32+
&& chmod +x chainsaw \
33+
&& mv chainsaw /usr/local/bin/
3034

3135
# Install kubectl and oc
3236
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
4145
&& mv logcli-linux-amd64 /usr/local/bin/logcli
4246

4347
# Set the working directory
44-
WORKDIR /tmp/opentelemetry-operator
48+
WORKDIR /tmp/opentelemetry-operator

tests/e2e-openshift/scrape-in-cluster-monitoring/create-clusterrolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ kind: ConfigMap
1616
apiVersion: v1
1717
metadata:
1818
name: cabundle
19-
namespce: chainsaw-scrape-in-cluster-monitoring
19+
namespace: chainsaw-scrape-in-cluster-monitoring
2020
annotations:
2121
service.beta.openshift.io/inject-cabundle: "true"

0 commit comments

Comments
 (0)