Merged
Conversation
#### What type of PR is this? <!-- Add one of the following kinds: /kind bug /kind cleanup /kind documentation /kind feature --> #### What this PR does / why we need it: When supplying a label in the compose file, it should stay in the output too. #### Which issue(s) this PR fixes: <!-- *Automatically closes linked issue when PR is merged. Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`. --> Fixes kubernetes#1885 #### Special notes for your reviewer: Signed-off-by: Charlie Drage <charlie@charliedrage.com>
Member
Author
|
I also fixed the test here: https://github.com/kubernetes/kompose/blob/main/script/test/fixtures/configmap-file-configs/compose-3.yaml We cannot do this on mac M1 testing since /var/lib/docker isn't available. So I changed it to use /tmp in this PR |
TessaIO
approved these changes
Jun 2, 2024
| # Test label in compose.yaml appears in the output annotation | ||
| k8s_cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/label/compose.yaml convert --stdout --with-kompose-annotation=false" | ||
| k8s_output="$KOMPOSE_ROOT/script/test/fixtures/label/output-k8s.yaml" | ||
| convert::expect_success "$k8s_cmd" "$k8s_output" || exit 1 No newline at end of file |
| - /var/run/docker.sock:/var/run/docker.sock:ro | ||
| - /sys:/sys:ro | ||
| - /var/lib/docker/:/var/lib/docker:ro | ||
| - /tmp:/tmp:ro No newline at end of file |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cdrage, TessaIO The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
bug: fix annotation bug
What type of PR is this?
What this PR does / why we need it:
When supplying a label in the compose file, it should stay in the output
too.
Which issue(s) this PR fixes:
Fixes #1885
Special notes for your reviewer:
Signed-off-by: Charlie Drage charlie@charliedrage.com