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

Jump to bottom

Conversion update #157

Merged
merged 4 commits into from
Aug 31, 2022
Merged

Conversion update #157

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3a01f9
Start webhooks first
jmendesky Aug 31, 2022
b38e159
Upgrade controller-runtime
jmendesky Aug 31, 2022
8754717
Fix RC conversion
jmendesky Aug 31, 2022
e32b131
config CRD upgrade
jmendesky Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 7 additions & 20 deletions apis/pipelines/v1alpha2/experiment_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,16 @@ import (
)

var _ = Context("Experiment Conversion", func() {
var _ = Describe("ConvertTo", func() {

Specify("Copies all fields", func() {
var _ = Describe("Roundtrip", func() {
Specify("converts to and from the same object", func() {
src := RandomExperiment()
dst := v1alpha3.Experiment{}

Expect(src.ConvertTo(&dst)).To(Succeed())
Expect(dst.ObjectMeta).To(Equal(src.ObjectMeta))
Expect(dst.Spec.Description).To(Equal(src.Spec.Description))
Expect(dst.Status).To(Equal(src.Status))
})
})

var _ = Describe("ConvertFrom", func() {

Specify("Copies all fields", func() {
src := v1alpha3.RandomExperiment()
intermediate := v1alpha3.Experiment{}
dst := Experiment{}

Expect(dst.ConvertFrom(src)).To(Succeed())
Expect(dst.ObjectMeta).To(Equal(src.ObjectMeta))
Expect(dst.Spec.Description).To(Equal(src.Spec.Description))
Expect(dst.Status).To(Equal(src.Status))
Expect(src.ConvertTo(&intermediate)).To(Succeed())
Expect(dst.ConvertFrom(&intermediate)).To(Succeed())

Expect(&dst).To(Equal(src))
})
})

Expand Down
28 changes: 10 additions & 18 deletions apis/pipelines/v1alpha2/pipeline_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,6 @@ var _ = Context("Pipeline Conversion", func() {
{Name: "c", Value: "d"},
}))
})

Specify("Copies all other fields", func() {
src := RandomPipeline()
dst := v1alpha3.Pipeline{}

Expect(src.ConvertTo(&dst)).To(Succeed())
Expect(dst.Spec.Image).To(Equal(src.Spec.Image))
Expect(dst.Spec.TfxComponents).To(Equal(src.Spec.TfxComponents))
Expect(dst.ObjectMeta).To(Equal(src.ObjectMeta))
Expect(dst.Status).To(Equal(src.Status))
})
})

var _ = Describe("ConvertFrom", func() {
Expand Down Expand Up @@ -89,15 +78,18 @@ var _ = Context("Pipeline Conversion", func() {
Expect(dst.ConvertFrom(&src)).NotTo(Succeed())
})

Specify("Copies all other fields", func() {
src := v1alpha3.RandomPipeline()
})

var _ = Describe("Roundtrip", func() {
Specify("converts to and from the same object", func() {
src := RandomPipeline()
intermediate := v1alpha3.Pipeline{}
dst := Pipeline{}

Expect(dst.ConvertFrom(src)).To(Succeed())
Expect(dst.Spec.Image).To(Equal(src.Spec.Image))
Expect(dst.Spec.TfxComponents).To(Equal(src.Spec.TfxComponents))
Expect(dst.ObjectMeta).To(Equal(src.ObjectMeta))
Expect(dst.Status).To(Equal(src.Status))
Expect(src.ConvertTo(&intermediate)).To(Succeed())
Expect(dst.ConvertFrom(&intermediate)).To(Succeed())

Expect(&dst).To(Equal(src))
})
})

Expand Down
6 changes: 6 additions & 0 deletions apis/pipelines/v1alpha2/runconfiguration_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ func (src *RunConfiguration) ConvertTo(dstRaw conversion.Hub) error {

dst.ObjectMeta = src.ObjectMeta
dst.Spec.RuntimeParameters = mapToNamedValues(src.Spec.RuntimeParameters)
dst.Spec.Pipeline = v1alpha3.PipelineIdentifier{Name: src.Spec.Pipeline.Name, Version: src.Spec.Pipeline.Version}
dst.Spec.Schedule = src.Spec.Schedule
dst.Spec.ExperimentName = src.Spec.ExperimentName
dst.Status = v1alpha3.RunConfigurationStatus(src.Status)

return nil
Expand All @@ -25,6 +28,9 @@ func (dst *RunConfiguration) ConvertFrom(srcRaw conversion.Hub) error {
if err != nil {
return err
}
dst.Spec.Pipeline = PipelineIdentifier{Name: src.Spec.Pipeline.Name, Version: src.Spec.Pipeline.Version}
dst.Spec.Schedule = src.Spec.Schedule
dst.Spec.ExperimentName = src.Spec.ExperimentName
dst.Status = RunConfigurationStatus(src.Status)

return nil
Expand Down
25 changes: 9 additions & 16 deletions apis/pipelines/v1alpha2/runconfiguration_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@ var _ = Context("RunConfiguration Conversion", func() {
{Name: "c", Value: "d"},
}))
})

Specify("Copies all other fields", func() {
src := RandomRunConfiguration()
dst := v1alpha3.RunConfiguration{}

Expect(src.ConvertTo(&dst)).To(Succeed())
Expect(dst.ObjectMeta).To(Equal(src.ObjectMeta))
Expect(dst.Status.Status).To(Equal(src.Status.Status))
Expect(dst.Status.ObservedPipelineVersion).To(Equal(src.Status.ObservedPipelineVersion))
})
})

var _ = Describe("ConvertFrom", func() {
Expand All @@ -59,15 +49,18 @@ var _ = Context("RunConfiguration Conversion", func() {

Expect(dst.ConvertFrom(&src)).NotTo(Succeed())
})
})

Specify("Copies all other fields", func() {
src := v1alpha3.RandomRunConfiguration()
var _ = Describe("Roundtrip", func() {
Specify("converts to and from the same object", func() {
src := RandomRunConfiguration()
intermediate := v1alpha3.RunConfiguration{}
dst := RunConfiguration{}

Expect(dst.ConvertFrom(src)).To(Succeed())
Expect(dst.ObjectMeta).To(Equal(src.ObjectMeta))
Expect(dst.Status.Status).To(Equal(src.Status.Status))
Expect(dst.Status.ObservedPipelineVersion).To(Equal(src.Status.ObservedPipelineVersion))
Expect(src.ConvertTo(&intermediate)).To(Succeed())
Expect(dst.ConvertFrom(&intermediate)).To(Succeed())

Expect(&dst).To(Equal(src))
})
})

Expand Down
27 changes: 25 additions & 2 deletions config/crd/bases/config.kubeflow.org_kfpcontrollerconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
type: string
controller:
description: ControllerManagerConfigurationSpec defines the desired state
of GenericControllerManagerConfiguration
of GenericControllerManagerConfiguration.
properties:
cacheNamespace:
description: "CacheNamespace if specified restricts the manager's
Expand All @@ -36,13 +36,36 @@ spec:
still Watch for a cluster-scoped resource (e.g Node). For namespaced
resources the cache will only hold objects from the desired namespace."
type: string
controller:
description: Controller contains global configuration options for
controllers registered within this manager.
properties:
cacheSyncTimeout:
description: CacheSyncTimeout refers to the time limit set to
wait for syncing caches. Defaults to 2 minutes if not set.
format: int64
type: integer
groupKindConcurrency:
additionalProperties:
type: integer
description: "GroupKindConcurrency is a map from a Kind to the
number of concurrent reconciliation allowed for that controller.
\n When a controller is registered within this manager using
the builder utilities, users have to specify the type the controller
reconciles in the For(...) call. If the object's kind passed
matches one of the keys in this map, the concurrency for that
controller is set to the number specified. \n The key is expected
to be consistent in form with GroupKind.String(), e.g. ReplicaSet
in apps group (regardless of version) would be `ReplicaSet.apps`."
type: object
type: object
gracefulShutDown:
description: GracefulShutdownTimeout is the duration given to runnable
to stop before the manager actually returns on stop. To disable
graceful shutdown, set to time.Duration(0) To use graceful shutdown
without timeout, set to a negative duration, e.G. time.Duration(-1)
The graceful shutdown is skipped for safety reasons in case the
leadere election lease is lost.
leader election lease is lost.
type: string
health:
description: Health contains the controller health configuration
Expand Down
2 changes: 0 additions & 2 deletions controllers/pipelines/suite_decoupled_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/manager"
"testing"

Expand All @@ -33,7 +32,6 @@ var (
)

var _ = BeforeSuite(func() {
logf.SetLogger(logf.NullLogger{})

By("bootstrapping test environment")
testEnv = &envtest.Environment{
Expand Down
107 changes: 56 additions & 51 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,23 @@ module github.com/sky-uk/kfp-operator
go 1.18

require (
github.com/argoproj/argo-workflows/v3 v3.1.8
github.com/argoproj/argo-workflows/v3 v3.3.9
github.com/docker/distribution v2.7.1+incompatible
github.com/onsi/ginkgo v1.16.4
github.com/onsi/ginkgo/v2 v2.1.3
github.com/onsi/gomega v1.17.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/ginkgo/v2 v2.1.4
github.com/onsi/gomega v1.19.0
github.com/thanhpk/randstr v1.0.4
github.com/walkerus/go-wiremock v1.2.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
sigs.k8s.io/controller-runtime v0.8.3
k8s.io/api v0.24.3
k8s.io/apimachinery v0.24.3
k8s.io/client-go v0.24.3
sigs.k8s.io/controller-runtime v0.11.2
)

require (
cloud.google.com/go v0.55.0 // indirect
cloud.google.com/go v0.100.2 // indirect
cloud.google.com/go/compute v1.3.0 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
Expand All @@ -28,67 +29,71 @@ require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/go-logr/zapr v0.2.0 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/go-logr/logr v1.2.2 // indirect
github.com/go-logr/zapr v1.2.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.6 // indirect
github.com/go-openapi/spec v0.20.2 // indirect
github.com/go-openapi/swag v0.19.13 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.9.0 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.15.0 // indirect
github.com/prometheus/procfs v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.6.0 // indirect
go.uber.org/multierr v1.5.0 // indirect
go.uber.org/zap v1.15.0 // indirect
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
golang.org/x/tools v0.1.3 // indirect
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
google.golang.org/appengine v1.6.6 // indirect
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/grpc v1.33.1 // indirect
google.golang.org/protobuf v1.26.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/tools v0.1.10 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c // indirect
google.golang.org/grpc v1.44.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
honnef.co/go/tools v0.2.0 // indirect
k8s.io/apiextensions-apiserver v0.20.1 // indirect
k8s.io/component-base v0.20.2 // indirect
k8s.io/klog/v2 v2.5.0 // indirect
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
k8s.io/apiextensions-apiserver v0.23.5 // indirect
k8s.io/component-base v0.23.5 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)