|
4 | 4 | "bytes" |
5 | 5 | "fmt" |
6 | 6 | "io" |
7 | | - "strings" |
8 | 7 |
|
9 | 8 | "github.com/arttor/helmify/pkg/processor" |
10 | 9 |
|
@@ -60,30 +59,29 @@ func (r pdb) Process(appMeta helmify.AppMetadata, obj *unstructured.Unstructured |
60 | 59 | } |
61 | 60 |
|
62 | 61 | name := appMeta.TrimName(obj.GetName()) |
63 | | - shortName := strings.TrimPrefix(name, "controller-manager-") |
64 | | - shortNameCamel := strcase.ToLowerCamel(shortName) |
| 62 | + nameCamel := strcase.ToLowerCamel(name) |
65 | 63 |
|
66 | 64 | selector, _ := yaml.Marshal(pdb.Spec.Selector) |
67 | 65 | selector = yamlformat.Indent(selector, 4) |
68 | 66 | selector = bytes.TrimRight(selector, "\n ") |
69 | 67 |
|
70 | 68 | if spec.MaxUnavailable != nil { |
71 | | - _, err := values.Add(spec.MaxUnavailable.IntValue(), shortNameCamel, "maxUnavailable") |
| 69 | + _, err := values.Add(spec.MaxUnavailable.IntValue(), nameCamel, "maxUnavailable") |
72 | 70 | if err != nil { |
73 | 71 | return true, nil, err |
74 | 72 | } |
75 | 73 | } |
76 | 74 |
|
77 | 75 | if spec.MinAvailable != nil { |
78 | | - _, err := values.Add(spec.MinAvailable.IntValue(), shortNameCamel, "minAvailable") |
| 76 | + _, err := values.Add(spec.MinAvailable.IntValue(), nameCamel, "minAvailable") |
79 | 77 | if err != nil { |
80 | 78 | return true, nil, err |
81 | 79 | } |
82 | 80 | } |
83 | 81 |
|
84 | | - res := meta + fmt.Sprintf(pdbTempSpec, shortNameCamel, selector, appMeta.ChartName()) |
| 82 | + res := meta + fmt.Sprintf(pdbTempSpec, nameCamel, selector, appMeta.ChartName()) |
85 | 83 | return true, &result{ |
86 | | - name: shortName, |
| 84 | + name: name, |
87 | 85 | data: res, |
88 | 86 | values: values, |
89 | 87 | }, nil |
|
0 commit comments