Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

look for MinIO release tag from container labels #1181

Merged
merged 1 commit into from
Jun 21, 2022
Merged

look for MinIO release tag from container labels #1181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions pkg/controller/cluster/artifacts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@
package cluster

import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"os"
"os/exec"
"strings"
"time"

Expand All @@ -43,21 +41,6 @@ import (
miniov2 "github.com/minio/operator/pkg/apis/minio.min.io/v2"
)

func (c *Controller) fetchTag(path string) (string, error) {
cmd := exec.Command(path, "--version")
var out bytes.Buffer
cmd.Stdout = &out
err := cmd.Run()
if err != nil {
return "", err
}
op := strings.Fields(out.String())
if len(op) < 3 {
return "", fmt.Errorf("incorrect output while fetching tag value - %d", len((op)))
}
return op[2], nil
}

// minioKeychain implements Keychain to pass custom credentials
type minioKeychain struct {
authn.Keychain
Expand Down Expand Up @@ -140,6 +123,20 @@ func (c *Controller) fetchArtifacts(tenant *miniov2.Tenant) (latest time.Time, e
return latest, err
}

cfg, err := img.ConfigFile()
if err != nil {
return latest, err
}

tag, ok := cfg.Config.Labels["release"]
if !ok {
tag, ok = cfg.Config.Labels["version"]
}
tag = strings.TrimSpace(tag)
if !ok || tag == "" {
return latest, errors.New("missing tag")
}

ls, err := img.Layers()
if err != nil {
return latest, err
Expand Down Expand Up @@ -199,11 +196,6 @@ func (c *Controller) fetchArtifacts(tenant *miniov2.Tenant) (latest time.Time, e
srcShaSum := "minio.sha256sum"
srcSig := "minio.minisig"

tag, err := c.fetchTag(basePath + srcBinary)
if err != nil {
return latest, err
}

latest, err = miniov2.ReleaseTagToReleaseTime(tag)
if err != nil {
return latest, err
Expand Down