Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-03-20 01:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor object kind/name parsing

Browse Source
This commit is contained in:
stefanprodan
2020-09-23 18:19:33 +03:00
parent bd2994f9ab
commit d11fa476e1
4 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/gotk/create_helmrelease.go
View File

@@ -20,7 +20,6 @@ import (
"context"
"fmt"
"io/ioutil"
"strings"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
@@ -119,14 +118,13 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
if hrSource == "" {
return fmt.Errorf("source is required")
}
hrSourceElements := strings.Split(hrSource, "/")
if len(hrSourceElements) != 2 {
sourceKind, sourceName := utils.parseObjectKindName(hrSource)
if sourceKind == "" {
return fmt.Errorf("invalid source '%s', must be in format <kind>/<name>", hrSource)
}
hrSourceKind, hrSourceName := hrSourceElements[0], hrSourceElements[1]
if !utils.containsItemString(supportedHelmChartSourceKinds, hrSourceKind) {
if !utils.containsItemString(supportedHelmChartSourceKinds, sourceKind) {
return fmt.Errorf("source kind %s is not supported, can be %v",
hrSourceKind, supportedHelmChartSourceKinds)
sourceKind, supportedHelmChartSourceKinds)
}
if hrChart == "" {
return fmt.Errorf("chart name or path is required")
@@ -159,8 +157,8 @@ func createHelmReleaseCmdRun(cmd *cobra.Command, args []string) error {
Chart: hrChart,
Version: hrChartVersion,
SourceRef: helmv2.CrossNamespaceObjectReference{
Kind: hrSourceKind,
Name: hrSourceName,
Kind: sourceKind,
Name: sourceName,
},
},
},