convert GitOpsConfig to flux config when reading spec from cluster (#…

…1994)
aws · May 3, 2022 · 23f438c · 23f438c
1 parent 4aba0fe
commit 23f438c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/pkg/cluster/fetch.go b/pkg/cluster/fetch.go
@@ -43,6 +43,7 @@ func BuildSpecForCluster(ctx context.Context, cluster *v1alpha1.Cluster, bundles
 			if err != nil {
 				return nil, err
 			}
+			fluxConfig = gitOpsConfig.ConvertToFluxConfig()
 		}
 	}
 

diff --git a/pkg/cluster/spec.go b/pkg/cluster/spec.go
@@ -137,7 +137,6 @@ func WithFluxConfig(fluxConfig *eksav1alpha1.FluxConfig) SpecOpt {
 func WithGitOpsConfig(gitOpsConfig *eksav1alpha1.GitOpsConfig) SpecOpt {
 	return func(s *Spec) {
 		s.GitOpsConfig = gitOpsConfig
-		s.FluxConfig = gitOpsConfig.ConvertToFluxConfig()
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			if err != nil {
     				return nil, err
     			}
+    			fluxConfig = gitOpsConfig.ConvertToFluxConfig()
     		}
     	}
@@ Expand Down @@