Skip to content

Commit 7d4a4a5

Browse files
committed
Make sure we run this only when PlatformStatus is not nil
1 parent 65c5ca2 commit 7d4a4a5

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

controllers/pattern_controller.go

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -318,24 +318,27 @@ func (r *PatternReconciler) applyDefaults(input *api.Pattern) (*api.Pattern, err
318318
// type: AWS
319319

320320
output.Status.ClusterPlatform = string(clusterInfra.Spec.PlatformSpec.Type)
321-
clusterPlatformStatusType := strings.ToLower(string(clusterInfra.Status.PlatformStatus.Type))
322-
var extraClusterInfo = make(map[string]string)
323-
switch clusterPlatformStatusType {
324-
case "aws":
325-
for _, v := range clusterInfra.Status.PlatformStatus.AWS.ResourceTags {
326-
extraClusterInfo[v.Key] = v.Value
321+
322+
if clusterInfra.Status.PlatformStatus != nil {
323+
clusterPlatformStatusType := strings.ToLower(string(clusterInfra.Status.PlatformStatus.Type))
324+
var extraClusterInfo = make(map[string]string)
325+
switch clusterPlatformStatusType {
326+
case "aws":
327+
for _, v := range clusterInfra.Status.PlatformStatus.AWS.ResourceTags {
328+
extraClusterInfo[v.Key] = v.Value
329+
}
330+
case "azure":
331+
extraClusterInfo["ResourceGroupName"] = clusterInfra.Status.PlatformStatus.Azure.ResourceGroupName
332+
extraClusterInfo["NetworkResourceGroupName"] = clusterInfra.Status.PlatformStatus.Azure.NetworkResourceGroupName
333+
case "ibmcloud":
334+
// no particular useful info?
335+
case "baremetal":
336+
extraClusterInfo["APIServerInternalIP"] = clusterInfra.Status.PlatformStatus.BareMetal.APIServerInternalIP
337+
extraClusterInfo["IngressIP"] = clusterInfra.Status.PlatformStatus.BareMetal.IngressIP
338+
extraClusterInfo["NodeDNSIP"] = clusterInfra.Status.PlatformStatus.BareMetal.NodeDNSIP
327339
}
328-
case "azure":
329-
extraClusterInfo["ResourceGroupName"] = clusterInfra.Status.PlatformStatus.Azure.ResourceGroupName
330-
extraClusterInfo["NetworkResourceGroupName"] = clusterInfra.Status.PlatformStatus.Azure.NetworkResourceGroupName
331-
case "ibmcloud":
332-
// no particular useful info?
333-
case "baremetal":
334-
extraClusterInfo["APIServerInternalIP"] = clusterInfra.Status.PlatformStatus.BareMetal.APIServerInternalIP
335-
extraClusterInfo["IngressIP"] = clusterInfra.Status.PlatformStatus.BareMetal.IngressIP
336-
extraClusterInfo["NodeDNSIP"] = clusterInfra.Status.PlatformStatus.BareMetal.NodeDNSIP
340+
output.Status.ExtraClusterInfo = extraClusterInfo
337341
}
338-
output.Status.ExtraClusterInfo = extraClusterInfo
339342
}
340343

341344
// Cluster Version

0 commit comments

Comments
 (0)