Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start controller-runtime manager in single binary #3547

Merged
merged 4 commits into from
Apr 7, 2023
Merged

Start controller-runtime manager in single binary #3547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3605dca
starting controller-runtime manager if either webhook or propeller is…
hamersaw Mar 28, 2023
32416d6
using correct import
hamersaw Mar 28, 2023
d1dab35
Merge branch 'master' into bug/start-controller-runtime-manager
hamersaw Apr 7, 2023
b720099
bumping flytepropeller
hamersaw Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cmd/single/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down