fix list images in kubevirt and tinkerbell (#7049)

kubermatic · Jan 13, 2025 · 4ca4392 · 4ca4392
1 parent 3a50ae6
commit 4ca4392
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/modules/api/pkg/handler/common/provider/baremetal.go b/modules/api/pkg/handler/common/provider/baremetal.go
@@ -60,6 +60,10 @@ func TinkerbellImages(ctx context.Context, datacenterName string, userInfoGetter
 	httpSource := datacenter.Spec.Baremetal.Tinkerbell.Images.HTTP
 	if httpSource != nil {
 		for os, versions := range httpSource.OperatingSystems {
+			// Ensure the sub-map for the operating system is initialized
+			if _, ok := res.Standard.OperatingSystems[os]; !ok {
+				res.Standard.OperatingSystems[os] = map[string]string{}
+			}
 			for version, link := range versions {
 				res.Standard.OperatingSystems[os][version] = link
 			}

diff --git a/modules/api/pkg/handler/common/provider/kubevirt.go b/modules/api/pkg/handler/common/provider/kubevirt.go
@@ -640,6 +640,10 @@ func KubeVirtImages(ctx context.Context, datacenterName string, userInfoGetter p
 	httpSource := datacenter.Spec.Kubevirt.Images.HTTP
 	if httpSource != nil {
 		for os, versions := range httpSource.OperatingSystems {
+			// Ensure the sub-map for the operating system is initialized
+			if _, ok := res.Standard.OperatingSystems[os]; !ok {
+				res.Standard.OperatingSystems[os] = map[string]string{}
+			}
 			for version, link := range versions {
 				res.Standard.OperatingSystems[os][version] = link
 			}

diff --git a/modules/api/pkg/resources/machine/common.go b/modules/api/pkg/resources/machine/common.go
@@ -291,7 +291,6 @@ func getBaremetalProviderConfig(cluster *kubermaticv1.Cluster, nodeSpec apiv1.No
 	tinkerbellSpec := &tink.TinkerbellPluginSpec{
 		ClusterName: providerconfig.ConfigVarString{Value: cluster.Name},
 		HardwareRef: tinkerbellConfig.HardwareRef,
-		Auth:        tink.Auth{Kubeconfig: providerconfig.ConfigVarString{Value: cluster.Spec.Cloud.Baremetal.Tinkerbell.Kubeconfig}},
 		OSImageURL:  providerconfig.ConfigVarString{Value: tinkerbellConfig.OsImageUrl},
 	}