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

Update kuttl to v0.15.0 in the scorecard-test-kuttl image #6401

Merged
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
16 changes: 16 additions & 0 deletions changelog/fragments/01-update-kuttl.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# entries is a list of entries to include in
# release notes and/or the migration guide
entries:
- description: >
Update kuttl to v0.15.0 in the scorecard-test-kuttl image

# kind is one of:
# - addition
# - change
# - deprecation
# - removal
# - bugfix
kind: "change"

# Is this a breaking change?
breaking: false
6 changes: 4 additions & 2 deletions images/scorecard-test-kuttl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ COPY . .
RUN GOOS=linux GOARCH=$TARGETARCH make build/scorecard-test-kuttl

# Final image.
#FROM kudobuilder/kuttl@sha256:924a709a1d2c6bede8815415ea5d5be640b506ec5aeaddc68acb443ae8ee7926
FROM kudobuilder/kuttl:v0.12.1
#FROM kudobuilder/kuttl@sha256:8d4dad161521450db95f88fe0e62487cc6587c5818df2a4e750fb9e54c082170
FROM kudobuilder/kuttl:v0.15.0

ENV HOME=/opt/scorecard-test-kuttl \
USER_NAME=scorecard-test-kuttl \
Expand All @@ -29,6 +29,8 @@ ENV HOME=/opt/scorecard-test-kuttl \
RUN echo "${USER_NAME}:x:${USER_UID}:0:${USER_NAME} user:${HOME}:/sbin/nologin" >> /etc/passwd

WORKDIR ${HOME}
# kuttl writes a kubeconfig file in the current working directory
RUN chmod g+w "${HOME}"

COPY --from=builder /workspace/build/scorecard-test-kuttl /usr/local/bin/scorecard-test-kuttl
COPY --from=builder /workspace/images/scorecard-test-kuttl/entrypoint /usr/local/bin/entrypoint
Expand Down
4 changes: 2 additions & 2 deletions images/scorecard-test-kuttl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
// scorecard v1alpha3.TestStatus json format.
//
// The kuttl output is expected to be produced by kubectl-kuttl
// at /tmp/kuttl-test.json.
// at /tmp/kuttl-report.json.
func main() {

jsonFile, err := os.Open("/tmp/kuttl-test.json")
jsonFile, err := os.Open("/tmp/kuttl-report.json")
if err != nil {
printErrorStatus(fmt.Errorf("could not open kuttl report %v", err))
return
Expand Down