Merge pull request #43 from roboll/fix-err-on-charts-yaml-fallback
Fix error on charts.yml fallback
This commit is contained in:
		
						commit
						c990d19cb0
					
				
							
								
								
									
										3
									
								
								main.go
								
								
								
								
							
							
						
						
									
										3
									
								
								main.go
								
								
								
								
							|  | @ -248,9 +248,6 @@ func before(c *cli.Context) (*state.HelmState, helmexec.Interface, error) { | ||||||
| 		} | 		} | ||||||
| 		log.Printf("warn: charts.yaml is loaded: charts.yaml is deprecated in favor of helmfile.yaml. See https://github.com/roboll/helmfile/issues/25 for more information") | 		log.Printf("warn: charts.yaml is loaded: charts.yaml is deprecated in favor of helmfile.yaml. See https://github.com/roboll/helmfile/issues/25 for more information") | ||||||
| 	} | 	} | ||||||
| 	if err != nil { |  | ||||||
| 		return nil, nil, err |  | ||||||
| 	} |  | ||||||
| 	if st.Context != "" { | 	if st.Context != "" { | ||||||
| 		if kubeContext != "" { | 		if kubeContext != "" { | ||||||
| 			log.Printf("err: Cannot use option --kube-context and set attribute context.") | 			log.Printf("err: Cannot use option --kube-context and set attribute context.") | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue