fix node labels syncing #1259
Merged
fix node labels syncing #1259
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
ishankhare07
force-pushed
the
fix-node-labels
branch
2 times, most recently
from
6f4aa95
to
a00b776
Compare
FabianKramm
requested changes
Oct 2, 2023
| @@ -90,6 +90,7 @@ func (s *nodeSyncer) translateUpdateBackwards(pNode *corev1.Node, vNode *corev1. | |||
| } | |||
| } else { | |||
| labels, annotations = translate.ApplyMetadata(pNode.Annotations, vNode.Annotations, pNode.Labels, vNode.Labels) | |||
| labels["kubernetes.io/hostname"] = GetNodeHost(vNode.Name) | |||
There was a problem hiding this comment.
Why is this needed, the issue only talks about fake sync? Also if we need this, why do we ignore the enableScheduler path?
There was a problem hiding this comment.
Hi @FabianKramm actually the original issue also mentioned
This should also be done for the "real nodes sync".
And yea I think I added the above line at the wrong place, I will move it out of the if-else block – we should not be ignoring the enableScheduler path, thanks for pointing out
Signed-off-by: Ishan Khare <me@ishankhare.dev>
ishankhare07
force-pushed
the
fix-node-labels
branch
from
24e9eb4
to
cee27cf
Compare
Signed-off-by: Ishan Khare <me@ishankhare.dev>
ishankhare07
force-pushed
the
fix-node-labels
branch
from
134aeaa
to
0b300b1
Compare
FabianKramm
requested changes
Oct 5, 2023
| @@ -98,8 +98,11 @@ func (s *nodeSyncer) translateUpdateBackwards(pNode *corev1.Node, vNode *corev1. | |||
| } else { | |||
| delete(annotations, TaintsAnnotation) | |||
| } | |||
| labels, annotations = translate.ApplyMetadata(pNode.Annotations, vNode.Annotations, pNode.Labels, vNode.Labels) | |||
FabianKramm
requested changes
Oct 6, 2023
| @@ -100,6 +100,8 @@ func (s *nodeSyncer) translateUpdateBackwards(pNode *corev1.Node, vNode *corev1. | |||
| } | |||
| } | |||
|
|
|||
| labels["kubernetes.io/hostname"] = GetNodeHost(vNode.Name) | |||
There was a problem hiding this comment.
I think we should only do this if s.useFakeKubelets is true as otherwise we won't rewritte the hostname at all
FabianKramm
approved these changes
Oct 6, 2023
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.
What issue type does this pull request address? (keep at least one, remove the others)
/kind bugfix
/kind enhancement
/kind test
What does this pull request do? Which issues does it resolve? (use
resolves #<issue_number>if possible)resolves #1001 ENG-1289
Please provide a short message that should be published in the vcluster release notes
Fixed an issue where vcluster node were syncing as
fake-$NAME. Use$NAME.nodes.vcluster.cominsteadWhat else do we need to know?