mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Get Latest MinIO Image on Tenant Create (#1703)

Browse Source 
* Fix Get Latest MinIO Image on Tenant Create

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>

* remove `operator_` prefix on files in operatorapi

Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
This commit is contained in:
Daniel Valdivia
2022-03-15 15:16:26 -07:00
committed by GitHub
parent 75bc568e4b
commit 62b8258989
19 changed files with 266 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cluster/config.go
View File

@@ -61,13 +61,6 @@ func GetNsFromFile() string {
// Namespace will run only once at console startup
var Namespace = GetNsFromFile()
var latestMinIOImage, errLatestMinIOImage = utils.GetLatestMinIOImage(
&utils.HTTPClient{
Client: &http.Client{
Timeout: 15 * time.Second,
},
})
// GetMinioImage returns the image URL to be used when deploying a MinIO instance, if there is
// a preferred image to be used (configured via ENVIRONMENT VARIABLES) GetMinioImage will return that
// if not, GetMinioImage will try to obtain the image URL for the latest version of MinIO and return that
@@ -77,17 +70,15 @@ func GetMinioImage() (*string, error) {
if image != "" {
return &image, nil
}
latestMinIOImage, errLatestMinIOImage := utils.GetLatestMinIOImage(
&utils.HTTPClient{
Client: &http.Client{
Timeout: 5 * time.Second,
},
})
if errLatestMinIOImage != nil {
return nil, errLatestMinIOImage
}
return latestMinIOImage, nil
}
// GetLatestMinioImage returns the latest image URL on minio repository
func GetLatestMinioImage(client utils.HTTPClientI) (*string, error) {
latestMinIOImage, err := utils.GetLatestMinIOImage(client)
if err != nil {
return nil, err
}
return latestMinIOImage, nil
}