virtual-kubelet controller integration #130
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
briandowns
reviewed
Oct 15, 2024
briandowns
reviewed
Oct 15, 2024
briandowns
reviewed
Oct 15, 2024
briandowns
reviewed
Oct 15, 2024
briandowns
reviewed
Oct 15, 2024
briandowns
reviewed
Oct 15, 2024
briandowns
reviewed
Oct 15, 2024
briandowns
reviewed
Oct 15, 2024
Signed-off-by: galal-hussein <[email protected]>
Signed-off-by: galal-hussein <[email protected]>
Signed-off-by: galal-hussein <[email protected]>
Signed-off-by: galal-hussein <[email protected]>
Signed-off-by: galal-hussein <[email protected]>
Signed-off-by: galal-hussein <[email protected]>
Signed-off-by: galal-hussein <[email protected]>
galal-hussein
force-pushed
the
virt_kubelet_intg
branch
from
babf6c5 to
4035566
Compare
Signed-off-by: galal-hussein <[email protected]>
MbolotSuse
reviewed
Oct 16, 2024
Signed-off-by: galal-hussein <[email protected]>
briandowns
reviewed
Oct 17, 2024
briandowns
reviewed
Oct 17, 2024
briandowns
reviewed
Oct 17, 2024
briandowns
reviewed
Oct 17, 2024
briandowns
reviewed
Oct 17, 2024
briandowns
reviewed
Oct 17, 2024
briandowns
reviewed
Oct 17, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
| return nil, fmt.Errorf("unable to create certs: %w", err) | ||
| } | ||
| pool := x509.NewCertPool() | ||
| pool.AddCert(certs[0]) |
There was a problem hiding this comment.
Should we do a bounds check here to be safe?
There was a problem hiding this comment.
What is the resolution for this?
There was a problem hiding this comment.
sorry missed this one, adding a check now
There was a problem hiding this comment.
added a check for the length of the certs after this line
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
briandowns
reviewed
Oct 18, 2024
Signed-off-by: galal-hussein <[email protected]>
Signed-off-by: galal-hussein <[email protected]>
Signed-off-by: galal-hussein <[email protected]>
briandowns
reviewed
Oct 19, 2024
briandowns
reviewed
Oct 19, 2024
briandowns
reviewed
Oct 19, 2024
briandowns
reviewed
Oct 19, 2024
briandowns
approved these changes
Oct 19, 2024
Signed-off-by: galal-hussein <[email protected]>
MbolotSuse
approved these changes
Oct 21, 2024
Comment on lines
+22
to
+51
| func (c *config) unmarshalYAML(data []byte) error { | ||
| var conf config | ||
|
|
||
| if err := yaml.Unmarshal(data, &conf); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if c.ClusterName == "" { | ||
| c.ClusterName = conf.ClusterName | ||
| } | ||
| if c.ClusterNamespace == "" { | ||
| c.ClusterNamespace = conf.ClusterNamespace | ||
| } | ||
| if c.HostConfigPath == "" { | ||
| c.HostConfigPath = conf.HostConfigPath | ||
| } | ||
| if c.VirtualConfigPath == "" { | ||
| c.VirtualConfigPath = conf.VirtualConfigPath | ||
| } | ||
| if c.KubeletPort == "" { | ||
| c.KubeletPort = conf.KubeletPort | ||
| } | ||
| if c.AgentHostname == "" { | ||
| c.AgentHostname = conf.AgentHostname | ||
| } | ||
| if c.NodeName == "" { | ||
| c.NodeName = conf.NodeName | ||
| } | ||
| return nil | ||
| } |
There was a problem hiding this comment.
Nit: to avoid copying over the fields (which will get worse over time as we add more fields), you can instead change the method to just return the config:
Suggested change
| func (c *config) unmarshalYAML(data []byte) error { | |
| var conf config | |
| if err := yaml.Unmarshal(data, &conf); err != nil { | |
| return err | |
| } | |
| if c.ClusterName == "" { | |
| c.ClusterName = conf.ClusterName | |
| } | |
| if c.ClusterNamespace == "" { | |
| c.ClusterNamespace = conf.ClusterNamespace | |
| } | |
| if c.HostConfigPath == "" { | |
| c.HostConfigPath = conf.HostConfigPath | |
| } | |
| if c.VirtualConfigPath == "" { | |
| c.VirtualConfigPath = conf.VirtualConfigPath | |
| } | |
| if c.KubeletPort == "" { | |
| c.KubeletPort = conf.KubeletPort | |
| } | |
| if c.AgentHostname == "" { | |
| c.AgentHostname = conf.AgentHostname | |
| } | |
| if c.NodeName == "" { | |
| c.NodeName = conf.NodeName | |
| } | |
| return nil | |
| } | |
| func unmarshalYAML(data []byte) (*config, error) { | |
| var conf config | |
| err := yaml.Unmarshal(data, &conf) | |
| return &conf, err |
There was a problem hiding this comment.
the problem is that we want the user to be able to mix and match for example, the user can set the --agent-hostname as a flag and at the same time add nodeName in the config file, if we just returned the unmarshalled config it will ignore all the flags sat on the command line
briandowns
pushed a commit
to briandowns/k3k
that referenced
this pull request
Dec 4, 2024
* Virtual kubelet controller integration Signed-off-by: galal-hussein <[email protected]> * Add k3k-kubelet image to the release workflow Signed-off-by: galal-hussein <[email protected]> * Add k3k-kubelet image to the release workflow Signed-off-by: galal-hussein <[email protected]> * Fix build/release workflow Signed-off-by: galal-hussein <[email protected]> * Remove pkg directory in k3k-kubelet Signed-off-by: galal-hussein <[email protected]> * rename Type to Config Signed-off-by: galal-hussein <[email protected]> * Move the kubelet and config outside of pkg Signed-off-by: galal-hussein <[email protected]> * fix comments Signed-off-by: galal-hussein <[email protected]> * Fix naming throughout the package Signed-off-by: galal-hussein <[email protected]> * Fix comments Signed-off-by: galal-hussein <[email protected]> * more fixes to naming Signed-off-by: galal-hussein <[email protected]> * fixes Signed-off-by: galal-hussein <[email protected]> * fixes Signed-off-by: galal-hussein <[email protected]> * fixes Signed-off-by: galal-hussein <[email protected]> * fixes Signed-off-by: galal-hussein <[email protected]> --------- Signed-off-by: galal-hussein <[email protected]>
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.
The PR does the following:
Issue: