rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-15 11:12:57 +00:00
Code Issues Releases Wiki Activity

Merge pull request #391 from kinarashah/cfg

Browse Source 
default targetkey to sourcekey
This commit is contained in:
Alena Prokharchyk 2018-04-23 20:51:11 -07:00 committed by GitHub
commit 0e1ffc20b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mapper/env.go
View File

@ -112,7 +112,8 @@ func (e EnvironmentMapper) ToInternal(data map[string]interface{}) {
}
targetKey := convert.ToString(value["targetKey"])
if targetKey == "" {
sourceKey := convert.ToString(value["sourceKey"])
if targetKey == "" && sourceKey == "" {
switch source {
case "secret":
envVarFrom = append(envVarFrom, map[string]interface{}{
@ -132,9 +133,12 @@ func (e EnvironmentMapper) ToInternal(data map[string]interface{}) {
})
}
} else {
if targetKey == "" {
targetKey = sourceKey
}
switch source {
case "field":
envVar = append(envVarFrom, map[string]interface{}{
envVar = append(envVar, map[string]interface{}{
"name": targetKey,
"valueFrom": map[string]interface{}{
"fieldRef": map[string]interface{}{
@ -143,7 +147,7 @@ func (e EnvironmentMapper) ToInternal(data map[string]interface{}) {
},
})
case "resource":
envVar = append(envVarFrom, map[string]interface{}{
envVar = append(envVar, map[string]interface{}{
"name": targetKey,
"valueFrom": map[string]interface{}{
"resourceFieldRef": map[string]interface{}{
@ -154,7 +158,7 @@ func (e EnvironmentMapper) ToInternal(data map[string]interface{}) {
},
})
case "configMap":
envVar = append(envVarFrom, map[string]interface{}{
envVar = append(envVar, map[string]interface{}{
"name": targetKey,
"valueFrom": map[string]interface{}{
"configMapKeyRef": map[string]interface{}{
@ -165,7 +169,7 @@ func (e EnvironmentMapper) ToInternal(data map[string]interface{}) {
},
})
case "secret":
envVar = append(envVarFrom, map[string]interface{}{
envVar = append(envVar, map[string]interface{}{
"name": targetKey,
"valueFrom": map[string]interface{}{
"secretKeyRef": map[string]interface{}{