Skip to content

Commit

Permalink
New Login Design (#1675)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
  • Loading branch information
dvaldivia authored Mar 8, 2022
1 parent 5e42f96 commit 8e21039
Show file tree
Hide file tree
Showing 34 changed files with 3,018 additions and 175 deletions.
40 changes: 6 additions & 34 deletions cluster/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,15 @@
package cluster

import (
"errors"
"fmt"
"io/ioutil"
"net"
"net/http"
"regexp"
"strings"
"time"

"github.com/minio/pkg/env"
)
"github.com/minio/console/pkg/utils"

var (
errCantDetermineMinIOImage = errors.New("can't determine MinIO Image")
"github.com/minio/pkg/env"
)

func GetK8sAPIServer() string {
Expand Down Expand Up @@ -66,31 +61,8 @@ func GetNsFromFile() string {
// Namespace will run only once at console startup
var Namespace = GetNsFromFile()

// getLatestMinIOImage returns the latest docker image for MinIO if found on the internet
func getLatestMinIOImage(client HTTPClientI) (*string, error) {
resp, err := client.Get("https://dl.min.io/server/minio/release/linux-amd64/")
if err != nil {
return nil, err
}
defer resp.Body.Close()

body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, err
}
var re = regexp.MustCompile(`(?m)\.\/minio\.(RELEASE.*?Z)"`)
// look for a single match
matches := re.FindAllStringSubmatch(string(body), 1)
for i := range matches {
release := matches[i][1]
dockerImage := fmt.Sprintf("minio/minio:%s", release)
return &dockerImage, nil
}
return nil, errCantDetermineMinIOImage
}

var latestMinIOImage, errLatestMinIOImage = getLatestMinIOImage(
&HTTPClient{
var latestMinIOImage, errLatestMinIOImage = utils.GetLatestMinIOImage(
&utils.HTTPClient{
Client: &http.Client{
Timeout: 15 * time.Second,
},
Expand All @@ -112,8 +84,8 @@ func GetMinioImage() (*string, error) {
}

// GetLatestMinioImage returns the latest image URL on minio repository
func GetLatestMinioImage(client HTTPClientI) (*string, error) {
latestMinIOImage, err := getLatestMinIOImage(client)
func GetLatestMinioImage(client utils.HTTPClientI) (*string, error) {
latestMinIOImage, err := utils.GetLatestMinIOImage(client)
if err != nil {
return nil, err
}
Expand Down
70 changes: 70 additions & 0 deletions models/check_operator_version_response.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 70 additions & 0 deletions models/check_version_response.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions operatorapi/configure_operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func configureAPI(api *operations.OperatorAPI) http.Handler {
// Register login handlers
registerLoginHandlers(api)
registerSessionHandlers(api)
registerVersionHandlers(api)

// Operator Console
// Register tenant handlers
Expand Down
70 changes: 70 additions & 0 deletions operatorapi/embedded_spec.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions operatorapi/operations/operator_api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8e21039

Please sign in to comment.