Skip to content

Commit

Permalink
Migrate references from Lyft -> Flyteorg, golang 1.16, new kubeapi/cl…
Browse files Browse the repository at this point in the history
…ient-go, cleanup dependencies #minor (flyteorg#229)

* Added krew installation docs (flyteorg#223)

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* Import statements modified

Signed-off-by: Ketan Umare <[email protected]>
Signed-off-by: Haytham Abuelfutuh <[email protected]>

* kind of compiling - but compile errors

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* generating code

Signed-off-by: Ketan Umare <[email protected]>
Signed-off-by: Haytham Abuelfutuh <[email protected]>

* updating generated code

Signed-off-by: Ketan Umare <[email protected]>
Signed-off-by: Haytham Abuelfutuh <[email protected]>

* Pluginentry needs to be fixed

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* Replace NewClient with ClientBuilder in manager initialization

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* most errors resolved

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* sync deps

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* fixed cmd etc

Signed-off-by: Ketan Umare <[email protected]>
Signed-off-by: Haytham Abuelfutuh <[email protected]>

* unit tests fixed

Signed-off-by: Ketan Umare <[email protected]>
Signed-off-by: Haytham Abuelfutuh <[email protected]>

* Fix remaining unit tests

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* lint

Signed-off-by: Haytham Abuelfutuh <[email protected]>

* Linter fix

Signed-off-by: Ketan Umare <[email protected]>

* removed gnostic

Signed-off-by: Ketan Umare <[email protected]>

* downgrade controller-runtime version

Signed-off-by: Ketan Umare <[email protected]>

* update to go 1.16

* update to go 1.16

Signed-off-by: Ketan Umare <[email protected]>

* Go mod version updated

Signed-off-by: Ketan Umare <[email protected]>

* Update plugins version

Signed-off-by: Katrina Rogan <[email protected]>

* Updated version of flyteplugins

Signed-off-by: Ketan Umare <[email protected]>

* Fix ineff assignment

Signed-off-by: Ketan Umare <[email protected]>

* Update support tools versions

Co-authored-by: Yuvraj <[email protected]>
Co-authored-by: Haytham Abuelfutuh <[email protected]>
Co-authored-by: Katrina Rogan <[email protected]>
  • Loading branch information
4 people authored Mar 10, 2021
1 parent 613065e commit 3618fbd
Show file tree
Hide file tree
Showing 298 changed files with 2,616 additions and 1,525 deletions.
12 changes: 6 additions & 6 deletions flytepropeller/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
#
# TO OPT OUT OF UPDATES, SEE https://github.com/lyft/boilerplate/blob/master/Readme.rst

FROM golang:1.13.3-alpine3.10 as builder
FROM golang:1.16.0-alpine3.13 as builder
RUN apk add git openssh-client make curl

# COPY only the go mod files for efficient caching
COPY go.mod go.sum /go/src/github.com/lyft/flytepropeller/
WORKDIR /go/src/github.com/lyft/flytepropeller
COPY go.mod go.sum /go/src/github.com/flyteorg/flytepropeller/
WORKDIR /go/src/github.com/flyteorg/flytepropeller

# Pull dependencies
RUN go mod download

# COPY the rest of the source code
COPY . /go/src/github.com/lyft/flytepropeller/
COPY . /go/src/github.com/flyteorg/flytepropeller/

# This 'linux_compile' target should compile binaries to the /artifacts directory
# The main entrypoint should be compiled to /artifacts/flytepropeller
Expand All @@ -24,8 +24,8 @@ RUN make linux_compile
ENV PATH="/artifacts:${PATH}"

# This will eventually move to centurylink/ca-certs:latest for minimum possible image size
FROM alpine:3.10
LABEL org.opencontainers.image.source https://github.com/lyft/flytepropeller
FROM alpine:3.13
LABEL org.opencontainers.image.source https://github.com/flyteorg/flytepropeller

COPY --from=builder /artifacts /bin

Expand Down
2 changes: 1 addition & 1 deletion flytepropeller/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cross_compile:
GOOS=linux GOARCH=amd64 go build -o bin/cross/kubectl-flyte ./cmd/kubectl-flyte/main.go

op_code_generate:
@RESOURCE_NAME=flyteworkflow OPERATOR_PKG=github.com/lyft/flytepropeller ./hack/update-codegen.sh
@RESOURCE_NAME=flyteworkflow OPERATOR_PKG=github.com/flyteorg/flytepropeller ./hack/update-codegen.sh

benchmark:
mkdir -p ./bin/benchmark
Expand Down
26 changes: 23 additions & 3 deletions flytepropeller/boilerplate/lyft/golang_support_tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,32 @@
module github.com/lyft/boilerplate
module github.com/flyteorg/boilerplate

go 1.13

require (
github.com/alvaroloes/enumer v1.1.2
github.com/golangci/golangci-lint v1.22.2
github.com/lyft/flytestdlib v0.2.31
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect
github.com/bombsimon/wsl/v2 v2.0.0 // indirect
github.com/coreos/go-etcd v2.0.0+incompatible // indirect
github.com/cpuguy83/go-md2man v1.0.10 // indirect
github.com/flyteorg/flytestdlib v0.3.13
github.com/go-lintpack/lintpack v0.5.2 // indirect
github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6 // indirect
github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3 // indirect
github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee // indirect
github.com/golangci/golangci-lint v1.38.0
github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc // indirect
github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21 // indirect
github.com/klauspost/cpuid v1.2.0 // indirect
github.com/pascaldekloe/name v1.0.1 // indirect
github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d // indirect
github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada // indirect
github.com/tommy-muehle/go-mnd v1.1.1 // indirect
github.com/ugorji/go v1.1.4 // indirect
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect
github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect
golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4 // indirect
)

replace github.com/vektra/mockery => github.com/enghabu/mockery v0.0.0-20191009061720-9d0c8670c2f0
1,161 changes: 1,068 additions & 93 deletions flytepropeller/boilerplate/lyft/golang_support_tools/go.sum

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ package tools
import (
_ "github.com/alvaroloes/enumer"
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
_ "github.com/lyft/flytestdlib/cli/pflags"
_ "github.com/flyteorg/flytestdlib/cli/pflags"
_ "github.com/vektra/mockery/cmd/mockery"
)
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set -e
# In the format of "<cli>:<package>" or ":<package>" if no cli
tools=(
"github.com/vektra/mockery/cmd/mockery"
"github.com/lyft/flytestdlib/cli/pflags"
"github.com/flyteorg/flytestdlib/cli/pflags"
"github.com/golangci/golangci-lint/cmd/golangci-lint"
"github.com/alvaroloes/enumer"
)
Expand Down
52 changes: 17 additions & 35 deletions flytepropeller/cmd/controller/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,24 @@ import (
"runtime/pprof"
"strings"

"github.com/lyft/flytestdlib/contextutils"
"github.com/flyteorg/flytestdlib/contextutils"

"github.com/flyteorg/flytepropeller/pkg/controller/executors"
"k8s.io/klog"
"sigs.k8s.io/controller-runtime/pkg/cache"

"github.com/lyft/flytepropeller/pkg/controller/executors"

"sigs.k8s.io/controller-runtime/pkg/client"

"sigs.k8s.io/controller-runtime/pkg/manager"

config2 "github.com/lyft/flytepropeller/pkg/controller/config"
config2 "github.com/flyteorg/flytepropeller/pkg/controller/config"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/lyft/flytestdlib/config/viper"
"github.com/lyft/flytestdlib/version"
"github.com/flyteorg/flytestdlib/config/viper"
"github.com/flyteorg/flytestdlib/version"

"github.com/lyft/flytestdlib/config"
"github.com/lyft/flytestdlib/logger"
"github.com/lyft/flytestdlib/profutils"
"github.com/lyft/flytestdlib/promutils"
"github.com/flyteorg/flytestdlib/config"
"github.com/flyteorg/flytestdlib/logger"
"github.com/flyteorg/flytestdlib/profutils"
"github.com/flyteorg/flytestdlib/promutils"
"github.com/pkg/errors"
"github.com/spf13/pflag"

Expand All @@ -40,10 +36,10 @@ import (

restclient "k8s.io/client-go/rest"

clientset "github.com/lyft/flytepropeller/pkg/client/clientset/versioned"
informers "github.com/lyft/flytepropeller/pkg/client/informers/externalversions"
"github.com/lyft/flytepropeller/pkg/controller"
"github.com/lyft/flytepropeller/pkg/signals"
clientset "github.com/flyteorg/flytepropeller/pkg/client/clientset/versioned"
informers "github.com/flyteorg/flytepropeller/pkg/client/informers/externalversions"
"github.com/flyteorg/flytepropeller/pkg/controller"
"github.com/flyteorg/flytepropeller/pkg/signals"
)

const (
Expand Down Expand Up @@ -196,23 +192,9 @@ func executeRootCmd(cfg *config2.Config) {
}

mgr, err := manager.New(kubecfg, manager.Options{
Namespace: limitNamespace,
SyncPeriod: &cfg.DownstreamEval.Duration,
NewClient: func(cache cache.Cache, config *restclient.Config, options client.Options) (i client.Client, e error) {
rawClient, err := client.New(kubecfg, client.Options{})
if err != nil {
return nil, err
}

return executors.NewFallbackClient(&client.DelegatingClient{
Reader: &client.DelegatingReader{
CacheReader: cache,
ClientReader: rawClient,
},
Writer: rawClient,
StatusClient: rawClient,
}, rawClient), nil
},
Namespace: limitNamespace,
SyncPeriod: &cfg.DownstreamEval.Duration,
ClientBuilder: executors.NewFallbackClientBuilder(),
})
if err != nil {
logger.Fatalf(ctx, "Failed to initialize controller run-time manager. Error: %v", err)
Expand All @@ -226,7 +208,7 @@ func executeRootCmd(cfg *config2.Config) {
ctx = contextutils.WithGoroutineLabel(ctx, "controller-runtime-manager")
pprof.SetGoroutineLabels(ctx)
logger.Infof(ctx, "Starting controller-runtime manager")
err := mgr.Start(ctx.Done())
err := mgr.Start(ctx)
if err != nil {
logger.Fatalf(ctx, "Failed to start manager. Error: %v", err)
}
Expand Down
22 changes: 11 additions & 11 deletions flytepropeller/cmd/controller/main.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package main

import (
_ "github.com/lyft/flyteplugins/go/tasks/plugins/array/awsbatch"
_ "github.com/lyft/flyteplugins/go/tasks/plugins/array/k8s"
_ "github.com/lyft/flyteplugins/go/tasks/plugins/hive"
_ "github.com/lyft/flyteplugins/go/tasks/plugins/k8s/container"
_ "github.com/lyft/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch"
_ "github.com/lyft/flyteplugins/go/tasks/plugins/k8s/sagemaker"
_ "github.com/lyft/flyteplugins/go/tasks/plugins/k8s/sidecar"
_ "github.com/lyft/flyteplugins/go/tasks/plugins/k8s/spark"
"github.com/lyft/flytestdlib/contextutils"
"github.com/lyft/flytestdlib/promutils/labeled"
_ "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/awsbatch"
_ "github.com/flyteorg/flyteplugins/go/tasks/plugins/array/k8s"
_ "github.com/flyteorg/flyteplugins/go/tasks/plugins/hive"
_ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/container"
_ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/kfoperators/pytorch"
_ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sagemaker"
_ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/sidecar"
_ "github.com/flyteorg/flyteplugins/go/tasks/plugins/k8s/spark"
"github.com/flyteorg/flytestdlib/contextutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"

"github.com/lyft/flytepropeller/cmd/controller/cmd"
"github.com/flyteorg/flytepropeller/cmd/controller/cmd"
)

func init() {
Expand Down
8 changes: 4 additions & 4 deletions flytepropeller/cmd/kubectl-flyte/cmd/compile.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"io/ioutil"
"os"

"github.com/lyft/flyteidl/gen/pb-go/flyteidl/core"
"github.com/lyft/flytepropeller/pkg/compiler"
"github.com/lyft/flytepropeller/pkg/compiler/common"
compilerErrors "github.com/lyft/flytepropeller/pkg/compiler/errors"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flytepropeller/pkg/compiler"
"github.com/flyteorg/flytepropeller/pkg/compiler/common"
compilerErrors "github.com/flyteorg/flytepropeller/pkg/compiler/errors"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
Expand Down
15 changes: 9 additions & 6 deletions flytepropeller/cmd/kubectl-flyte/cmd/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,22 @@ package cmd

import (
"bytes"
"context"
"encoding/json"
"fmt"
"io/ioutil"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/ghodss/yaml"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"

"github.com/lyft/flyteidl/gen/pb-go/flyteidl/core"
"github.com/lyft/flytepropeller/pkg/compiler"
"github.com/lyft/flytepropeller/pkg/compiler/common"
compilerErrors "github.com/lyft/flytepropeller/pkg/compiler/errors"
"github.com/lyft/flytepropeller/pkg/compiler/transformers/k8s"
"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flytepropeller/pkg/compiler"
"github.com/flyteorg/flytepropeller/pkg/compiler/common"
compilerErrors "github.com/flyteorg/flytepropeller/pkg/compiler/errors"
"github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s"

"github.com/pkg/errors"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -217,7 +220,7 @@ func (c *CreateOpts) createWorkflowFromProto() error {
}
fmt.Println(string(y))
} else {
wf, err := c.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(c.ConfigOverrides.Context.Namespace).Create(flyteWf)
wf, err := c.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(c.ConfigOverrides.Context.Namespace).Create(context.TODO(), flyteWf, v1.CreateOptions{})
if err != nil {
return err
}
Expand Down
10 changes: 5 additions & 5 deletions flytepropeller/cmd/kubectl-flyte/cmd/create_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (

"github.com/ghodss/yaml"

"github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core"
"github.com/flyteorg/flytepropeller/pkg/compiler"
"github.com/flyteorg/flytepropeller/pkg/compiler/common"
"github.com/flyteorg/flytepropeller/pkg/compiler/transformers/k8s"
"github.com/flyteorg/flytepropeller/pkg/utils"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/lyft/flyteidl/gen/pb-go/flyteidl/core"
"github.com/lyft/flytepropeller/pkg/compiler"
"github.com/lyft/flytepropeller/pkg/compiler/common"
"github.com/lyft/flytepropeller/pkg/compiler/transformers/k8s"
"github.com/lyft/flytepropeller/pkg/utils"
"github.com/stretchr/testify/assert"
)

Expand Down
12 changes: 7 additions & 5 deletions flytepropeller/cmd/kubectl-flyte/cmd/delete.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package cmd

import (
"context"
"fmt"

"github.com/lyft/flytepropeller/pkg/controller"
"github.com/flyteorg/flytepropeller/pkg/controller"
"github.com/spf13/cobra"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down Expand Up @@ -60,7 +61,8 @@ func (d *DeleteOpts) deleteCompletedWorkflows() error {

p := v1.DeletePropagationBackground
return d.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(d.ConfigOverrides.Context.Namespace).DeleteCollection(
&v1.DeleteOptions{PropagationPolicy: &p}, v1.ListOptions{
context.TODO(),
v1.DeleteOptions{PropagationPolicy: &p}, v1.ListOptions{
TimeoutSeconds: &t,
LabelSelector: v1.FormatLabelSelector(controller.CompletedWorkflowsLabelSelector()),
},
Expand All @@ -70,16 +72,16 @@ func (d *DeleteOpts) deleteCompletedWorkflows() error {

func (d *DeleteOpts) deleteWorkflow(name string) error {
p := v1.DeletePropagationBackground
if err := d.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(d.ConfigOverrides.Context.Namespace).Delete(name, &v1.DeleteOptions{PropagationPolicy: &p}); err != nil {
if err := d.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(d.ConfigOverrides.Context.Namespace).Delete(context.TODO(), name, v1.DeleteOptions{PropagationPolicy: &p}); err != nil {
return err
}
if d.force {
w, err := d.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(d.ConfigOverrides.Context.Namespace).Get(name, v1.GetOptions{})
w, err := d.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(d.ConfigOverrides.Context.Namespace).Get(context.TODO(), name, v1.GetOptions{})
if err != nil {
return err
}
w.SetFinalizers([]string{})
if _, err := d.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(d.ConfigOverrides.Context.Namespace).Update(w); err != nil {
if _, err := d.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(d.ConfigOverrides.Context.Namespace).Update(context.TODO(), w, v1.UpdateOptions{}); err != nil {
return err
}
}
Expand Down
12 changes: 6 additions & 6 deletions flytepropeller/cmd/kubectl-flyte/cmd/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"strings"

gotree "github.com/DiSiqueira/GoTree"
"github.com/lyft/flytestdlib/storage"
"github.com/flyteorg/flytestdlib/storage"
"github.com/spf13/cobra"
v12 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/lyft/flytepropeller/cmd/kubectl-flyte/cmd/printers"
"github.com/lyft/flytepropeller/pkg/apis/flyteworkflow/v1alpha1"
"github.com/flyteorg/flytepropeller/cmd/kubectl-flyte/cmd/printers"
"github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1"
)

type GetOpts struct {
Expand Down Expand Up @@ -59,7 +59,7 @@ func (g *GetOpts) getWorkflow(ctx context.Context, name string) error {
g.ConfigOverrides.Context.Namespace = parts[0]
name = parts[1]
}
w, err := g.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(g.ConfigOverrides.Context.Namespace).Get(name, v1.GetOptions{})
w, err := g.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(g.ConfigOverrides.Context.Namespace).Get(context.TODO(), name, v1.GetOptions{})
if err != nil {
return err
}
Expand Down Expand Up @@ -87,7 +87,7 @@ func (g *GetOpts) iterateOverWorkflows(f func(*v1alpha1.FlyteWorkflow) error, ba
}
var counter int64
for {
wList, err := g.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(g.ConfigOverrides.Context.Namespace).List(*opts)
wList, err := g.flyteClient.FlyteworkflowV1alpha1().FlyteWorkflows(g.ConfigOverrides.Context.Namespace).List(context.TODO(), *opts)
if err != nil {
return err
}
Expand Down Expand Up @@ -123,7 +123,7 @@ func (g *GetOpts) iterateOverQuotas(f func(quota *v12.ResourceQuota) error, batc

var counter int64
for {
rq, err := g.kubeClient.CoreV1().ResourceQuotas(g.ConfigOverrides.Context.Namespace).List(opts)
rq, err := g.kubeClient.CoreV1().ResourceQuotas(g.ConfigOverrides.Context.Namespace).List(context.TODO(), opts)
if err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions flytepropeller/cmd/kubectl-flyte/cmd/printers/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
gotree "github.com/DiSiqueira/GoTree"
"github.com/fatih/color"

"github.com/lyft/flytepropeller/pkg/apis/flyteworkflow/v1alpha1"
"github.com/lyft/flytepropeller/pkg/controller/nodes/task"
"github.com/lyft/flytepropeller/pkg/utils"
"github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1"
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/task"
"github.com/flyteorg/flytepropeller/pkg/utils"
)

var boldString = color.New(color.Bold)
Expand Down
4 changes: 2 additions & 2 deletions flytepropeller/cmd/kubectl-flyte/cmd/printers/workflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
gotree "github.com/DiSiqueira/GoTree"
"github.com/fatih/color"

"github.com/lyft/flytepropeller/pkg/apis/flyteworkflow/v1alpha1"
"github.com/lyft/flytepropeller/pkg/visualize"
"github.com/flyteorg/flytepropeller/pkg/apis/flyteworkflow/v1alpha1"
"github.com/flyteorg/flytepropeller/pkg/visualize"
)

func ColorizeWorkflowPhase(p v1alpha1.WorkflowPhase) string {
Expand Down
Loading

0 comments on commit 3618fbd

Please sign in to comment.