Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

refactor: enable generic --register-with-taints and --register-node #3155

Merged

Conversation

jackfrancis
Copy link
Member

@jackfrancis jackfrancis commented Apr 28, 2020

Reason for Change:

This PR unwinds some weirdness in the implementation of --register-with-taints, especially for masterProfile configuration.

Also addressed some strange --register-node configuration.

Issue Fixed:

Requirements:

Notes:

@@ -360,10 +360,6 @@ MASTER_CONTAINER_ADDONS_PLACEHOLDER
{{end}}
{{if IsCustomCloudProfile }}
AZURE_ENVIRONMENT_FILEPATH=/etc/kubernetes/azurestackcloud.json
{{end}}
{{if AnyAgentIsLinux}}
KUBELET_REGISTER_NODE=--register-node=true
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I can tell this weird --register-node=true config inside this "any agent is Linux" block doesn't make sense. "true" is the default value for this, and we certainly never want to not register a node in the cluster.

Ref:

https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/

@codecov
Copy link

codecov bot commented Apr 28, 2020

Codecov Report

Merging #3155 into master will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3155      +/-   ##
==========================================
- Coverage   71.14%   71.13%   -0.01%     
==========================================
  Files         147      147              
  Lines       25664    25670       +6     
==========================================
+ Hits        18258    18261       +3     
- Misses       6269     6272       +3     
  Partials     1137     1137              
Impacted Files Coverage Δ
pkg/api/common/const.go 40.00% <ø> (ø)
pkg/engine/templates_generated.go 38.05% <ø> (ø)
pkg/api/defaults-kubelet.go 96.42% <100.00%> (+0.13%) ⬆️
pkg/engine/template_generator.go 81.28% <0.00%> (-0.42%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46c1272...325fdf9. Read the comment docs.

mboersma
mboersma previously approved these changes Apr 28, 2020
Copy link
Member

@mboersma mboersma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

(I think this is more of a refactor or even a feat than a chore.)

@jackfrancis jackfrancis changed the title chore: enable generic --register-with-taints and --register-node refactor: enable generic --register-with-taints and --register-node Apr 28, 2020
@jackfrancis jackfrancis merged commit a7f6089 into Azure:master Apr 29, 2020
@jackfrancis jackfrancis deleted the kubelet-generic-register-configs branch April 29, 2020 03:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants