scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a SSHKey sync check to the master's healthz (when using SSHTunnels).

Browse Source
This commit is contained in:
CJ Cullen
2016-03-17 17:57:04 -07:00
parent 26eab4d69c
commit 5f3929f75d
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/master/master.go
View File

@@ -858,5 +858,9 @@ func (m *Master) IsTunnelSyncHealthy(req *http.Request) error {
if lag > 600 { if lag > 600 {
return fmt.Errorf("Tunnel sync is taking to long: %d", lag) return fmt.Errorf("Tunnel sync is taking to long: %d", lag)
} }
sshKeyLag := m.tunneler.SecondsSinceSSHKeySync()
if sshKeyLag > 600 {
return fmt.Errorf("SSHKey sync is taking to long: %d", sshKeyLag)
}
return nil return nil
} }

11
pkg/master/tunneler.go
View File

@@ -41,6 +41,7 @@ type Tunneler interface {
Stop() Stop()
Dial(net, addr string) (net.Conn, error) Dial(net, addr string) (net.Conn, error)
SecondsSinceSync() int64 SecondsSinceSync() int64
SecondsSinceSSHKeySync() int64
} }
type SSHTunneler struct { type SSHTunneler struct {
@@ -51,6 +52,7 @@ type SSHTunneler struct {
tunnels *ssh.SSHTunnelList tunnels *ssh.SSHTunnelList
lastSync int64 // Seconds since Epoch lastSync int64 // Seconds since Epoch
lastSSHKeySync int64 // Seconds since Epoch
lastSyncMetric prometheus.GaugeFunc lastSyncMetric prometheus.GaugeFunc
clock util.Clock clock util.Clock
@@ -101,6 +103,7 @@ func (c *SSHTunneler) Run(getAddresses AddressFunc) {
c.tunnels = ssh.NewSSHTunnelList(c.SSHUser, c.SSHKeyfile, c.HealthCheckURL, c.stopChan) c.tunnels = ssh.NewSSHTunnelList(c.SSHUser, c.SSHKeyfile, c.HealthCheckURL, c.stopChan)
// Sync loop to ensure that the SSH key has been installed. // Sync loop to ensure that the SSH key has been installed.
c.lastSSHKeySync = c.clock.Now().Unix()
c.installSSHKeySyncLoop(c.SSHUser, publicKeyFile) c.installSSHKeySyncLoop(c.SSHUser, publicKeyFile)
// Sync tunnelList w/ nodes. // Sync tunnelList w/ nodes.
c.lastSync = c.clock.Now().Unix() c.lastSync = c.clock.Now().Unix()
@@ -125,6 +128,12 @@ func (c *SSHTunneler) SecondsSinceSync() int64 {
return now - then return now - then
} }
func (c *SSHTunneler) SecondsSinceSSHKeySync() int64 {
now := c.clock.Now().Unix()
then := atomic.LoadInt64(&c.lastSSHKeySync)
return now - then
}
func (c *SSHTunneler) installSSHKeySyncLoop(user, publicKeyfile string) { func (c *SSHTunneler) installSSHKeySyncLoop(user, publicKeyfile string) {
go wait.Until(func() { go wait.Until(func() {
if c.InstallSSHKey == nil { if c.InstallSSHKey == nil {
@@ -143,7 +152,9 @@ func (c *SSHTunneler) installSSHKeySyncLoop(user, publicKeyfile string) {
} }
if err := c.InstallSSHKey(user, keyData); err != nil { if err := c.InstallSSHKey(user, keyData); err != nil {
glog.Errorf("Failed to install ssh key: %v", err) glog.Errorf("Failed to install ssh key: %v", err)
return
} }
atomic.StoreInt64(&c.lastSSHKeySync, c.clock.Now().Unix())
}, 5*time.Minute, c.stopChan) }, 5*time.Minute, c.stopChan)
} }

1
pkg/master/tunneler_test.go
View File

@@ -76,6 +76,7 @@ func TestIsTunnelSyncHealthy(t *testing.T) {
// Pass case: 540 second lag // Pass case: 540 second lag
tunneler.lastSync = time.Date(2015, time.January, 1, 1, 1, 1, 1, time.UTC).Unix() tunneler.lastSync = time.Date(2015, time.January, 1, 1, 1, 1, 1, time.UTC).Unix()
tunneler.lastSSHKeySync = time.Date(2015, time.January, 1, 1, 1, 1, 1, time.UTC).Unix()
tunneler.clock = util.NewFakeClock(time.Date(2015, time.January, 1, 1, 9, 1, 1, time.UTC)) tunneler.clock = util.NewFakeClock(time.Date(2015, time.January, 1, 1, 9, 1, 1, time.UTC))
err := master.IsTunnelSyncHealthy(nil) err := master.IsTunnelSyncHealthy(nil)
assert.NoError(err, "IsTunnelSyncHealthy() should not have returned an error.") assert.NoError(err, "IsTunnelSyncHealthy() should not have returned an error.")