Merge pull request #1033 from openshift-cherrypick-robot/cherry-pick-1031-to-release-4.14

openshift-merge-bot[bot] · web-flow · commit 9043a9789712 · 2024-05-28T05:18:48.000Z
[release-4.14] OCPBUGS-33409: azurepathfix: check if platform status is nil before accessing it
diff --git a/pkg/operator/azurepathfixcontroller.go b/pkg/operator/azurepathfixcontroller.go
@@ -168,7 +168,7 @@ func (c *AzurePathFixController) sync() error {
 	if err != nil {
 		return fmt.Errorf("unable to get infrastructure object: %s", err)
 	}
-	if infra.Status.PlatformStatus.Type != configapiv1.AzurePlatformType {
+	if infra.Status.PlatformStatus != nil && infra.Status.PlatformStatus.Type != configapiv1.AzurePlatformType {
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ func (c *AzurePathFixController) sync() error {`
`168`	`168`	`if err != nil {`
`169`	`169`	`return fmt.Errorf("unable to get infrastructure object: %s", err)`
`170`	`170`	`}`
`171`		`- if infra.Status.PlatformStatus.Type != configapiv1.AzurePlatformType {`
	`171`	`+ if infra.Status.PlatformStatus != nil && infra.Status.PlatformStatus.Type != configapiv1.AzurePlatformType {`
`172`	`172`	`return nil`
`173`	`173`	`}`
`174`	`174`