kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Parse data into string map for easy access in RunAddMetadata

Browse Source
This commit is contained in:
guineveresaenger
2018-08-15 03:01:29 -07:00
parent 6a2786a5c4
commit 3b644474c4
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/commands/addmetadata.go
View File

@@ -34,19 +34,19 @@ const (
label label
) )
func (kind KindOfAdd) String() string { func (k KindOfAdd) String() string {
kinds := [...]string{ kinds := [...]string{
"annotation", "annotation",
"label", "label",
} }
if kind < 0 || kind > 1 { if k < 0 || k > 1 {
return "Unknown metadatakind" return "Unknown metadatakind"
} }
return kinds[kind] return kinds[k]
} }
type addMetadataOptions struct { type addMetadataOptions struct {
metadata string metadata map[string]string
} }
// newCmdAddAnnotation adds one or more commonAnnotations to the kustomization file. // newCmdAddAnnotation adds one or more commonAnnotations to the kustomization file.
@@ -108,8 +108,13 @@ func (o *addMetadataOptions) Validate(args []string, k KindOfAdd) error {
return fmt.Errorf("invalid %s format: %s", k, input) return fmt.Errorf("invalid %s format: %s", k, input)
} }
} }
//parse annotation keys and values into metadata
o.metadata = args[0] entries := strings.Split(args[0], ",")
o.metadata = make(map[string]string)
for _, entry := range entries {
kv := strings.Split(entry, ":")
o.metadata[kv[0]] = kv[1]
}
return nil return nil
} }
@@ -133,20 +138,18 @@ func (o *addMetadataOptions) RunAddMetadata(fsys fs.FileSystem, k KindOfAdd) err
m.CommonAnnotations = make(map[string]string) m.CommonAnnotations = make(map[string]string)
} }
entries := strings.Split(o.metadata, ",") for key, value := range o.metadata {
for _, entry := range entries {
kv := strings.Split(entry, ":")
if k == label { if k == label {
if _, ok := m.CommonLabels[kv[0]]; ok { if _, ok := m.CommonLabels[key]; ok {
return fmt.Errorf("%s %s already in kustomization file", k, kv[0]) return fmt.Errorf("%s %s already in kustomization file", k, key)
} }
m.CommonLabels[kv[0]] = kv[1] m.CommonLabels[key] = value
} }
if k == annotation { if k == annotation {
if _, ok := m.CommonAnnotations[kv[0]]; ok { if _, ok := m.CommonAnnotations[key]; ok {
return fmt.Errorf("%s %s already in kustomization file", k, kv[0]) return fmt.Errorf("%s %s already in kustomization file", k, key)
} }
m.CommonAnnotations[kv[0]] = kv[1] m.CommonAnnotations[key] = value
} }
} }