Fix initial start of etcd only nodes

[galal-hussein]

Signed-off-by: galal-hussein [email protected]

Proposed Changes

Fix initial start of systemd notify of etcd only nodes

Types of Changes

bug fix

Linked Issues

• Systemd does not get notified with READY state in etcd only nodes #3787

[codecov-commenter]

Codecov Report

Merging #3748 (15e5c64) into master (429af17) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #3748      +/-   ##
==========================================
- Coverage   11.56%   11.56%   -0.01%     
==========================================
  Files         136      136              
  Lines        8810     8812       +2     
==========================================
  Hits         1019     1019              
- Misses       7570     7572       +2     
  Partials      221      221              

Flag	Coverage Δ
inttests	0.62% <0.00%> (-0.01%)	⬇️
unittests	11.28% <0.00%> (-0.01%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
pkg/agent/run.go	0.00% <0.00%> (ø)
pkg/cli/server/server.go	0.00% <0.00%> (ø)

---

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 429af17...15e5c64. Read the comment docs.

[brandond]

Can you try this instead:

• Don't revert the change to pkg/cli/server/server.go
• Remove the the immediate READY notification if cfg.ETCDAgent is set in pkg/agent/run.go.
• After setupTunnelAndRunAgent returns, if cfg.ETCDAgent is set then reset the variable by calling os.Setenv("NOTIFY_SOCKET", notifySocket).
• Down at the bottom make the os.Setenv and systemd.SdNotify calls conditional on !cfg.ETCDAgent.

This should have a net effect of resetting the environment variable so that the server goroutine can send the notification when etcd becomes ready (on etcd-only servers), and preventing the agent from sending a second extra notification later when the apiserver comes up.

[brandond]

^^