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: add options to Helm chart to load Trivy config from custom configmap or secret #2174

Merged
merged 5 commits into from
Jul 8, 2024

Conversation

kimdre
Copy link
Contributor

@kimdre kimdre commented Jul 8, 2024

Description

The helm chart already provides operator.valuesFromConfigMap and operator.valuesFromSecret keys to set environment variables for the operator from a configmap or secret.
This PR adds this feature also for the trivy configuration, e.g. to set a Proxy from external secret.

trivy.valuesFromConfigMap will overwrite values in the following order:

  1. trivy-operator-trivy-config default ConfigMap
  2. trivy-operator-trivy-config Secret generated by the Helm Chart

trivy.valuesFromSecret will overwrite values in the following order:

  1. trivy-operator-trivy-config default ConfigMap
  2. trivy-operator-trivy-config Secret generated by the Helm Chart
  3. trivy.valuesFromConfigMap ConfigMap (if specified)

Related issues

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).

@kimdre kimdre requested a review from chen-keinan as a code owner July 8, 2024 10:18
@CLAassistant
Copy link

CLAassistant commented Jul 8, 2024

CLA assistant check
All committers have signed the CLA.

@kimdre kimdre changed the title feat: add option to Helm chart to load Trivy configuration from custom secret feat: add option to Helm chart to load Trivy config from custom secret Jul 8, 2024
@kimdre kimdre changed the title feat: add option to Helm chart to load Trivy config from custom secret feat: add options to Helm chart to load Trivy config from custom configmap or secret Jul 8, 2024
Copy link
Contributor

@chen-keinan chen-keinan left a comment

Choose a reason for hiding this comment

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

@kimdre lgtm 🚀 thank you for the contributions

@chen-keinan chen-keinan merged commit 693908e into aquasecurity:main Jul 8, 2024
9 checks passed
@kimdre kimdre mentioned this pull request Jul 9, 2024
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Helm Chart valuesFromSecret for trivy
3 participants