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

operator: React to changes in ConfigMap used for storage CA #11624

Merged
merged 8 commits into from Jan 11, 2024

Conversation

xperimental
Copy link
Collaborator

@xperimental xperimental commented Jan 10, 2024

What this PR does / why we need it:

The operator allows to set a custom CA used for accessing S3-based object storage using the spec.storage.tls.caName key. While the operator already produces an error when the ConfigMap referenced by that key does not exist or does not contain data, it does not automatically react to changes to the ConfigMap. This PR fixes that by watching for changes to ConfigMap resources.

Which issue(s) this PR fixes:

LOG-4897

Special notes for your reviewer:

  • This commit of the PR contains a change to the predicate used for checking if a ConfigMap resource has changed. The old implementation used metadata.generation which is not used on ConfigMap resources. This PR changes this to use the metadata.resourceVersion instead which is available on all resources. The same code is also used for Service and Secret resource types.

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Tests updated
  • CHANGELOG.md updated

Copy link
Contributor

Trivy scan found the following vulnerabilities:

  • HIGH, Target: docker.io/grafana/loki:main-3048e4a (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libcrypto3 v3.1.3-r0. Fixed in v3.1.4-r0
  • HIGH, Target: docker.io/grafana/loki:main-3048e4a (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libssl3 v3.1.3-r0. Fixed in v3.1.4-r0
    \nTo see more details on these vulnerabilities, and how/where to fix them, please run docker build -t grafana/loki:main-3048e4a -f cmd/loki/Dockerfile .
    trivy i grafana/loki:main-3048e4a on your branch. If these were not introduced by your PR, please considering fixing them in via a subsequent PR. Thanks!

@xperimental xperimental merged commit e7b9455 into grafana:main Jan 11, 2024
14 checks passed
@xperimental xperimental deleted the watch-configmap-for-ca branch January 11, 2024 12:58
periklis pushed a commit to periklis/loki that referenced this pull request Jan 18, 2024
periklis pushed a commit to periklis/loki that referenced this pull request Jan 18, 2024
periklis pushed a commit to periklis/loki that referenced this pull request Jan 18, 2024
periklis pushed a commit to periklis/loki that referenced this pull request Jan 18, 2024
periklis pushed a commit to periklis/loki that referenced this pull request Jan 18, 2024
periklis pushed a commit to periklis/loki that referenced this pull request Jan 18, 2024
openshift-merge-bot bot added a commit to openshift/loki that referenced this pull request Jan 18, 2024
openshift-merge-bot bot added a commit to openshift/loki that referenced this pull request Jan 18, 2024
openshift-merge-bot bot added a commit to openshift/loki that referenced this pull request Jan 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants