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: pin gcr.io/distroless/static to a hash value #5290

Merged
merged 2 commits into from
Jan 16, 2024

Conversation

nilo19
Copy link
Contributor

@nilo19 nilo19 commented Jan 16, 2024

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

chore: pin gcr.io/distroless/static to a hash value

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 16, 2024
@@ -1,6 +1,8 @@
module sigs.k8s.io/cloud-provider-azure/pkg/azclient/client-gen

go 1.20
go 1.21
Copy link
Contributor Author

@nilo19 nilo19 Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is changed automatically by ide.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nilo19

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2024
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have trivy scanner running for images built from this Dockerfile?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No we don't, I will add one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added, please take a look.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 16, 2024
@github-advanced-security
Copy link

This pull request sets up GitHub code scanning for this repository. Once the scans have completed and the checks have passed, the analysis results for this pull request branch will appear on this overview. Once you merge this pull request, the 'Security' tab will show more code scanning analysis results (for example, for the default branch). Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results. For more information about GitHub code scanning, check out the documentation.

@feiskyer
Copy link
Member

/retest

Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 16, 2024
@nilo19
Copy link
Contributor Author

nilo19 commented Jan 16, 2024

/retest

1 similar comment
@nilo19
Copy link
Contributor Author

nilo19 commented Jan 16, 2024

/retest

@k8s-ci-robot k8s-ci-robot merged commit 8a51c7d into kubernetes-sigs:master Jan 16, 2024
16 checks passed
@nilo19 nilo19 deleted the fix/pin branch January 16, 2024 10:42
@nilo19
Copy link
Contributor Author

nilo19 commented Jan 16, 2024

/cherrypick release-1.28

@k8s-infra-cherrypick-robot

@nilo19: #5290 failed to apply on top of branch "release-1.28":

Applying: chore: pin gcr.io/distroless/static to a hash value
Using index info to reconstruct a base tree...
M	.github/workflows/trivy.yaml
M	pkg/azclient/client-gen/go.mod
M	pkg/azclient/client-gen/go.sum
Falling back to patching base and 3-way merge...
Auto-merging pkg/azclient/client-gen/go.sum
CONFLICT (content): Merge conflict in pkg/azclient/client-gen/go.sum
Auto-merging pkg/azclient/client-gen/go.mod
Auto-merging .github/workflows/trivy.yaml
CONFLICT (content): Merge conflict in .github/workflows/trivy.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: pin gcr.io/distroless/static to a hash value
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.28

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants