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

back-port fixes for v0.2.1 #56

Merged
merged 1 commit into from
Nov 4, 2019
Merged

back-port fixes for v0.2.1 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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 @@ -13,7 +13,7 @@ require (
github.com/Azure/go-autorest/autorest/to v0.3.0
github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
github.com/crossplaneio/crossplane v0.3.1-0.20191023221351-518648b051cd
github.com/crossplaneio/crossplane-runtime v0.1.0
github.com/crossplaneio/crossplane-runtime v0.2.0
github.com/google/go-cmp v0.3.1
github.com/google/uuid v1.1.1
github.com/mattn/go-ieproxy v0.0.0-20190805055040-f9202b1cfdeb // indirect
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,8 @@ github.com/crossplaneio/crossplane v0.3.1-0.20191023221351-518648b051cd h1:jd68c
github.com/crossplaneio/crossplane v0.3.1-0.20191023221351-518648b051cd/go.mod h1:r/iuuYYKmZ2cTE5DbIfMDQ9GF6xN2PrNXjnxGJUXTMI=
github.com/crossplaneio/crossplane-runtime v0.0.0-20191023215652-0f37bea5496e h1:tV86Qa72VNiz9HwNpCg3L4FBzPgRz1RwP1GelQn5Vxs=
github.com/crossplaneio/crossplane-runtime v0.0.0-20191023215652-0f37bea5496e/go.mod h1:FMlJ6k7pUZdxQrjh0B33D2b79iBac+xcMEHTWiruXao=
github.com/crossplaneio/crossplane-runtime v0.0.0-20191025043010-78072ef19dc5 h1:D1IRKqprfu59B41KQcYtEGDeRnaqIcfIjn0EOedOgOw=
github.com/crossplaneio/crossplane-runtime v0.0.0-20191025043010-78072ef19dc5/go.mod h1:FMlJ6k7pUZdxQrjh0B33D2b79iBac+xcMEHTWiruXao=
github.com/crossplaneio/crossplane-runtime v0.1.0 h1:IoPxURwynfUaqOZ/oQ8aLTQq89ueOckm73nbuVZthow=
github.com/crossplaneio/crossplane-runtime v0.1.0/go.mod h1:FMlJ6k7pUZdxQrjh0B33D2b79iBac+xcMEHTWiruXao=
github.com/crossplaneio/crossplane-runtime v0.2.0 h1:Lr4/bqyGy8rNyrYhvJcSE8FY2n2KT7IkLdKU38hGw6Q=
github.com/crossplaneio/crossplane-runtime v0.2.0/go.mod h1:FMlJ6k7pUZdxQrjh0B33D2b79iBac+xcMEHTWiruXao=
github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/cache/claim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ func (c *RedisClaimController) SetupWithManager(mgr ctrl.Manager) error {
resource.ClaimKind(cachev1alpha1.RedisClusterGroupVersionKind),
resource.ClassKind(v1alpha3.RedisClassGroupVersionKind),
resource.ManagedKind(v1alpha3.RedisGroupVersionKind),
resource.WithBinder(resource.NewAPIBinder(mgr.GetClient(), mgr.GetScheme())),
resource.WithManagedConfigurators(
resource.ManagedConfiguratorFn(ConfigureRedis),
resource.NewObjectMetaConfigurator(mgr.GetScheme()),
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/compute/claim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ func (c *AKSClusterClaimController) SetupWithManager(mgr ctrl.Manager) error {
resource.ClaimKind(computev1alpha1.KubernetesClusterGroupVersionKind),
resource.ClassKind(v1alpha3.AKSClusterClassGroupVersionKind),
resource.ManagedKind(v1alpha3.AKSClusterGroupVersionKind),
resource.WithBinder(resource.NewAPIBinder(mgr.GetClient(), mgr.GetScheme())),
resource.WithManagedConfigurators(
resource.ManagedConfiguratorFn(ConfigureAKSCluster),
resource.NewObjectMetaConfigurator(mgr.GetScheme()),
Expand Down
2 changes: 0 additions & 2 deletions pkg/controller/storage/account/claim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ func (c *ClaimController) SetupWithManager(mgr ctrl.Manager) error {
resource.ClaimKind(storagev1alpha1.BucketGroupVersionKind),
resource.ClassKind(v1alpha3.AccountClassGroupVersionKind),
resource.ManagedKind(v1alpha3.AccountGroupVersionKind),
resource.WithManagedBinder(resource.NewAPIManagedStatusBinder(mgr.GetClient(), mgr.GetScheme())),
resource.WithManagedFinalizer(resource.NewAPIManagedStatusUnbinder(mgr.GetClient())),
resource.WithManagedConfigurators(resource.ManagedConfiguratorFn(ConfigureAccount)))

p := resource.NewPredicates(resource.AnyOf(
Expand Down
2 changes: 0 additions & 2 deletions pkg/controller/storage/container/claim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ func (c *ClaimController) SetupWithManager(mgr ctrl.Manager) error {
resource.ClaimKind(storagev1alpha1.BucketGroupVersionKind),
resource.ClassKind(v1alpha3.ContainerClassGroupVersionKind),
resource.ManagedKind(v1alpha3.ContainerGroupVersionKind),
resource.WithManagedBinder(resource.NewAPIManagedStatusBinder(mgr.GetClient(), mgr.GetScheme())),
resource.WithManagedFinalizer(resource.NewAPIManagedStatusUnbinder(mgr.GetClient())),
resource.WithManagedConfigurators(
resource.ManagedConfiguratorFn(ConfigureContainer),
resource.NewObjectMetaConfigurator(mgr.GetScheme()),
Expand Down