Skip to content

Commit

Permalink
Merge pull request #136 from sabre1041/rados-storage-fix
Browse files Browse the repository at this point in the history
Corrected RADOS storage issues in validation
  • Loading branch information
Kurtis Mullins authored Jan 27, 2020
2 parents 1fe1836 + 08b76ea commit c32464f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkg/controller/quayecosystem/validation/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -348,14 +348,14 @@ func Validate(client client.Client, quayConfiguration *resources.QuayConfigurati
return false, fmt.Errorf("Failed to validate provided registry backend. Name: %s", managedRegistryBackend.Name)
}

managedRegistryBackend.RHOCS.AccessKey = string(RADOSSecret.Data[constants.RADOSAccessKey])
managedRegistryBackend.RHOCS.SecretKey = string(RADOSSecret.Data[constants.RADOSSecretKey])
managedRegistryBackend.RADOS.AccessKey = string(RADOSSecret.Data[constants.RADOSAccessKey])
managedRegistryBackend.RADOS.SecretKey = string(RADOSSecret.Data[constants.RADOSSecretKey])

managedRegistryBackend.CredentialsSecretName = ""

}

if managedRegistryBackend.RHOCS.StoragePath == "" || managedRegistryBackend.RHOCS.BucketName == "" {
if managedRegistryBackend.RADOS.StoragePath == "" || managedRegistryBackend.RADOS.BucketName == "" {
return false, fmt.Errorf("Failed to validate provided registry backend. Name: %s", managedRegistryBackend.Name)
}

Expand Down

0 comments on commit c32464f

Please sign in to comment.