Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

Commit

Permalink
Extracted catalog client from propeller to stdlib
Browse files Browse the repository at this point in the history
Adapted NewClient renaming for catalog client
Updated to latest unpublished version of flyteidl, flyteplugins and flytestdlib

Signed-off-by: Nick Müller <[email protected]>
  • Loading branch information
Nick Müller committed Dec 15, 2022
1 parent cb85125 commit 9946b32
Show file tree
Hide file tree
Showing 15 changed files with 201 additions and 3,096 deletions.
2 changes: 2 additions & 0 deletions events/admin_eventsink_integration_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
//go:build integration
// +build integration

// Add this tag to your project settings if you want to pick it up.

package events
Expand Down
12 changes: 9 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,23 @@ module github.com/flyteorg/flytepropeller

go 1.18

replace (
github.com/flyteorg/flyteidl => github.com/blackshark-ai/flyteidl v0.24.22-0.20221215141908-3e44057796c6
github.com/flyteorg/flyteplugins => github.com/blackshark-ai/flyteplugins v1.0.2-0.20221215151032-3ce2c1315081
github.com/flyteorg/flytestdlib => github.com/blackshark-ai/flytestdlib v1.0.1-0.20221215152838-ded77ffa67cf
)

require (
github.com/DiSiqueira/GoTree v1.0.1-0.20180907134536-53a8e837f295
github.com/benlaurie/objecthash v0.0.0-20180202135721-d1e3d6079fc1
github.com/fatih/color v1.13.0
github.com/flyteorg/flyteidl v1.2.3
github.com/flyteorg/flyteplugins v1.0.20
github.com/flyteorg/flytestdlib v1.0.11
github.com/flyteorg/flytestdlib v1.0.12
github.com/ghodss/yaml v1.0.0
github.com/go-redis/redis v6.15.7+incompatible
github.com/go-test/deep v1.0.7
github.com/golang/protobuf v1.5.2
github.com/google/uuid v1.3.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/imdario/mergo v0.3.13
github.com/magiconair/properties v1.8.6
Expand Down Expand Up @@ -87,8 +91,10 @@ require (
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gax-go/v2 v2.3.0 // indirect
github.com/googleapis/go-type-adapters v1.0.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
Expand Down
332 changes: 179 additions & 153 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
errors3 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/errors"
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery"
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan"
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/catalog"
"github.com/flyteorg/flytepropeller/pkg/controller/workflow"
"github.com/flyteorg/flytepropeller/pkg/controller/workflowstore"
leader "github.com/flyteorg/flytepropeller/pkg/leaderelection"
"github.com/flyteorg/flytepropeller/pkg/utils"
"github.com/flyteorg/flytestdlib/catalog"

"github.com/flyteorg/flytestdlib/contextutils"
stdErrs "github.com/flyteorg/flytestdlib/errors"
Expand Down Expand Up @@ -419,7 +419,7 @@ func New(ctx context.Context, cfg *config.Config, kubeclientset kubernetes.Inter
}

logger.Info(ctx, "Setting up Catalog client.")
catalogClient, err := catalog.NewCatalogClient(ctx, authOpts...)
catalogClient, err := catalog.NewClient(ctx, authOpts...)
if err != nil {
return nil, errors.Wrapf(err, "Failed to create datacatalog client")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/nodes/executor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
mocks2 "github.com/flyteorg/flytepropeller/pkg/controller/nodes/mocks"
recoveryMocks "github.com/flyteorg/flytepropeller/pkg/controller/nodes/recovery/mocks"
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/subworkflow/launchplan"
"github.com/flyteorg/flytepropeller/pkg/controller/nodes/task/catalog"
flyteassert "github.com/flyteorg/flytepropeller/pkg/utils/assert"
"github.com/flyteorg/flytestdlib/catalog"

"github.com/flyteorg/flytestdlib/promutils"
"github.com/flyteorg/flytestdlib/promutils/labeled"
Expand Down
64 changes: 0 additions & 64 deletions pkg/controller/nodes/task/catalog/config.go

This file was deleted.

60 changes: 0 additions & 60 deletions pkg/controller/nodes/task/catalog/config_flags.go

This file was deleted.

186 changes: 0 additions & 186 deletions pkg/controller/nodes/task/catalog/config_flags_test.go

This file was deleted.

Loading

0 comments on commit 9946b32

Please sign in to comment.