Start controller-runtime manager in single binary (#3547)

* starting controller-runtime manager if either webhook or propeller is enabled Signed-off-by: Daniel Rammer <[email protected]> * using correct import Signed-off-by: Daniel Rammer <[email protected]> * bumping flytepropeller Signed-off-by: Daniel Rammer <[email protected]> --------- Signed-off-by: Daniel Rammer <[email protected]>
flyteorg · Apr 7, 2023 · db9162c · db9162c
1 parent bc521da
commit db9162c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/cmd/single/start.go b/cmd/single/start.go
@@ -140,6 +140,16 @@ func startPropeller(ctx context.Context, cfg Propeller) error {
 		})
 	}
 
+	if !cfg.DisableWebhook || !cfg.Disabled {
+		g.Go(func() error {
+			err := propellerEntrypoint.StartControllerManager(childCtx, mgr)
+			if err != nil {
+				logger.Fatalf(childCtx, "Failed to start controller manager. Error: %v", err)
+			}
+			return err
+		})
+	}
+
 	return g.Wait()
 }
 

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/flyteorg/datacatalog v1.0.44
 	github.com/flyteorg/flyteadmin v1.1.88
-	github.com/flyteorg/flytepropeller v1.1.76
+	github.com/flyteorg/flytepropeller v1.1.77
 	github.com/flyteorg/flytestdlib v1.0.16
 	github.com/golang/glog v1.0.0
 	github.com/spf13/cobra v1.4.0

diff --git a/go.sum b/go.sum
@@ -369,8 +369,8 @@ github.com/flyteorg/flyteidl v1.3.14 h1:o5M0g/r6pXTPu5PEurbYxbQmuOu3hqqsaI2M6uvK
 github.com/flyteorg/flyteidl v1.3.14/go.mod h1:Pkt2skI1LiHs/2ZoekBnyPhuGOFMiuul6HHcKGZBsbM=
 github.com/flyteorg/flyteplugins v1.0.45 h1:I/N4ehOxX6ln8DivyZ9gayp/UYiBcqoizBbG1hfwIXM=
 github.com/flyteorg/flyteplugins v1.0.45/go.mod h1:ztsonku5fKwyxcIg1k69PTiBVjRI6d3nK5DnC+iwx08=
-github.com/flyteorg/flytepropeller v1.1.76 h1:EANN/ZH7QE2CIGGargrRZXr1uC09mbjzb4z6N51M1KM=
-github.com/flyteorg/flytepropeller v1.1.76/go.mod h1:jAMN8++sdzEwVQ72ulEBlw+lW7rICDhGgTZcV1xdu2Y=
+github.com/flyteorg/flytepropeller v1.1.77 h1:n7wi79pAar9zRDhFfL4of0xXHgk6ih1O99gmxK7jp5Q=
+github.com/flyteorg/flytepropeller v1.1.77/go.mod h1:jAMN8++sdzEwVQ72ulEBlw+lW7rICDhGgTZcV1xdu2Y=
 github.com/flyteorg/flytestdlib v1.0.16 h1:Nv468DHVZMdhzA1WD3a/ef5M59xXIbxdUN4bLX86KWU=
 github.com/flyteorg/flytestdlib v1.0.16/go.mod h1:ghw/cjY0sEWIIbyCtcJnL/Gt7ZS7gf9SUi0CCPhbz3s=
 github.com/flyteorg/stow v0.3.6 h1:jt50ciM14qhKBaIrB+ppXXY+SXB59FNREFgTJqCyqIk=