Merge pull request #1497 from cappyzawa/feat/object-level-config-validation
Add object-level configuration validation
This commit is contained in:
		
						commit
						44cddcb72d
					
				
							
								
								
									
										2
									
								
								go.mod
								
								
								
								
							
							
						
						
									
										2
									
								
								go.mod
								
								
								
								
							| 
						 | 
					@ -24,7 +24,7 @@ require (
 | 
				
			||||||
	github.com/fluxcd/pkg/apis/event v0.18.0
 | 
						github.com/fluxcd/pkg/apis/event v0.18.0
 | 
				
			||||||
	github.com/fluxcd/pkg/apis/kustomize v1.11.0
 | 
						github.com/fluxcd/pkg/apis/kustomize v1.11.0
 | 
				
			||||||
	github.com/fluxcd/pkg/apis/meta v1.18.0
 | 
						github.com/fluxcd/pkg/apis/meta v1.18.0
 | 
				
			||||||
	github.com/fluxcd/pkg/auth v0.26.0
 | 
						github.com/fluxcd/pkg/auth v0.27.0
 | 
				
			||||||
	github.com/fluxcd/pkg/cache v0.10.0
 | 
						github.com/fluxcd/pkg/cache v0.10.0
 | 
				
			||||||
	github.com/fluxcd/pkg/http/fetch v0.17.0
 | 
						github.com/fluxcd/pkg/http/fetch v0.17.0
 | 
				
			||||||
	github.com/fluxcd/pkg/kustomize v1.19.0
 | 
						github.com/fluxcd/pkg/kustomize v1.19.0
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										4
									
								
								go.sum
								
								
								
								
							
							
						
						
									
										4
									
								
								go.sum
								
								
								
								
							| 
						 | 
					@ -199,8 +199,8 @@ github.com/fluxcd/pkg/apis/kustomize v1.11.0 h1:0IzDgxZkc4v+5SDNCvgZhfwfkdkQLPXC
 | 
				
			||||||
github.com/fluxcd/pkg/apis/kustomize v1.11.0/go.mod h1:j302mJGDww8cn9qvMsRQ0LJ1HPAPs/IlX7CSsoJV7BI=
 | 
					github.com/fluxcd/pkg/apis/kustomize v1.11.0/go.mod h1:j302mJGDww8cn9qvMsRQ0LJ1HPAPs/IlX7CSsoJV7BI=
 | 
				
			||||||
github.com/fluxcd/pkg/apis/meta v1.18.0 h1:ACHrMIjlcioE9GKS7NGk62KX4NshqNewr8sBwMcXABs=
 | 
					github.com/fluxcd/pkg/apis/meta v1.18.0 h1:ACHrMIjlcioE9GKS7NGk62KX4NshqNewr8sBwMcXABs=
 | 
				
			||||||
github.com/fluxcd/pkg/apis/meta v1.18.0/go.mod h1:97l3hTwBpJbXBY+wetNbqrUsvES8B1jGioKcBUxmqd8=
 | 
					github.com/fluxcd/pkg/apis/meta v1.18.0/go.mod h1:97l3hTwBpJbXBY+wetNbqrUsvES8B1jGioKcBUxmqd8=
 | 
				
			||||||
github.com/fluxcd/pkg/auth v0.26.0 h1:jw128zPI4aRSvkGbFfAQcFNF3oK58P4rDdKIpj2/7yM=
 | 
					github.com/fluxcd/pkg/auth v0.27.0 h1:DFsizUxt9ZDAc+z7+o7jcbtfaxRH55MRD/wdU4CXNCQ=
 | 
				
			||||||
github.com/fluxcd/pkg/auth v0.26.0/go.mod h1:YEAHpBFuW5oLlH9ekuJaQdnJ2Q3A7Ny8kha3WY7QMnY=
 | 
					github.com/fluxcd/pkg/auth v0.27.0/go.mod h1:YEAHpBFuW5oLlH9ekuJaQdnJ2Q3A7Ny8kha3WY7QMnY=
 | 
				
			||||||
github.com/fluxcd/pkg/cache v0.10.0 h1:M+OGDM4da1cnz7q+sZSBtkBJHpiJsLnKVmR9OdMWxEY=
 | 
					github.com/fluxcd/pkg/cache v0.10.0 h1:M+OGDM4da1cnz7q+sZSBtkBJHpiJsLnKVmR9OdMWxEY=
 | 
				
			||||||
github.com/fluxcd/pkg/cache v0.10.0/go.mod h1:pPXRzQUDQagsCniuOolqVhnAkbNgYOg8d2cTliPs7ME=
 | 
					github.com/fluxcd/pkg/cache v0.10.0/go.mod h1:pPXRzQUDQagsCniuOolqVhnAkbNgYOg8d2cTliPs7ME=
 | 
				
			||||||
github.com/fluxcd/pkg/envsubst v1.4.0 h1:pYsb6wrmXOSfHXuXQHaaBBMt3LumhgCb8SMdBNAwV/U=
 | 
					github.com/fluxcd/pkg/envsubst v1.4.0 h1:pYsb6wrmXOSfHXuXQHaaBBMt3LumhgCb8SMdBNAwV/U=
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										5
									
								
								main.go
								
								
								
								
							
							
						
						
									
										5
									
								
								main.go
								
								
								
								
							| 
						 | 
					@ -159,6 +159,11 @@ func main() {
 | 
				
			||||||
		auth.SetDefaultKubeConfigServiceAccount(defaultKubeConfigServiceAccount)
 | 
							auth.SetDefaultKubeConfigServiceAccount(defaultKubeConfigServiceAccount)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if auth.InconsistentObjectLevelConfiguration() {
 | 
				
			||||||
 | 
							setupLog.Error(auth.ErrInconsistentObjectLevelConfiguration, "invalid configuration")
 | 
				
			||||||
 | 
							os.Exit(1)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if err := intervalJitterOptions.SetGlobalJitter(nil); err != nil {
 | 
						if err := intervalJitterOptions.SetGlobalJitter(nil); err != nil {
 | 
				
			||||||
		setupLog.Error(err, "unable to set global jitter")
 | 
							setupLog.Error(err, "unable to set global jitter")
 | 
				
			||||||
		os.Exit(1)
 | 
							os.Exit(1)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue