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

add node labels arg to windows setup script #2770

Merged
merged 11 commits into from
Apr 27, 2018

Conversation

JamesEarle
Copy link
Contributor

@JamesEarle JamesEarle commented Apr 25, 2018

@jackfrancis @JiangtianLi

Addresses #563

Adding KUBELET_NODE_LABELS to ArgList, need to figure out how to access the GetAgentKubernetesLabels function from here, if possible

@ghost ghost assigned JamesEarle Apr 25, 2018
@ghost ghost added the in progress label Apr 25, 2018
@codecov
Copy link

codecov bot commented Apr 25, 2018

Codecov Report

Merging #2770 into master will decrease coverage by <.01%.
The diff coverage is 83.33%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2770      +/-   ##
==========================================
- Coverage   46.82%   46.81%   -0.01%     
==========================================
  Files          86       86              
  Lines       12774    12776       +2     
==========================================
  Hits         5981     5981              
- Misses       6249     6250       +1     
- Partials      544      545       +1
Impacted Files Coverage Δ
pkg/acsengine/engine.go 62.76% <83.33%> (+0.03%) ⬆️
pkg/operations/kubernetesupgrade/upgrader.go 56.48% <0%> (-0.84%) ⬇️

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 b26fbad...a88bb6a. Read the comment docs.

@JiangtianLi
Copy link
Contributor

@JamesEarle Thanks for fixing this. It is hard to see the diff, possibly due to line endings. Can you fix it?

@JamesEarle
Copy link
Contributor Author

JamesEarle commented Apr 25, 2018

@JiangtianLi my changes are the additions from line 294-299, adding "--node-labels `$KUBELET_NODE_LABELS" to the args list. I haven't completed this though, as I'm not sure how to access the func GetAgentKubernetesLabels in engine.go from the kuberneteswindowssetup.ps1, specifically in the Write-KubernetesStartFiles.

Do you know if I can do this? Working with Jack on it.

@JamesEarle
Copy link
Contributor Author

@JiangtianLi the changes should be easier to see in the most recent commit.

@JiangtianLi
Copy link
Contributor

@JamesEarle You can take a look at how windowsTelemetryGUID is passed to ps1.

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

lgtm

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.

3 participants