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

fix error handling and delete comment to e2econtainerconfig/main.go

Browse Source
This commit is contained in:
yugo kobayashi
2022-07-07 16:04:58 +00:00
parent fd847108cd
commit 5c9adf248c
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/config/internal/commands/e2e/e2econtainerconfig/main.go
View File

@@ -8,7 +8,6 @@ import (
"os" "os"
"strconv" "strconv"
// corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/kustomize/kyaml/fn/framework" "sigs.k8s.io/kustomize/kyaml/fn/framework"
"sigs.k8s.io/kustomize/kyaml/fn/framework/command" "sigs.k8s.io/kustomize/kyaml/fn/framework/command"
"sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/kio"
@@ -26,8 +25,6 @@ type Config struct {
} }
func main() { func main() {
// config is same structure to configMap.
// config := &corev1.ConfigMap{}
config := &Config{} config := &Config{}
fn := func(items []*yaml.RNode) ([]*yaml.RNode, error) { fn := func(items []*yaml.RNode) ([]*yaml.RNode, error) {
@@ -37,11 +34,25 @@ func main() {
if err := items[i].PipeE(yaml.SetAnnotation("a-string-value", config.Data["stringValue"])); err != nil { if err := items[i].PipeE(yaml.SetAnnotation("a-string-value", config.Data["stringValue"])); err != nil {
return nil, fmt.Errorf("%w", err) return nil, fmt.Errorf("%w", err)
} }
intValue, _ := strconv.Atoi(config.Data["intValue"]) intValue, err := strconv.Atoi(config.Data["intValue"])
if config.Data["intValue"] == "" {
// default value
intValue = 0
} else if err != nil {
return nil, fmt.Errorf("intValue convert error: %w", err)
}
if err := items[i].PipeE(yaml.SetAnnotation("a-int-value", strconv.Itoa(intValue))); err != nil { if err := items[i].PipeE(yaml.SetAnnotation("a-int-value", strconv.Itoa(intValue))); err != nil {
return nil, fmt.Errorf("%w", err) return nil, fmt.Errorf("%w", err)
} }
boolValue, _ := strconv.ParseBool(config.Data["boolValue"]) boolValue, err := strconv.ParseBool(config.Data["boolValue"])
if config.Data["boolValue"] == "" {
// default value
boolValue = false
} else if err != nil {
return nil, fmt.Errorf("boolValue convert error: %w", err)
}
if err := items[i].PipeE(yaml.SetAnnotation("a-bool-value", strconv.FormatBool(boolValue))); err != nil { if err := items[i].PipeE(yaml.SetAnnotation("a-bool-value", strconv.FormatBool(boolValue))); err != nil {
return nil, fmt.Errorf("%w", err) return nil, fmt.Errorf("%w", err)
} }