|
1 | 1 | package configutil |
2 | 2 |
|
3 | 3 | import ( |
4 | | - "fmt" |
5 | 4 | "os" |
6 | 5 | "sync" |
7 | 6 |
|
@@ -90,45 +89,9 @@ func GetConfig() *v1.Config { |
90 | 89 | //ignore error as overwrite.yaml is optional |
91 | 90 | loadConfig(overwriteConfig, OverwriteConfigPath) |
92 | 91 |
|
93 | | - configImages := *config.Images |
94 | | - configImageDefault := configImages["default"] |
95 | | - configRawImages := *configRaw.Images |
96 | | - configRawImageDefault := configRawImages["default"] |
97 | | - |
98 | | - fmt.Println(configRawImageDefault.Name) |
99 | | - |
100 | | - fmt.Println("") |
101 | | - fmt.Println("merge config") |
102 | | - |
103 | 92 | Merge(&config, configRaw, false) |
104 | | - |
105 | | - configImages = *config.Images |
106 | | - configImageDefault = configImages["default"] |
107 | | - configRawImages = *configRaw.Images |
108 | | - configRawImageDefault = configRawImages["default"] |
109 | | - |
110 | | - fmt.Println(configImageDefault.Name) |
111 | | - fmt.Println(configRawImageDefault.Name) |
112 | | - |
113 | | - fmt.Println("") |
114 | | - fmt.Println("merge overwrite config") |
115 | | - |
116 | 93 | Merge(&config, overwriteConfig, true) |
117 | 94 |
|
118 | | - configImages = *config.Images |
119 | | - configImageDefault = configImages["default"] |
120 | | - configRawImages = *configRaw.Images |
121 | | - configRawImageDefault = configRawImages["default"] |
122 | | - |
123 | | - fmt.Println(configImageDefault.Name) |
124 | | - fmt.Println(configRawImageDefault.Name) |
125 | | - |
126 | | - configOverwriteImages := *configRaw.Images |
127 | | - configOverwriteImageDefault := configOverwriteImages["default"] |
128 | | - |
129 | | - fmt.Println(configOverwriteImageDefault.Name) |
130 | | - fmt.Println(*configOverwriteImageDefault.Name) |
131 | | - |
132 | 95 | SetDefaultsOnce() |
133 | 96 | }) |
134 | 97 |
|
|
0 commit comments