This repository has been archived by the owner on Nov 1, 2022. It is now read-only.
Fix syncing with --k8s-default-namespace #2799
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
2opremio
reviewed
Jan 29, 2020
| @@ -377,6 +377,11 @@ func applyMetadata(res resource.Resource, syncSetName, checksum string) ([]byte, | |||
| mixin["labels"] = mixinLabels | |||
| } | |||
|
|
|||
| namespace, _, _ := res.ResourceID().Components() | |||
| if namespace != kresource.ClusterScope { | |||
| mixin["namespace"] = namespace | |||
There was a problem hiding this comment.
Nice and simple. Much better than my suggestion at #2797 (comment)
Can you please add a detailed comment explaining why we are doing this?
2opremio
approved these changes
Jan 30, 2020
|
Can you squash the commits? |
|
And rebase on top of the current master? |
|
done |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #2797
The problem was that the namespace was set on the
KubeManifestnext to the rawResourcebut then when theKubeManifestis synced as aResource, the raw bytes are taken.Since we're reserializing in
applyMetadataanyway, I just update the namespace there.