Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] Update Chainsaw version #3657

Merged
merged 2 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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\\.]+)"
]
}
],
Expand All @@ -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"
}
]
}
12 changes: 8 additions & 4 deletions tests/e2e-openshift/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand All @@ -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/[email protected]
# 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 \
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading