Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-13 13:06:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix controller version info

Browse Source 
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan
2023-08-22 12:36:58 +03:00
parent eac82585ad
commit 4cdb75b74d
2 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/flux/version.go
View File

@@ -22,6 +22,7 @@ import (
"fmt"
"strings"
"github.com/google/go-containerregistry/pkg/name"
"github.com/spf13/cobra"
v1 "k8s.io/api/apps/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -119,12 +120,19 @@ func versionCmdRun(cmd *cobra.Command, args []string) error {
}
func splitImageStr(image string) (string, string, error) {
imageArr := strings.Split(image, ":")
if len(imageArr) < 2 {
ref, err := name.ParseReference(image)
if err != nil {
return "", "", fmt.Errorf("parsing image '%s' failed: %w", image, err)
}
reg := ref.Context().RegistryStr()
repo := strings.TrimPrefix(image, reg)
parts := strings.Split(repo, ":")
if len(parts) < 2 {
return "", "", fmt.Errorf("missing image tag in image %s", image)
}
name, tag := imageArr[0], imageArr[1]
nameArr := strings.Split(name, "/")
return nameArr[len(nameArr)-1], tag, nil
n, t := parts[0], strings.TrimPrefix(repo, parts[0]+":")
nameArr := strings.Split(n, "/")
return nameArr[len(nameArr)-1], t, nil
}