remove adding hash for configmap/secret read from resource yaml files

This commit is contained in:
Jingfang Liu
2018-07-18 10:37:02 -07:00
parent 94dab9ddc4
commit 9645f397ef
9 changed files with 36 additions and 27 deletions

View File

@@ -41,17 +41,19 @@ func NewNameHashTransformer() Transformer {
// Transform appends hash to configmaps and secrets.
func (o *nameHashTransformer) Transform(m resmap.ResMap) error {
for id, res := range m {
switch {
case selectByGVK(id.Gvk(), &schema.GroupVersionKind{Version: "v1", Kind: "ConfigMap"}):
err := appendHashForConfigMap(res)
if err != nil {
return err
}
if res.IsGenerated() {
switch {
case selectByGVK(id.Gvk(), &schema.GroupVersionKind{Version: "v1", Kind: "ConfigMap"}):
err := appendHashForConfigMap(res)
if err != nil {
return err
}
case selectByGVK(id.Gvk(), &schema.GroupVersionKind{Version: "v1", Kind: "Secret"}):
err := appendHashForSecret(res)
if err != nil {
return err
case selectByGVK(id.Gvk(), &schema.GroupVersionKind{Version: "v1", Kind: "Secret"}):
err := appendHashForSecret(res)
if err != nil {
return err
}
}
}
}

View File

@@ -83,7 +83,7 @@ func TestNameHashTransformer(t *testing.T) {
"metadata": map[string]interface{}{
"name": "secret1",
},
}),
}).SetBehavior(resource.BehaviorCreate),
}
expected := resmap.ResMap{
@@ -92,7 +92,7 @@ func TestNameHashTransformer(t *testing.T) {
"apiVersion": "v1",
"kind": "ConfigMap",
"metadata": map[string]interface{}{
"name": "cm1-m462kdfb68",
"name": "cm1",
},
}),
resource.NewResId(deploy, "deploy1"): resource.NewResourceFromMap(
@@ -144,7 +144,7 @@ func TestNameHashTransformer(t *testing.T) {
"metadata": map[string]interface{}{
"name": "secret1-7kc45hd5f7",
},
}),
}).SetBehavior(resource.BehaviorCreate),
}
tran := NewNameHashTransformer()