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

feat(kubernetes): add option to specify kubeconfig file path #2576

Merged
merged 1 commit into from
Aug 4, 2022

Conversation

mgsh
Copy link
Contributor

@mgsh mgsh commented Jul 24, 2022

Description

Related issues

Related PRs

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@josedonizetti
Copy link
Contributor

@mgsh This looks good. Though let's wait until we merge the PR on trivy-kubernetes to update the dependencies and review this one. k?

@mgsh mgsh force-pushed the feature/support-kubeconfig2 branch from a392f7c to 54d3798 Compare July 27, 2022 10:55
go.mod Outdated
@@ -321,3 +321,6 @@ replace github.com/docker/docker => github.com/docker/docker v20.10.3-0.20220224
// v1.2.0 is taken from github.com/open-policy-agent/opa v0.42.0
// v1.2.0 incompatible with github.com/docker/docker v20.10.3-0.20220224222438-c78f6963a1c0+incompatible
replace oras.land/oras-go => oras.land/oras-go v1.1.1

// TODO: once the change is merged to aquasecurity/trivy-kubernetes, this can be removed and go.sum updated
replace github.com/aquasecurity/trivy-kubernetes => github.com/mgsh/trivy-kubernetes v0.3.1-0.20220727104021-cd78e50c591a
Copy link
Contributor

Choose a reason for hiding this comment

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

The PR was merged on trivy-kubernetes, can we fix the replace here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've updated it.

@mgsh mgsh force-pushed the feature/support-kubeconfig2 branch from 54d3798 to c6f350f Compare July 27, 2022 14:49
@mgsh
Copy link
Contributor Author

mgsh commented Aug 1, 2022

hi @josedonizetti, I've removed the mod replace change. Please review and merge when you get a chance.

@knqyf263
Copy link
Collaborator

knqyf263 commented Aug 3, 2022

@josedonizetti Can we merge it?

@josedonizetti
Copy link
Contributor

@knqyf263 @mgsh Reviewing this now. Sorry was busy with some other things.

@josedonizetti
Copy link
Contributor

josedonizetti commented Aug 4, 2022

@knqyf263 can you review and merge? Thank you!

@knqyf263 knqyf263 merged commit 8d10de8 into aquasecurity:main Aug 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Specify kubeconfig file path for "trivy k8s" command
3 participants