Merge "nodepool-builder - fix .ssh/known_hosts wipe after pod restart"

softwarefactory-project · Oct 24, 2023 · e20a24c · e20a24c
2 parents 263501a + 48d1179
commit e20a24c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/controllers/nodepool.go b/controllers/nodepool.go
@@ -349,7 +349,6 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 		base.MkVolumeSecret("zookeeper-client-tls"),
 		base.MkVolumeSecret(NodepoolProvidersSecretsName),
 		base.MkEmptyDirVolume("nodepool-config"),
-		base.MkEmptyDirVolume("nodepool-home-ssh"),
 		r.commonToolingVolume(),
 		{
 			Name: "nodepool-builder-ssh-key",
@@ -390,10 +389,6 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 			MountPath: "/var/lib/nodepool-ssh-key",
 			ReadOnly:  true,
 		},
-		{
-			Name:      "nodepool-home-ssh",
-			MountPath: "/var/lib/nodepool/.ssh",
-		},
 		{
 			Name:      "nodepool-tooling-vol",
 			SubPath:   "ssh_config",
@@ -421,7 +416,7 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 		"statsd_mapping":         utils.Checksum([]byte(nodepoolStatsdMappingConfig)),
 		// When the Secret ResourceVersion field change (when edited) we force a nodepool-builder restart
 		"nodepool-providers-secrets": string(nodepoolProvidersSecrets.ResourceVersion),
-		"serial":                     "8",
+		"serial":                     "9",
 	}
 
 	initContainer := base.MkContainer("nodepool-builder-init", base.BusyboxImage)

diff --git a/controllers/static/nodepool/ssh_config b/controllers/static/nodepool/ssh_config
@@ -1,2 +1,3 @@
 Host *
     IdentityFile /var/lib/nodepool-ssh-key/priv
+    UserKnownHostsFile /var/lib/nodepool/known_hosts