Skip to content

Commit bb63207

Browse files
Fix test failures
1 parent 83c55b8 commit bb63207

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

pkg/asset/agent/image/ignition.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,6 @@ func (a *Ignition) Generate(dependencies asset.Parents) error {
255255
osImage,
256256
infraEnv.Spec.Proxy,
257257
imageTypeISO,
258-
keyPairAsset.PrivateKey,
259258
keyPairAsset.PublicKey,
260259
caBundleMount)
261260

@@ -373,7 +372,7 @@ func getTemplateData(name, pullSecret, releaseImageList, releaseImage,
373372
osImage *models.OsImage,
374373
proxy *v1beta1.Proxy,
375374
imageTypeISO,
376-
privateKey, publicKey string,
375+
publicKey string,
377376
caBundleMount string) *agentTemplateData {
378377
return &agentTemplateData{
379378
ServiceProtocol: "http",
@@ -390,7 +389,6 @@ func getTemplateData(name, pullSecret, releaseImageList, releaseImage,
390389
OSImage: osImage,
391390
Proxy: proxy,
392391
ImageTypeISO: imageTypeISO,
393-
PrivateKeyPEM: privateKey,
394392
PublicKeyPEM: publicKey,
395393
CaBundleMount: caBundleMount,
396394
}

pkg/asset/agent/image/ignition_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,9 @@ func TestIgnition_getTemplateData(t *testing.T) {
9090
}
9191
clusterName := "test-agent-cluster-install.test"
9292

93-
privateKey := "-----BEGIN EC PUBLIC KEY-----\nMFkwEwYHKoAiDHV4tg==\n-----END EC PUBLIC KEY-----\n"
94-
publicKey := "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIOSCfDNmx0qe6dncV4tg==\n-----END EC PRIVATE KEY-----\n" //nolint:gosec
93+
publicKey := "-----BEGIN EC PUBLIC KEY-----\nMHcCAQEEIOSCfDNmx0qe6dncV4tg==\n-----END EC PUBLIC KEY-----\n"
9594

96-
templateData := getTemplateData(clusterName, pullSecret, releaseImageList, releaseImage, releaseImageMirror, haveMirrorConfig, publicContainerRegistries, agentClusterInstall.Spec.ProvisionRequirements.ControlPlaneAgents, agentClusterInstall.Spec.ProvisionRequirements.WorkerAgents, infraEnvID, osImage, proxy, "minimal-iso", privateKey, publicKey, "")
95+
templateData := getTemplateData(clusterName, pullSecret, releaseImageList, releaseImage, releaseImageMirror, haveMirrorConfig, publicContainerRegistries, agentClusterInstall.Spec.ProvisionRequirements.ControlPlaneAgents, agentClusterInstall.Spec.ProvisionRequirements.WorkerAgents, infraEnvID, osImage, proxy, "minimal-iso", publicKey, "")
9796
assert.Equal(t, clusterName, templateData.ClusterName)
9897
assert.Equal(t, "http", templateData.ServiceProtocol)
9998
assert.Equal(t, pullSecret, templateData.PullSecret)
@@ -107,7 +106,6 @@ func TestIgnition_getTemplateData(t *testing.T) {
107106
assert.Equal(t, infraEnvID, templateData.InfraEnvID)
108107
assert.Equal(t, osImage, templateData.OSImage)
109108
assert.Equal(t, proxy, templateData.Proxy)
110-
assert.Equal(t, privateKey, templateData.PrivateKeyPEM)
111109
assert.Equal(t, publicKey, templateData.PublicKeyPEM)
112110
}
113111

0 commit comments

Comments
 (0)