Cherry-pick CERN patches for OKD 4.10 release

pkg/operator/config.go

@@ -57,6 +57,10 @@ type Images struct {
 func getProviderFromInfrastructure(infra *configv1.Infrastructure) (configv1.PlatformType, error) {
 	if infra.Status.PlatformStatus != nil {
 		if infra.Status.PlatformStatus.Type != "" {
+			if infra.Status.PlatformStatus.Type == configv1.NonePlatformType {
+				// Map cloud platform 'None' to 'OpenStack' for CERN Cloud
+				return configv1.OpenStackPlatformType, nil
+			}
 			return infra.Status.PlatformStatus.Type, nil
 		}
 	}