@@ -153,7 +153,7 @@ func getUpdateClusterConfig(cachedClusterConfig *clusterconfig.ClusterConfig, aw
153153}
154154
155155func confirmClusterConfig (clusterConfig * clusterconfig.ClusterConfig , awsCreds * AWSCredentials ) {
156- prevConfig , _ := clusterconfig .GetFileDefaults ()
156+ defaultConfig , _ := clusterconfig .GetFileDefaults ()
157157
158158 var items []table.KV
159159 items = append (items , table.KV {K : "aws access key id" , V : s .MaskString (awsCreds .AWSAccessKeyID , 4 )})
@@ -167,79 +167,79 @@ func confirmClusterConfig(clusterConfig *clusterconfig.ClusterConfig, awsCreds *
167167 items = append (items , table.KV {K : clusterconfig .MinInstancesUserFacingKey , V : * clusterConfig .MinInstances })
168168 items = append (items , table.KV {K : clusterconfig .MaxInstancesUserFacingKey , V : * clusterConfig .MaxInstances })
169169
170- if clusterConfig .Spot != nil && * clusterConfig .Spot != * prevConfig .Spot {
170+ if clusterConfig .Spot != nil && * clusterConfig .Spot != * defaultConfig .Spot {
171171 items = append (items , table.KV {K : clusterconfig .SpotUserFacingKey , V : s .YesNo (clusterConfig .Spot != nil && * clusterConfig .Spot )})
172172 items = append (items , table.KV {K : clusterconfig .InstanceDistributionUserFacingKey , V : clusterConfig .SpotConfig .InstanceDistribution })
173173 items = append (items , table.KV {K : clusterconfig .OnDemandBaseCapacityUserFacingKey , V : * clusterConfig .SpotConfig .OnDemandBaseCapacity })
174174 items = append (items , table.KV {K : clusterconfig .OnDemandPercentageAboveBaseCapacityUserFacingKey , V : * clusterConfig .SpotConfig .OnDemandPercentageAboveBaseCapacity })
175175 items = append (items , table.KV {K : clusterconfig .MaxPriceUserFacingKey , V : * clusterConfig .SpotConfig .MaxPrice })
176176 items = append (items , table.KV {K : clusterconfig .InstancePoolsUserFacingKey , V : * clusterConfig .SpotConfig .InstancePools })
177177 }
178- if clusterConfig .InstanceVolumeSize != prevConfig .InstanceVolumeSize {
178+ if clusterConfig .InstanceVolumeSize != defaultConfig .InstanceVolumeSize {
179179 items = append (items , table.KV {K : clusterconfig .InstanceVolumeSizeUserFacingKey , V : clusterConfig .InstanceVolumeSize })
180180 }
181- if clusterConfig .LogGroup != prevConfig .LogGroup {
181+ if clusterConfig .LogGroup != defaultConfig .LogGroup {
182182 items = append (items , table.KV {K : clusterconfig .LogGroupUserFacingKey , V : clusterConfig .LogGroup })
183183 }
184- if clusterConfig .Telemetry != prevConfig .Telemetry {
184+ if clusterConfig .Telemetry != defaultConfig .Telemetry {
185185 items = append (items , table.KV {K : clusterconfig .TelemetryUserFacingKey , V : clusterConfig .Telemetry })
186186 }
187187
188- if clusterConfig .ImagePredictorServe != prevConfig .ImagePredictorServe {
188+ if clusterConfig .ImagePredictorServe != defaultConfig .ImagePredictorServe {
189189 items = append (items , table.KV {K : clusterconfig .ImagePredictorServeUserFacingKey , V : clusterConfig .ImagePredictorServe })
190190 }
191- if clusterConfig .ImagePredictorServeGPU != prevConfig .ImagePredictorServeGPU {
191+ if clusterConfig .ImagePredictorServeGPU != defaultConfig .ImagePredictorServeGPU {
192192 items = append (items , table.KV {K : clusterconfig .ImagePredictorServeGPUUserFacingKey , V : clusterConfig .ImagePredictorServeGPU })
193193 }
194- if clusterConfig .ImageTFServe != prevConfig .ImageTFServe {
194+ if clusterConfig .ImageTFServe != defaultConfig .ImageTFServe {
195195 items = append (items , table.KV {K : clusterconfig .ImageTFServeUserFacingKey , V : clusterConfig .ImageTFServe })
196196 }
197- if clusterConfig .ImageTFServeGPU != prevConfig .ImageTFServeGPU {
197+ if clusterConfig .ImageTFServeGPU != defaultConfig .ImageTFServeGPU {
198198 items = append (items , table.KV {K : clusterconfig .ImageTFServeGPUUserFacingKey , V : clusterConfig .ImageTFServeGPU })
199199 }
200- if clusterConfig .ImageTFAPI != prevConfig .ImageTFAPI {
200+ if clusterConfig .ImageTFAPI != defaultConfig .ImageTFAPI {
201201 items = append (items , table.KV {K : clusterconfig .ImageTFAPIUserFacingKey , V : clusterConfig .ImageTFAPI })
202202 }
203- if clusterConfig .ImageONNXServe != prevConfig .ImageONNXServe {
203+ if clusterConfig .ImageONNXServe != defaultConfig .ImageONNXServe {
204204 items = append (items , table.KV {K : clusterconfig .ImageONNXServeUserFacingKey , V : clusterConfig .ImageONNXServe })
205205 }
206- if clusterConfig .ImageONNXServeGPU != prevConfig .ImageONNXServeGPU {
206+ if clusterConfig .ImageONNXServeGPU != defaultConfig .ImageONNXServeGPU {
207207 items = append (items , table.KV {K : clusterconfig .ImageONNXServeGPUUserFacingKey , V : clusterConfig .ImageONNXServeGPU })
208208 }
209- if clusterConfig .ImageOperator != prevConfig .ImageOperator {
209+ if clusterConfig .ImageOperator != defaultConfig .ImageOperator {
210210 items = append (items , table.KV {K : clusterconfig .ImageOperatorUserFacingKey , V : clusterConfig .ImageOperator })
211211 }
212- if clusterConfig .ImageManager != prevConfig .ImageManager {
212+ if clusterConfig .ImageManager != defaultConfig .ImageManager {
213213 items = append (items , table.KV {K : clusterconfig .ImageManagerUserFacingKey , V : clusterConfig .ImageManager })
214214 }
215- if clusterConfig .ImageDownloader != prevConfig .ImageDownloader {
215+ if clusterConfig .ImageDownloader != defaultConfig .ImageDownloader {
216216 items = append (items , table.KV {K : clusterconfig .ImageDownloaderUserFacingKey , V : clusterConfig .ImageDownloader })
217217 }
218- if clusterConfig .ImageClusterAutoscaler != prevConfig .ImageClusterAutoscaler {
218+ if clusterConfig .ImageClusterAutoscaler != defaultConfig .ImageClusterAutoscaler {
219219 items = append (items , table.KV {K : clusterconfig .ImageClusterAutoscalerUserFacingKey , V : clusterConfig .ImageClusterAutoscaler })
220220 }
221- if clusterConfig .ImageMetricsServer != prevConfig .ImageMetricsServer {
221+ if clusterConfig .ImageMetricsServer != defaultConfig .ImageMetricsServer {
222222 items = append (items , table.KV {K : clusterconfig .ImageMetricsServerUserFacingKey , V : clusterConfig .ImageMetricsServer })
223223 }
224- if clusterConfig .ImageNvidia != prevConfig .ImageNvidia {
224+ if clusterConfig .ImageNvidia != defaultConfig .ImageNvidia {
225225 items = append (items , table.KV {K : clusterconfig .ImageNvidiaUserFacingKey , V : clusterConfig .ImageNvidia })
226226 }
227- if clusterConfig .ImageFluentd != prevConfig .ImageFluentd {
227+ if clusterConfig .ImageFluentd != defaultConfig .ImageFluentd {
228228 items = append (items , table.KV {K : clusterconfig .ImageFluentdUserFacingKey , V : clusterConfig .ImageFluentd })
229229 }
230- if clusterConfig .ImageStatsd != prevConfig .ImageStatsd {
230+ if clusterConfig .ImageStatsd != defaultConfig .ImageStatsd {
231231 items = append (items , table.KV {K : clusterconfig .ImageStatsdUserFacingKey , V : clusterConfig .ImageStatsd })
232232 }
233- if clusterConfig .ImageIstioProxy != prevConfig .ImageIstioProxy {
233+ if clusterConfig .ImageIstioProxy != defaultConfig .ImageIstioProxy {
234234 items = append (items , table.KV {K : clusterconfig .ImageIstioProxyUserFacingKey , V : clusterConfig .ImageIstioProxy })
235235 }
236- if clusterConfig .ImageIstioPilot != prevConfig .ImageIstioPilot {
236+ if clusterConfig .ImageIstioPilot != defaultConfig .ImageIstioPilot {
237237 items = append (items , table.KV {K : clusterconfig .ImageIstioPilotUserFacingKey , V : clusterConfig .ImageIstioPilot })
238238 }
239- if clusterConfig .ImageIstioCitadel != prevConfig .ImageIstioCitadel {
239+ if clusterConfig .ImageIstioCitadel != defaultConfig .ImageIstioCitadel {
240240 items = append (items , table.KV {K : clusterconfig .ImageIstioCitadelUserFacingKey , V : clusterConfig .ImageIstioCitadel })
241241 }
242- if clusterConfig .ImageIstioGalley != prevConfig .ImageIstioGalley {
242+ if clusterConfig .ImageIstioGalley != defaultConfig .ImageIstioGalley {
243243 items = append (items , table.KV {K : clusterconfig .ImageIstioGalleyUserFacingKey , V : clusterConfig .ImageIstioGalley })
244244 }
245245
0 commit comments