Skip to content

Commit b616f76

Browse files
committed
reuse install-config sshkey for InfraEnv asset
1 parent fb9e519 commit b616f76

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

pkg/asset/agent/joiner/clusterinfo.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ type ClusterInfo struct {
3636
ImageDigestSources []types.ImageDigestSource
3737
DeprecatedImageContentSources []types.ImageContentSource
3838
PlatformType hiveext.PlatformType
39+
SSHKey string
3940
}
4041

4142
var _ asset.WritableAsset = (*ClusterInfo)(nil)
@@ -215,6 +216,7 @@ func (ci *ClusterInfo) retrieveInstallConfigData(clientset *kubernetes.Clientset
215216
ci.ImageDigestSources = installConfig.ImageDigestSources
216217
ci.DeprecatedImageContentSources = installConfig.DeprecatedImageContentSources
217218
ci.PlatformType = agent.HivePlatformType(installConfig.Platform)
219+
ci.SSHKey = installConfig.SSHKey
218220

219221
return nil
220222
}

pkg/asset/agent/manifests/infraenv.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (i *InfraEnv) Generate(dependencies asset.Parents) error {
7272
}
7373

7474
case workflow.AgentWorkflowTypeAddNodes:
75-
err := i.generateManifest(clusterInfo.ClusterID, clusterInfo.Namespace, "", clusterInfo.UserCaBundle, clusterInfo.Proxy, clusterInfo.Architecture)
75+
err := i.generateManifest(clusterInfo.ClusterID, clusterInfo.Namespace, clusterInfo.SSHKey, clusterInfo.UserCaBundle, clusterInfo.Proxy, clusterInfo.Architecture)
7676
if err != nil {
7777
return err
7878
}

0 commit comments

Comments
 (0)