[Observability Onboarding] Fix kustomize command #199758
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flash1293
added
release_note:fix
v9.0.0
backport:prev-minor
|
Pinging @elastic/obs-ux-onboarding-team (Feature: Observability Onboarding) |
|
Pinging @elastic/obs-ux-logs-team (Team:obs-ux-logs) |
botelastic
bot
added
the
ci:project-deploy-observability
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
mykolaharmash
approved these changes
Nov 12, 2024
|
It's actually a bit more complicated because the docker image name needs to be changed as well: |
botelastic
bot
added
the
Team:Fleet
|
Pinging @elastic/fleet (Team:Fleet) |
|
@kpollich @mykolaharmash I cleaned up this fix a bit, moving the logic for calculating different flavors of the version to the fleet plugin instead of keeping it in the onboarding plugin. You can test the IAR case by adding to @mykolaharmash Please make sure to test all flows at least superficially to make sure there are no hidden issues left. |
|
@kpollich @flash1293 It seems docker image exist with a |
|
@nchaulet Isn't that what I did here? https://github.com/elastic/kibana/pull/199758/files#diff-80f8d98768811edfdaeb175191fd423ecebed2cd33507811cb12b4985ec1fe3eR179 Edit: Oh I see, I will update the PR description, sorry, forgot about that. |
…93/kibana into flash1293/fix-kubernetes-ea-flow
|
I've tested EA host, Otel host and EA Kubernetes flows with the replaced EA version, everything works as expected ✨ |
⏳ Build in-progress
History
|
|
Starting backport for target branches: 8.16, 8.x |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Nov 14, 2024
## Summary Closes elastic#199754 by introducing more fine-grained version getters to get the base version (to resolve to the git tag in the repo), the actual version which might include the IAR suffix and the docker version which replaces + with . For testing, EA host and kubernetes as well as OTel host should be tested. See here: elastic#199758 (comment) --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> (cherry picked from commit 7ef9773)
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Nov 14, 2024
…0191) # Backport This will backport the following commits from `main` to `8.x`: - [[Observability Onboarding] Fix kustomize command (#199758)](#199758) <!--- Backport version: 9.4.3 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Joe Reuter","email":"johannes.reuter@elastic.co"},"sourceCommit":{"committedDate":"2024-11-14T14:09:24Z","message":"[Observability Onboarding] Fix kustomize command (#199758)\n\n## Summary\r\n\r\nCloses #199754 by introducing\r\nmore fine-grained version getters to get the base version (to resolve to\r\nthe git tag in the repo), the actual version which might include the IAR\r\nsuffix and the docker version which replaces + with .\r\n\r\nFor testing, EA host and kubernetes as well as OTel host should be\r\ntested. See here:\r\nhttps://github.com//pull/199758#issuecomment-2473753175\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"7ef9773d626c21556361d85578b039773e33ffb5","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","Team:Fleet","v9.0.0","backport:prev-minor","ci:project-deploy-observability","Team:obs-ux-logs","Feature: Observability Onboarding","v8.17.0","v8.16.1"],"title":"[Observability Onboarding] Fix kustomize command","number":199758,"url":"https://github.com/elastic/kibana/pull/199758","mergeCommit":{"message":"[Observability Onboarding] Fix kustomize command (#199758)\n\n## Summary\r\n\r\nCloses #199754 by introducing\r\nmore fine-grained version getters to get the base version (to resolve to\r\nthe git tag in the repo), the actual version which might include the IAR\r\nsuffix and the docker version which replaces + with .\r\n\r\nFor testing, EA host and kubernetes as well as OTel host should be\r\ntested. See here:\r\nhttps://github.com//pull/199758#issuecomment-2473753175\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"7ef9773d626c21556361d85578b039773e33ffb5"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199758","number":199758,"mergeCommit":{"message":"[Observability Onboarding] Fix kustomize command (#199758)\n\n## Summary\r\n\r\nCloses #199754 by introducing\r\nmore fine-grained version getters to get the base version (to resolve to\r\nthe git tag in the repo), the actual version which might include the IAR\r\nsuffix and the docker version which replaces + with .\r\n\r\nFor testing, EA host and kubernetes as well as OTel host should be\r\ntested. See here:\r\nhttps://github.com//pull/199758#issuecomment-2473753175\r\n\r\n---------\r\n\r\nCo-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>","sha":"7ef9773d626c21556361d85578b039773e33ffb5"}},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> --------- Co-authored-by: Joe Reuter <johannes.reuter@elastic.co>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Closes #199754 by introducing more fine-grained version getters to get the base version (to resolve to the git tag in the repo), the actual version which might include the IAR suffix and the docker version which replaces + with .
For testing, EA host and kubernetes as well as OTel host should be tested. See here: #199758 (comment)