Skip to content

Hacks4snacks/deconflictupstream#12

Merged
Hacks4Snacks merged 16 commits intomainfrom
hacks4snacks/deconflictupstream
May 6, 2025
Merged

Hacks4snacks/deconflictupstream#12
Hacks4Snacks merged 16 commits intomainfrom
hacks4snacks/deconflictupstream

Conversation

@Hacks4Snacks
Copy link
Copy Markdown
Owner

Description

Related issues

  • Close #XXX

Remove this section if you don't have related PRs.

Checklist

  • I've read the guidelines for contributing to this repository.
  • 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).

afdesk and others added 16 commits April 3, 2025 16:05
* test: improve integration tests

* chore: improve env variables check

* chore: prepare and load images for tests

* chore(ci): add logining to docker registry

* chore: remove docker auth

* chore: emits more output including GinkgoWriter contents.

* chore: use WP 6.1 instead of 5

* chore: use WP 6.7
* chore(deps): Bump trivy-* deps

* fix signature

* update checks

* cleanup returns
* docs: change docs about ttl for scanned reports

Signed-off-by: Dmitry Ponomaryov <[email protected]>

* fix operator.scannerReportTTL

Signed-off-by: Dmitry Ponomaryov <[email protected]>

---------

Signed-off-by: Dmitry Ponomaryov <[email protected]>
…512)

Bumps the k8s group with 2 updates in the / directory: [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) and [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).


Updates `k8s.io/apiextensions-apiserver` from 0.32.2 to 0.32.3
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.32.2...v0.32.3)

Updates `sigs.k8s.io/controller-runtime` from 0.20.2 to 0.20.4
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.20.2...v0.20.4)

---
updated-dependencies:
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-version: 0.32.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-version: 0.20.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…(#2513)

Bumps the common group with 4 updates in the / directory: [github.com/aquasecurity/trivy-kubernetes](https://github.com/aquasecurity/trivy-kubernetes), [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo), [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) and [golang.org/x/net](https://github.com/golang/net).


Updates `github.com/aquasecurity/trivy-kubernetes` from 0.8.0 to 0.8.1
- [Release notes](https://github.com/aquasecurity/trivy-kubernetes/releases)
- [Changelog](https://github.com/aquasecurity/trivy-kubernetes/blob/main/.goreleaser.yaml)
- [Commits](aquasecurity/trivy-kubernetes@v0.8.0...v0.8.1)

Updates `github.com/onsi/ginkgo/v2` from 2.22.2 to 2.23.4
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.22.2...v2.23.4)

Updates `github.com/onsi/gomega` from 1.36.2 to 1.36.3
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.36.2...v1.36.3)

Updates `github.com/prometheus/client_golang` from 1.21.0 to 1.21.1
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.21.0...v1.21.1)

Updates `golang.org/x/net` from 0.37.0 to 0.39.0
- [Commits](golang/net@v0.37.0...v0.39.0)

Updates `golang.org/x/text` from 0.23.0 to 0.24.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.23.0...v0.24.0)

---
updated-dependencies:
- dependency-name: github.com/aquasecurity/trivy-kubernetes
  dependency-version: 0.8.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: common
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-version: 2.23.4
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: common
- dependency-name: github.com/onsi/gomega
  dependency-version: 1.36.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: common
- dependency-name: github.com/prometheus/client_golang
  dependency-version: 1.21.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: common
- dependency-name: golang.org/x/net
  dependency-version: 0.39.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: common
- dependency-name: golang.org/x/text
  dependency-version: 0.24.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: common
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
trivy-operator does not check excluded images in client server mode.

This change fixes this behavior.
* fix(misconfig): ordering policies for hash

* refactor: Move sorting inside of loader

* use slices.Sort

* fix lint

* chore: skip the policy size check

* chore: skip the test

* remove an error return for empty policy slice

---------

Co-authored-by: Simar <[email protected]>
* chore: use cache for hash calculations

* chore: update comments

* test: add benchmarks for cache calculation

* chore: fix linter error

* chore: remove unneeded mutex

* refactor: improve benchmarks for hash calculation

* fix tests

* fix: golangci-lint formatting

---------

Co-authored-by: simar7 <[email protected]>
Co-authored-by: Simar <[email protected]>
* chore: bump up Go version to 1.24.2

* chore: bump up Trivy version

* chore(deps): bump up Trivy to the latest version

* chore: bump up Trivy to v0.62.0
* release: prepare v0.26.0

* docs: update helm docs

* chore: update Trivy version in the default config

* docs: bump up Trivy version in the samples (#2538)

---------

Co-authored-by: afdesk <[email protected]>
* chore(ci): Free up additional space

* test: test using build step
@Hacks4Snacks Hacks4Snacks merged commit 422c845 into main May 6, 2025
6 of 8 checks passed
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.

5 participants