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

Fix otel collector restart #16517

Merged
merged 3 commits into from Jan 11, 2023
Merged

Conversation

chrkl
Copy link
Member

@chrkl chrkl commented Jan 9, 2023

Description

Restarting the telemetry-trace-collector pod after the TracePipeline has changed is triggered by adding a configuration hash annotation to the Pod template. The way how kubectl.kubernetes.io prefixed annotations were merged from an existing deployment caused this annotation to be dropped and the collector was never restarted due to a configuration change.

This PR ensures fixes merging existing Pod annotations with the newly applied ones.

Changes proposed in this pull request:

  • Fix setting deployment annotation

Related issue(s)

@kyma-bot kyma-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 9, 2023
@netlify
Copy link

netlify bot commented Jan 9, 2023

Deploy Preview for kyma-project-docs-preview ready!

Name Link
🔨 Latest commit 82d629f
🔍 Latest deploy log https://app.netlify.com/sites/kyma-project-docs-preview/deploys/63be7c6068a576000956137e
😎 Deploy Preview https://deploy-preview-16517--kyma-project-docs-preview.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@chrkl
Copy link
Member Author

chrkl commented Jan 9, 2023

/retest

@chrkl
Copy link
Member Author

chrkl commented Jan 9, 2023

/hold

@kyma-bot kyma-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 9, 2023
@chrkl chrkl force-pushed the fix-otel-collector-restart branch from 88548d5 to 3537cee Compare January 9, 2023 20:20
@kyma-bot kyma-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 9, 2023
Copy link
Contributor

@skhalash skhalash left a comment

Choose a reason for hiding this comment

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

Would it be possible to add a unit test to cover this scenario?

@chrkl
Copy link
Member Author

chrkl commented Jan 10, 2023

Would it be possible to add a unit test to cover this scenario?

Absolutely, planning to do that.

@chrkl
Copy link
Member Author

chrkl commented Jan 11, 2023

/unhold

@kyma-bot kyma-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 11, 2023
@kyma-bot kyma-bot added the lgtm Looks good to me! label Jan 11, 2023
@kyma-bot
Copy link
Contributor

kyma-bot commented Jan 11, 2023

@chrkl: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pre-main-kyma-gardener-azure-alpha-eval 82d629f link false /test pre-main-kyma-gardener-azure-alpha-eval
pre-main-kyma-gardener-azure-alpha-prod 82d629f link false /test pre-main-kyma-gardener-azure-alpha-prod

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@chrkl
Copy link
Member Author

chrkl commented Jan 11, 2023

/retest

@kyma-bot kyma-bot merged commit 13238c0 into kyma-project:main Jan 11, 2023
@chrkl chrkl deleted the fix-otel-collector-restart branch January 11, 2023 12:23
chrkl added a commit to chrkl/kyma that referenced this pull request Jan 11, 2023
* Fix otel collector restart

* Bump telemetry-operator image

* Enhance unittest for merging pod annotations
kyma-bot pushed a commit that referenced this pull request Jan 11, 2023
* Fix otel collector restart (#16517)

* Fix otel collector restart

* Bump telemetry-operator image

* Enhance unittest for merging pod annotations

* Bump telemetry-operator image
@a-thaler a-thaler added kind/bug Categorizes issue or PR as related to a bug. area/tracing Issues or PRs related to the tracing module (deprecated) labels Jan 11, 2023
@a-thaler a-thaler added this to the 2.10 milestone Jan 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/tracing Issues or PRs related to the tracing module (deprecated) kind/bug Categorizes issue or PR as related to a bug. lgtm Looks good to me! size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants